Merge lp:~jderose/userwebkit/dmedia-uri into lp:userwebkit

[Jason Gerard DeRose]

Small change so that we can resolve dmedia: URIs into file:// URIs in the WebView 'resource-request-starting' handler.

For example, this would resolve a URI like this:

dmedia:TQVPUCFGL23KWPKPVDXP3BB2ZQWPTYMNDMR55QZZ5A2QLDBK

Into a URI like this:

file:///home/.dmedia/files/TQ/VPUCFGL23KWPKPVDXP3BB2ZQWPTYMNDMR55QZZ5A2QLDBK

And then call request.set_uri() with the new URI. I feel a bit silly I didn't think of this sooner, but better late than never!

[David Jordan (dmj726)]

Approved, looking forward to this change.

review: Approve

=== modified file 'demo-app.py'
--- demo-app.py	2011-11-22 05:30:06 +0000
+++ demo-app.py	2011-12-27 09:29:23 +0000
@@ -22,16 +22,44 @@
 #   Jason Gerard DeRose <[e-mail]>
 
 import optparse
+from urllib.parse import urlparse
+
+from dmedia import local
 
 from userwebkit import BaseUI
 
 
+
 class UI(BaseUI):
     app = 'demo'
     page = 'index.html'
     splash = 'splash.html'
     title = 'Demo'
     databases = ['demo']
+    proxy_bus = 'org.freedesktop.DMedia'
+    local = None
+
+    def dmedia_resolver(self, uri):
+        if self.env is None:
+            return ''
+        if self.local is None:
+            self.local = local.LocalSlave(self.env)
+        try:
+            u = urlparse(uri)
+            _id = u.path
+            doc = self.local.get_doc(_id)
+            if doc.get('proxies'):
+                proxies = doc['proxies']
+                for proxy in proxies:
+                    try:
+                        st = self.local.stat(proxy)
+                        return 'file://' + st.name
+                    except (local.NoSuchFile, local.FileNotLocal):
+                        pass
+            st = self.local.stat2(doc)
+            return 'file://' + st.name
+        except Exception:    
+            return ''
 
 
 parser = optparse.OptionParser()

=== modified file 'test_userwebkit.py'
--- test_userwebkit.py	2011-12-24 04:54:45 +0000
+++ test_userwebkit.py	2011-12-27 09:29:23 +0000
@@ -28,6 +28,9 @@
 from base64 import b32encode
 from urllib.parse import urlparse
 from random import SystemRandom
+from urllib.parse import urlparse
+
+from microfiber import random_id
 
 import userwebkit
 
@@ -74,10 +77,15 @@
 class DummyRequest:
     def __init__(self, uri):
         self.__uri = uri
+        self._set_uri = None
 
     def get_uri(self):
         return self.__uri
 
+    def set_uri(self, uri):
+        assert self._set_uri is None
+        self._set_uri = uri
+
 
 class DummyPolicy:
     def __init__(self):
@@ -88,6 +96,20 @@
         self._called = True
 
 
+class DummyResolver:
+    def __init__(self):
+        self._calls = []
+
+    def __call__(self, uri):
+        self._calls.append(uri)
+        u = urlparse(uri)
+        assert u.scheme == 'dmedia'
+        _id = u.path
+        assert len(_id) == 48
+        return '/'.join(['/home/.dmedia/files', _id[:2], _id[2:]])
+
+
+
 class TestCouchView(TestCase):
     def test_init(self):
         view = userwebkit.CouchView()
@@ -135,11 +157,47 @@
         self.assertIsNone(view._basic)
 
     def test_on_request(self):
-        # Make sure on_request() immediately returns when env is None:
         view = userwebkit.CouchView()
         self.assertIsNone(view._env)
+
+        # Make sure on_request() immediately returns when env is None:
         self.assertIsNone(view._on_request(None, None, None, None, None))
 
+        # Test with dmedia: URI when dmedia_resolver is None:
+        env = random_env()
+        view.set_env(env)
+        _id = random_id(30)
+        uri = 'dmedia:' + _id
+        request = DummyRequest(uri)
+        self.assertIsNone(view._on_request(None, None, None, request, None))
+        self.assertEqual(request._set_uri, '')
+
+        # Test with dmedia: URI when dmedia_resolver is callable:
+        env = random_env()
+        resolver = DummyResolver()
+        view = userwebkit.CouchView(env, resolver)
+        self.assertIs(view._dmedia_resolver, resolver)
+        id1 = random_id(30)
+        uri1 = 'dmedia:' + id1
+        request = DummyRequest(uri1)
+        self.assertIsNone(view._on_request(None, None, None, request, None))
+        self.assertEqual(
+            request._set_uri,
+            '/'.join(['/home/.dmedia/files', id1[:2], id1[2:]])
+        )
+        self.assertEqual(resolver._calls, [uri1])
+        
+        # Lets try one more:
+        id2 = random_id(30)
+        uri2 = 'dmedia:' + id2
+        request = DummyRequest(uri2)
+        self.assertIsNone(view._on_request(None, None, None, request, None))
+        self.assertEqual(
+            request._set_uri,
+            '/'.join(['/home/.dmedia/files', id2[:2], id2[2:]])
+        )
+        self.assertEqual(resolver._calls, [uri1, uri2])
+
     def test_on_nav_policy_decision(self):
         callback = DummyCallback()
         view = userwebkit.CouchView()

=== modified file 'ui/index.html'
--- ui/index.html	2011-12-22 03:54:49 +0000
+++ ui/index.html	2011-12-27 09:29:23 +0000
@@ -6,7 +6,7 @@
 <style>
 body {
     font-family: Ubuntu;
-    font-size: 18px;
+    font-size: 16px;
     background-color: #fff;
     color: #000;
     text-align: center;
@@ -53,9 +53,10 @@
 <body onload="hello()">
 <p id="hello"></p>
 <p>Right click and <strong>Inspect Element</strong></p>
+<p>
 <button id="button">Start</button>
-<p>
 <a href="http://novacut.com/">A test link</a>
 </p>
+<video controls width="640" height="360" src="dmedia:TQVPUCFGL23KWPKPVDXP3BB2ZQWPTYMNDMR55QZZ5A2QLDBK">
 </body>
 </html>

=== modified file 'userwebkit.py'
--- userwebkit.py	2011-12-27 06:45:51 +0000
+++ userwebkit.py	2011-12-27 09:29:23 +0000
@@ -79,7 +79,7 @@
         ),
     }
 
-    def __init__(self, env=None):
+    def __init__(self, env=None, dmedia_resolver=None):
         super().__init__()
         self.connect('resource-request-starting', self._on_request)
         self.connect('notify::title', self._on_notify_title)
@@ -87,6 +87,7 @@
             self._on_nav_policy_decision
         )
         self.set_env(env)
+        self._dmedia_resolver = dmedia_resolver
 
     def set_env(self, env):
         self._env = env
@@ -103,6 +104,12 @@
         if self._env is None:
             return
         uri = request.get_uri()
+        if uri.startswith('dmedia'):
+            if self._dmedia_resolver is None:
+                request.set_uri('')
+            else:
+                request.set_uri(self._dmedia_resolver(uri))
+            return
         u = urlparse(uri)
         if u.netloc != self._u.netloc:
             return
@@ -234,6 +241,7 @@
     splash = 'splash.html'
     title = 'Fix Me'
     databases = tuple()
+    dmedia_resolver = None
 
     proxy_bus = 'org.freedesktop.DC3'
     proxy_path = '/'
@@ -267,7 +275,7 @@
         self.scroll.set_policy(
             Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC
         )
-        self.view = CouchView()
+        self.view = CouchView(None, self.dmedia_resolver)
         self.view.connect('open', self.on_open)
         self.scroll.add(self.view)
         self.view.get_settings().set_property('enable-developer-extras', True)