Changeset 1503

Timestamp:

07/22/08 21:11:32 (7 weeks ago)

Author:

rob

Message:

Added canonicalize parameter to Buffer
* controls whether or not the canonicalized url is used as the buffer keyword
* if the canonical url is not used, the normalized url is used which allows query string and fragments to be significant

Location:

trunk/peppy

Files:

• buffers.py (modified) (8 diffs)
• frame.py (modified) (4 diffs)
• hsi/loader.py (modified) (1 diff)

trunk/peppy/buffers.py

@@ -164 +164 @@
     
     """
-    def __init__(self, url, created_from_url=None):
+    def __init__(self, url, created_from_url=None, canonicalize=True):
         """Initialize the mixin.
         
@@ -173 +173 @@
         for a local filesystem working directory if a working directory can't
         be determined from the real url.
+        
+        @param canonicalize: whether or not the url should be canonicalized
+        before storing in the buffer list.
         """
         self.bfh = None
         self.last_mtime = None
+        self.canonicalize = canonicalize
         self.setURL(url)
         self.created_from_url = created_from_url
@@ -184 +188 @@
         if not url:
             url = vfs.normalize("untitled")
-        else:
+        elif self.canonicalize:
             url = vfs.canonical_reference(url)
+        else:
+            url = vfs.normalize(url)
         self.url = url
         self.saveTimestamp()
 
     def isURL(self, url):
-        url = vfs.canonical_reference(url)
+        if self.canonicalize:
+            url = vfs.canonical_reference(url)
+        else:
+            url = vfs.normalize(url)
         if url == self.url:
             return True
@@ -393 +402 @@
 
         if not self.permanent:
-            basename=self.stc.getShortDisplayName(self.url)
+            basename=self.stc.getShortDisplayName(self.raw_url)
 
             BufferList.removeBuffer(self)
@@ -408 +417 @@
 
     def isBasename(self, basename):
-        return basename == self.stc.getShortDisplayName(self.url)
+        return basename == self.stc.getShortDisplayName(self.raw_url)
 
     def setName(self):
-        basename=self.stc.getShortDisplayName(self.url)
+        basename=self.stc.getShortDisplayName(self.raw_url)
         if basename in self.filenames:
             count=self.filenames[basename]+1
@@ -582 +591 @@
     def createPostHook(self):
         self.showBusy(True)
-        wx.CallAfter(self.frame.openThreaded, self.buffer.user_url,
+        wx.CallAfter(self.frame.openThreaded, self.buffer.raw_url,
                      self.buffer, mode_to_replace=self)
 
 class LoadingBuffer(BufferVFSMixin, debugmixin):
-    def __init__(self, url, modecls=None, created_from_url=None):
-        self.user_url = url
-        BufferVFSMixin.__init__(self, url, created_from_url)
+    def __init__(self, url, modecls=None, created_from_url=None, canonicalize=True):
+        BufferVFSMixin.__init__(self, url, created_from_url, canonicalize)
         self.busy = True
         self.readonly = False
@@ -598 +606 @@
             self.modecls = modecls
         else:
-            self.modecls = MajorModeMatcherDriver.match(self)
+            self.modecls = MajorModeMatcherDriver.match(self, url=self.raw_url)
             self.dprint("found major mode = %s" % self.modecls)
         self.stc = LoadingSTC(unicode(url))
@@ -608 +616 @@
     
     def allowThreadedLoading(self):
-        return self.modecls.preferThreadedLoading(self.user_url)
+        return self.modecls.preferThreadedLoading(self.raw_url)
     
     def clone(self):
         """Get a real Buffer instance from this temporary buffer"""
-        dprint(self.user_url)
-        return Buffer(self.user_url, self.modecls, self.created_from_url)
+        return Buffer(self.raw_url, self.modecls, self.created_from_url)
 
     def addViewer(self, mode):

trunk/peppy/frame.py

@@ -704 +704 @@
             self.open(url)
 
-    def open(self, url, modecls=None, mode_to_replace=None, force_new_tab=False, created_from_url=None):
+    def open(self, url, modecls=None, mode_to_replace=None, force_new_tab=False, created_from_url=None, canonicalize=True):
         """Open a new tab to edit the given URL.
         
@@ -726 +726 @@
         creating a new file in the mem: filesystem and want a working directory
         on the local filesystem to be available if needed to save a copy.
+        
+        @param canonicalize: (optional) whether or not the URL should be
+        canonicalized before searching the existing buffer list.  This is used
+        in the rare case where a fragment or query string is significant to
+        locating the data on the file system.
         """
         # The canonical url stored in the buffer will be without query string
@@ -731 +736 @@
         # query string and fragment) it separately.
         user_url = vfs.normalize(url)
-        try:
-            buffer = BufferList.findBufferByURL(user_url)
-        except NotImplementedError:
-            # This means that the vfs implementation doesn't recognize the
-            # filesystem type.  This is the first place in the loading chain
-            # that the error can be encountered, so check for it here and load
-            # a new plugin if necessary.
-            found = False
-            plugins = wx.GetApp().plugin_manager.getActivePluginObjects()
-            for plugin in plugins:
-                assert self.dprint("Checking %s" % plugin)
-                plugin.loadVirtualFileSystem(user_url)
-                try:
-                    buffer = BufferList.findBufferByURL(user_url)
-                    found = True
-                    break
-                except NotImplementedError:
-                    pass
-            if not found:
-                self.openFailure(user_url, "Unknown URI scheme")
-                return
+        buffer = None
+        if canonicalize:
+            try:
+                buffer = BufferList.findBufferByURL(user_url)
+            except NotImplementedError:
+                # This means that the vfs implementation doesn't recognize the
+                # filesystem type.  This is the first place in the loading chain
+                # that the error can be encountered, so check for it here and load
+                # a new plugin if necessary.
+                found = False
+                plugins = wx.GetApp().plugin_manager.getActivePluginObjects()
+                for plugin in plugins:
+                    assert self.dprint("Checking %s" % plugin)
+                    plugin.loadVirtualFileSystem(user_url)
+                    try:
+                        buffer = BufferList.findBufferByURL(user_url)
+                        found = True
+                        break
+                    except NotImplementedError:
+                        pass
+                if not found:
+                    self.openFailure(user_url, "Unknown URI scheme")
+                    return
 
         if buffer is not None:
@@ -758 +765 @@
         else:
             try:
-                buffer = LoadingBuffer(user_url, modecls, created_from_url)
+                buffer = LoadingBuffer(user_url, modecls, created_from_url, canonicalize)
             except Exception, e:
                 import traceback

trunk/peppy/hsi/loader.py

@@ -26 +26 @@
         return False
     
+    def getShortDisplayName(self, url):
+        """Return a short name for display in tabs or other context without
+        needing a pathname.
+        """
+        if url.fragment:
+            return "%s#%s" % (url.path.get_name(), url.fragment)
+        return url.path.get_name()
+
     def getHandler(self):
         return self.dataset.__class__