Ticket #2411: path-mapping-multihost-noui.patch

deluge/ui/gtkui/common.py

@@ -263 +263 @@
                     log.error("Unable to register Deluge as default magnet uri handler.")
                     return False
     return False
+
+def current_path_mapping():
+    from deluge.configmanager import ConfigManager
+    host_mapping = ConfigManager("gtkui.conf")["path_mapping"]
+    host, _, _ = client.connection_info()
+    return host_mapping[host] if host in host_mapping else []
+
+def open_file(filepath):
+    if client.is_localhost():
+        return deluge.common.open_file(filepath)
+    from re import subn
+    from os import sep, path
+    for local, remote in current_path_mapping():
+        sub_path, match_found = subn("^%s" % remote, "", filepath)
+        if(match_found):
+            filepath = path.join(local, sub_path.lstrip(sep))
+            return deluge.common.open_file(filepath)

deluge/ui/gtkui/files_tab.py

@@ -237 +237 @@
         self.torrent_id = None
 
     def start(self):
-        attr = "hide" if not client.is_localhost() else "show"
+        attr = "hide" if not (client.is_localhost() or deluge.ui.gtkui.common.current_path_mapping()) else "show"
         for widget in self.localhost_widgets:
             getattr(widget, attr)()
 
@@ -341 +341 @@
         self.torrent_id = None
 
     def _on_row_activated(self, tree, path, view_column):
-        if client.is_localhost:
+        if client.is_localhost() or deluge.ui.gtkui.common.current_path_mapping():
             component.get("SessionProxy").get_torrent_status(self.torrent_id, ["save_path", "files"]).addCallback(self._on_open_file)
 
     def get_file_path(self, row, path=""):
@@ -361 +361 @@
             path = self.get_file_path(select).split("/")
             filepath = os.path.join(status["save_path"], *path)
             log.debug("Open file '%s'", filepath)
-            deluge.common.open_file(filepath)
+            deluge.ui.gtkui.common.open_file(filepath)
 
     ## The following 3 methods create the folder/file view in the treeview
     def prepare_file_store(self, files):

deluge/ui/gtkui/gtkui.py

@@ -167 +167 @@
     "sidebar_position": 170,
     "show_rate_in_title": False,
     "focus_main_window_on_add": True,
-    "createtorrent.trackers": []
+    "createtorrent.trackers": [],
+    "path_mapping": {},
 }
 
 class GtkUI(object):

deluge/ui/gtkui/menubar.py

@@ -184 +184 @@
             "menuitem_open_folder",
             "separator4"
         ]
-        if not client.is_localhost():
+        if not (client.is_localhost() or deluge.ui.gtkui.common.current_path_mapping()):
             for widget in non_remote_items:
                 self.torrentmenu_glade.get_widget(widget).hide()
                 self.torrentmenu_glade.get_widget(widget).set_no_show_all(True)
@@ -306 +306 @@
     def on_menuitem_open_folder_activate(self, data=None):
         log.debug("on_menuitem_open_folder")
         def _on_torrent_status(status):
-            deluge.common.open_file(status["save_path"])
+            deluge.ui.gtkui.common.open_file(status["save_path"])
         for torrent_id in component.get("TorrentView").get_selected_torrents():
             component.get("SessionProxy").get_torrent_status(torrent_id, ["save_path"]).addCallback(_on_torrent_status)