From d57b2b43ec6260912593c8e9a228adb39a4d66f8 Mon Sep 17 00:00:00 2001
From: Andrew Resch <andrewresch@gmail.com>
Date: Thu, 24 Dec 2009 20:06:23 +0000
Subject: [PATCH] Implement #457 progress bars for folders

---
 ChangeLog                    |  3 +++
 deluge/ui/gtkui/files_tab.py | 32 ++++++++++++++++++++++++++++----
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e4ee3c880..adf9f929f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 === Deluge 1.3.0 (In Development) ===
 ==== Core ====
   * Implement #1063 option to delete torrent file copy on torrent removal - patch from Ghent
+  * Implement #457 progress bars for folders
+
+==== GtkUI ====
 
 === Deluge 1.2.0 (In Development) ===
 ==== Core ====
diff --git a/deluge/ui/gtkui/files_tab.py b/deluge/ui/gtkui/files_tab.py
index de1adb153..e7f3c96a2 100644
--- a/deluge/ui/gtkui/files_tab.py
+++ b/deluge/ui/gtkui/files_tab.py
@@ -79,10 +79,6 @@ def cell_filename(column, cell, model, row, data):
     cell.set_property("text", os.path.split(filepath)[1])
 
 def cell_progress(column, cell, model, row, data):
-    if model.get_value(row, 5) == -1:
-    # This is a folder, so lets just set it blank for now
-        cell.set_property("visible", False)
-        return
     text = model.get_value(row, data[0])
     value = model.get_value(row, data[1])
     cell.set_property("visible", True)
@@ -419,6 +415,33 @@ class FilesTab(Tab):
             self.get_files_from_tree(row.iterchildren(), files_list, indent+1)
         return None
 
+    def update_folder_percentages(self):
+        """
+        Go through the tree and update the folder complete percentages.
+        """
+
+        root = self.treestore.get_iter_root()
+        if self.treestore[root][5] != -1:
+            return
+
+        def get_completed_bytes(row):
+            bytes = 0
+            parent = self.treestore.iter_parent(row)
+            while row:
+                if self.treestore.iter_children(row):
+                    bytes += get_completed_bytes(self.treestore.iter_children(row))
+                else:
+                    bytes += self.treestore[row][1] * (float(self.treestore[row][3]) / 100.0)
+
+                row = self.treestore.iter_next(row)
+
+            value = (float(bytes) / float(self.treestore[parent][1])) * 100
+            self.treestore[parent][3] = value
+            self.treestore[parent][2] = "%.2f%%" % value
+            return bytes
+
+        get_completed_bytes(self.treestore.iter_children(root))
+
     def _on_get_torrent_status(self, status):
         # Store this torrent's compact setting
         if "compact" in status:
@@ -447,6 +470,7 @@ class FilesTab(Tab):
             file_priority = status["file_priorities"][index]
             if row[4] != file_priority:
                 row[4] = file_priority
+        self.update_folder_percentages()
 
     def _on_button_press_event(self, widget, event):
         """This is a callback for showing the right-click context menu."""