Changeset ae792c

Timestamp:

02/08/2008 05:43:14 AM (17 years ago)

Author:

Andrew Resch <andrewresch@gmail.com>

Branches:

2.0.x, develop, extjs4-port, master

Children:

eeac163

Parents:

f1d488

Message:

Split up function calls in get_torrent_status() and add 'file_progress'
key. Patch from Sadrul.

File:

• deluge/core/torrent.py (modified) (4 diffs)

deluge/core/torrent.py

@@ -230 +230 @@
             
         full_status = {
-            "name": self.torrent_info.name(),
-            "total_size": self.torrent_info.total_size(),
-            "num_files": self.torrent_info.num_files(),
-            "num_pieces": self.torrent_info.num_pieces(),
-            "piece_length": self.torrent_info.piece_length(),
             "distributed_copies": distributed_copies,
             "total_done": self.status.total_done,
@@ -251 +246 @@
             "total_seeds":  self.status.num_complete,
             "total_wanted": self.status.total_wanted,
-            "eta": self.get_eta(),
-            "ratio": self.get_ratio(),
             "tracker": self.status.current_tracker,
             "trackers": self.trackers,
@@ -260 +253 @@
             "file_priorities": self.file_priorities
         }
+        
+        fns = {
+            "name" : self.torrent_info.name,
+            "total_size" :  self.torrent_info.total_size,
+            "num_files" :  self.torrent_info.num_files,
+            "num_pieces" :  self.torrent_info.num_pieces,
+            "piece_length" :  self.torrent_info.piece_length,
+            "eta" :  self.get_eta,
+            "ratio" :  self.get_ratio,
+            "file_progress" : self.handle.file_progress
+        }
+
         self.status = None
         self.torrent_info = None
@@ -272 +277 @@
                 if key in full_status:
                     status_dict[key] = full_status[key]
+                elif key in fns:
+                    status_dict[key] = fns[key]()
 
         return status_dict