Changeset 1462

Timestamp:

07/07/08 07:41:10 (2 months ago)

Author:

rob

Message:

Fixed vfs uri handling to properly decode fragments in windows path urls
* makeTabActive now attempts to match on normalized URLs
* added testcase for windows urls with fragments

Location:

trunk

Files:

• peppy/frame.py (modified) (1 diff)
• peppy/fundamental.py (modified) (1 diff)
• peppy/vfs/itools/uri/generic.py (modified) (2 diffs)
• tests/test_vfs.py (modified) (1 diff)

trunk/peppy/frame.py

@@ -690 +690 @@
         @return: True if URL was found, False if not.
         """
-        mode = self.tabs.moveSelectionToURL(url)
+        normalized = vfs.normalize(url)
+        self.dprint("url=%s normalized=%s" % (url, normalized))
+        mode = self.tabs.moveSelectionToURL(normalized)
         if mode:
-            url = vfs.normalize(url)
-            mode.showInitialPosition(url)
+            mode.showInitialPosition(normalized)
         return mode is not None
     

trunk/peppy/fundamental.py

@@ -593 +593 @@
 
     def showInitialPosition(self, url):
+        self.dprint("url=%s scheme=%s auth=%s path=%s query=%s fragment=%s" % (url, url.scheme, url.authority, url.path, url.query, url.fragment))
         if url.fragment:
             line = int(url.fragment)

trunk/peppy/vfs/itools/uri/generic.py

@@ -738 +738 @@
         scheme, authority, path, query, fragment = urlsplit(data)
         
-        # Some special cases for Windows paths
+        # Some special cases for Windows paths c:/a/b#4 and file:///c:/a/b#4.
+        # urlsplit has problems with the scheme, leading slashes in the path,
+        # and doesn't split out the fragment properly
         if len(scheme) == 1:
             # found a windows drive name instead of path, because urlsplit
             # thinks the scheme is "c" for Windows paths like "c:/a/b"
+            if "#" in path:
+                # the fragment is improperly placed in the path
+                path, fragment = path.rsplit("#", 1)
             path = "%s:%s" % (scheme, path)
             scheme = "file"
@@ -748 +753 @@
             # like "file:///c:/a/b" -- it thinks the path is "/c:/a/b", which
             # to be correct requires removing the leading slash.
-            path = "%s:%s" % (path[1].lower(), path[3:])
+            drive = path[1].lower()
+            path = path[3:]
+            if "#" in path:
+                path, fragment = path.rsplit("#", 1)
+            path = "%s:%s" % (drive, path)
         
         # The path

trunk/tests/test_vfs.py

@@ -187 +187 @@
         self.assertEqual('c:/stuff/blah', uri.path)
         self.assertEqual('file', uri.scheme)
+        uri = vfs.get_reference('c:/stuff/blah#5')
+        self.assertEqual('c:/stuff/blah', str(uri.path))
+        self.assertEqual('5', uri.fragment)
+        self.assertEqual('file', uri.scheme)
         
     def test_windows_normalize(self):