From a33294eeadede5dfd54f89ee3584d563bd265a84 Mon Sep 17 00:00:00 2001 From: Marcos Pinto Date: Mon, 3 Sep 2007 06:26:54 +0000 Subject: [PATCH] add path to details tab --- glade/delugegtk.glade | 297 +++++++++++++++++++++++------------------- src/core.py | 9 ++ src/interface.py | 9 +- 3 files changed, 176 insertions(+), 139 deletions(-) diff --git a/glade/delugegtk.glade b/glade/delugegtk.glade index 3655db57a..7805d08d4 100644 --- a/glade/delugegtk.glade +++ b/glade/delugegtk.glade @@ -456,45 +456,11 @@ True - 6 + 7 2 2 - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - - - True - 0 - 1 - <b># of files:</b> - True - - - - - 2 - 3 - GTK_FILL - - - - - True - 0 - - - 1 - 2 - 2 - 3 - - - - - + True 0 @@ -507,15 +473,37 @@ - + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + + + True + 0 + 0 + 1 + <b>Path:</b> + True + + + + + 1 + 2 + GTK_FILL + + + + True 0 - True - PANGO_WRAP_WORD_CHAR 1 2 + 2 + 3 @@ -535,13 +523,149 @@ - 1 - 2 + 2 + 3 GTK_FILL + + + True + 0 + + + 1 + 2 + 3 + 4 + + + + + + True + 0 + True + PANGO_WRAP_WORD_CHAR + + + 1 + 2 + 4 + 5 + + + + + + True + 0 + + + 1 + 2 + 5 + 6 + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + + + True + 0 + 1 + <b>Tracker Status:</b> + True + + + + + 5 + 6 + + + + + True + 0 + + + 1 + 2 + 6 + 7 + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + + + True + 0 + 1 + <b>Next Announce:</b> + True + + + + + 6 + 7 + GTK_FILL + + + + + True + 0 + True + PANGO_WRAP_WORD_CHAR + + + 1 + 2 + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + + + True + 0 + 1 + <b># of files:</b> + True + + + + + + + 3 + 4 + GTK_FILL + + + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 @@ -562,61 +686,12 @@ - - 3 - 4 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - - - True - 0 - 1 - <b>Tracker Status:</b> - True - - - - - 4 5 GTK_FILL - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - - - True - 0 - 1 - <b>Next Announce:</b> - True - - - - - 5 - 6 - GTK_FILL - - True @@ -637,47 +712,6 @@ GTK_FILL - - - True - 0 - True - PANGO_WRAP_WORD_CHAR - - - 1 - 2 - 3 - 4 - - - - - - True - 0 - - - 1 - 2 - 4 - 5 - - - - - - True - 0 - - - 1 - 2 - 5 - 6 - - - @@ -707,6 +741,7 @@ False + True diff --git a/src/core.py b/src/core.py index 26b15d2f7..6c31e86a2 100644 --- a/src/core.py +++ b/src/core.py @@ -1036,3 +1036,12 @@ class Manager: def add_url_seed(self, unique_ID, address): return deluge_core.add_url_seed(unique_ID, address) + + def get_torrent_path(self, unique_ID): + torrent_path = self.unique_IDs[unique_ID].save_dir + torrent_state = self.get_torrent_state(unique_ID) + if torrent_state["num_files"] > 1: + file = self.get_torrent_file_info(unique_ID)[0] + torrent_path = os.path.join(torrent_path, + file["path"].split("/", 1)[0]) + return torrent_path diff --git a/src/interface.py b/src/interface.py index 599967fb6..8943aa231 100644 --- a/src/interface.py +++ b/src/interface.py @@ -692,14 +692,7 @@ window, please enter your password")) unique_ids = self.get_selected_torrent_rows() try: for uid in unique_ids: - torrent_path = self.manager.unique_IDs[uid].save_dir - torrent_state = self.manager.get_torrent_state(uid) - if torrent_state["num_files"] > 1: - # Assume torrent has only one root dir. - file = self.manager.get_torrent_file_info(uid)[0] - torrent_path = os.path.join(torrent_path, - file["path"].split("/", 1)[0]) - + torrent_path = self.manager.get_torrent_path(uid) common.exec_command(file_manager, torrent_path) except KeyError: pass