Changeset 1502

Timestamp:

07/22/08 21:11:29 (5 weeks ago)

Author:

rob

Message:

Added url parameter to attemptOpen so that the url can be modified in place rather than the buffer's url
* FIXME: maybe buffer can be removed entirely from attemptOpen

Location:

trunk/peppy

Files:

• dired_menu.py (modified) (2 diffs)
• hsi/hsi_major_mode_proxy.py (modified) (1 diff)
• major.py (modified) (8 diffs)
• yapsy/plugins.py (modified) (2 diffs)

trunk/peppy/dired_menu.py

@@ -162 +162 @@
         return []
 
-    def attemptOpen(self, buffer):
+    def attemptOpen(self, buffer, url):
         # use a copy of the url because don't want to change the buffer's url
         # unless it turns out that we want to change the scheme
-        refcopy = vfs.get_reference(unicode(buffer.url))
+        refcopy = vfs.get_reference(unicode(url))
         #print "url = %s" % str(refcopy)
         if refcopy.scheme == "file" and vfs.exists(refcopy) and vfs.get_size(refcopy) > 0:
@@ -171 +171 @@
             refcopy.scheme = "tar"
             if vfs.exists(refcopy):
-                # OK, we do a bit of a trick here: rewrite the url in the
-                # buffer object to change the scheme to tar:
-                buffer.url.scheme = "tar"
+                # OK, we do a bit of a trick here: rewrite the url to change
+                # the scheme to tar:
+                url.scheme = "tar"
                 return (DiredMode, [])
         return (None, [])

trunk/peppy/hsi/hsi_major_mode_proxy.py

@@ -12 +12 @@
     """HSI viewer plugin to register modes and user interface.
     """
-    def attemptOpen(self, buffer):
-        url = buffer.raw_url
+    def attemptOpen(self, buffer, url):
         assert self.dprint("Trying to open url: %s" % repr(unicode(url)))
         try:

trunk/peppy/major.py

@@ -1198 +1198 @@
             cls.dprint("checking plugin %s" % str(plugin.__class__.__mro__))
             cls.current_modes.extend(plugin.getMajorModes())
-        dprint("Currently active major modes: %s" % str(cls.current_modes))
+        cls.dprint("Currently active major modes: %s" % str(cls.current_modes))
         cls.ignored_modes = set()
     
@@ -1209 +1209 @@
     @classmethod
     def ignoreMode(cls, mode):
-        dprint("Ignoring mode %s" % mode)
+        cls.dprint("Ignoring mode %s" % mode)
         cls.skipped_modes.add(mode)
 
     @classmethod
-    def match(cls, buffer, magic_size=None):
+    def match(cls, buffer, magic_size=None, url=None):
         app = wx.GetApp()
         if magic_size is None:
             magic_size = app.classprefs.magic_size
+        if url is None:
+            url = buffer.raw_url
 
         plugins = app.plugin_manager.getActivePluginObjects()
@@ -1222 +1224 @@
         
         # Try to match a specific protocol
-        modes = cls.scanProtocol(buffer.raw_url)
+        modes = cls.scanProtocol(url)
         cls.dprint("scanProtocol matches %s" % modes)
         if modes:
@@ -1230 +1232 @@
         # generate a list of possible modes
         try:
-            metadata = vfs.get_metadata(buffer.raw_url)
+            metadata = vfs.get_metadata(url)
         except:
             metadata = {'mimetype': None,
@@ -1237 +1239 @@
                         'description': None,
                         }
-        modes, binary_modes = cls.scanURL(buffer.raw_url, metadata)
+        modes, binary_modes = cls.scanURL(url, metadata)
         cls.dprint("scanURL matches %s (binary: %s) using metadata %s" % (modes, binary_modes, metadata))
 
@@ -1303 +1305 @@
         # As a last resort to open a specific mode, attempt to open it
         # with any third-party openers that have been registered
-        mode = cls.attemptOpen(plugins, buffer)
+        mode = cls.attemptOpen(plugins, buffer, url)
         cls.dprint("attemptOpen matches %s" % mode)
         if mode:
@@ -1491 +1493 @@
     
     @classmethod
-    def attemptOpen(cls, plugins, buffer):
+    def attemptOpen(cls, plugins, buffer, url):
         """Use the mode's attemptOpen method to see if it recognizes the url.
         
@@ -1501 +1503 @@
         for plugin in plugins:
             try:
-                exact, generics = plugin.attemptOpen(buffer)
+                exact, generics = plugin.attemptOpen(buffer, url)
                 if exact:
                     return exact

trunk/peppy/yapsy/plugins.py

@@ -310 +310 @@
         return
     
-    def attemptOpen(self, buffer):
+    def attemptOpen(self, buffer, url):
         """Last resort to major mode matching: attempting to open the url.
 
@@ -319 +319 @@
 
         buffer: the Buffer object to attempt to load
+        
+        url: the user specified URL (which may be different from the buffer's
+        idea of what the URL is if the buffer already exists and we're trying
+        to create a new view using a different major mode)
 
         @returns: tuple (exact, generic_list) where when exact is not None the