Ticket #378: pieces_bar.patch

deluge/core/torrent.py

@@ -479 +479 @@
         """Returns the torrents queue position"""
         return self.handle.queue_position()
 
+    def get_pieces_status(self):
+        if not self.handle.has_metadata():
+            return []
+
+        status = self.handle.status()
+        return status.pieces
+        
     def get_file_progress(self):
         """Returns the file progress as a list of floats.. 0.0 -> 1.0"""
         if not self.handle.has_metadata():
@@ -642 +649 @@
             "num_pieces": ti_num_pieces,
             "peers": self.get_peers,
             "piece_length": ti_piece_length,
+            "pieces": self.get_pieces_status,
             "private": ti_priv,
             "queue": self.handle.queue_position,
             "ratio": self.get_ratio,

deluge/ui/gtkui/glade/main_window.glade

@@ -643 +643 @@
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="spacing">5</property>
                         <child>
-                          <widget class="GtkProgressBar" id="progressbar">
+                          <widget class="GtkVBox" id="vbox8">
                             <property name="visible">True</property>
-                            <property name="show_text">True</property>
-                            <property name="pulse_step">0.10000000149</property>
+                            <child>
+                              <widget class="GtkLabel" id="label28">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">&lt;b&gt;Completed Pieces:&lt;/b&gt;</property>
+                                <property name="use_markup">True</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkAlignment" id="alignment12">
+                                <property name="visible">True</property>
+                                <property name="top_padding">3</property>
+                                <property name="left_padding">12</property>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
                           </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
                         </child>
                         <child>
                           <widget class="GtkTable" id="table8">
@@ -1967 +1985 @@
                                           <widget class="GtkFileChooserButton" id="filechooser_move_completed">
                                             <property name="visible">True</property>
                                             <property name="sensitive">False</property>
-                                            <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
                                             <property name="local_only">False</property>
+                                            <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
                                             <property name="title" translatable="yes">Select A Folder</property>
                                           </widget>
                                           <packing>

deluge/ui/gtkui/status_tab.py

@@ -74 +74 @@
         self._child_widget = glade.get_widget("status_tab")
         self._tab_label = glade.get_widget("status_tab_label")
 
+        self.pieces_bar = PiecesBar()
+        glade.get_widget("alignment12").add(self.pieces_bar)
+        
         self.label_widgets = [
             (glade.get_widget("summary_pieces"), fpeer_size_second, ("num_pieces", "piece_length")),
             (glade.get_widget("summary_availability"), fratio, ("distributed_copies",)),
@@ -91 +94 @@
             (glade.get_widget("summary_seed_time"), deluge.common.ftime, ("seeding_time",)),
             (glade.get_widget("summary_seed_rank"), str, ("seed_rank",)),
             (glade.get_widget("summary_auto_managed"), str, ("is_auto_managed",)),
-            (glade.get_widget("progressbar"), fpcnt, ("progress",)),
+            (self.pieces_bar, None, ("pieces",)),
             (glade.get_widget("summary_date_added"), deluge.common.fdate, ("time_added",))
         ]
 
@@ -107 +110 @@
             return
 
         # Get the torrent status
-        status_keys = ["progress", "num_pieces", "piece_length",
+        status_keys = ["pieces", "num_pieces", "piece_length",
             "distributed_copies", "all_time_download", "total_payload_download",
             "total_uploaded", "total_payload_upload", "download_payload_rate",
             "upload_payload_rate", "num_peers", "num_seeds", "total_peers",
@@ -141 +144 @@
 
             if widget[0].get_text() != txt:
                 widget[0].set_text(txt)
-
-        # Do the progress bar because it's a special case (not a label)
-        w = component.get("MainWindow").main_glade.get_widget("progressbar")
-        fraction = status["progress"] / 100
-        if w.get_fraction() != fraction:
-            w.set_fraction(fraction)
-
+    
+        # If this is true the torrent should be completely downloaded
+        # so display a full bar
+        if int(status["num_pieces"]) != len(status["pieces"]):
+            self.pieces_bar.pieces = [True]
+            self.pieces_bar.update()
+        # Don't update if the pieces are the same    
+        elif status["pieces"] != self.pieces_bar.pieces:
+            self.pieces_bar.pieces = status["pieces"]
+            self.pieces_bar.update()
+        
     def clear(self):
         for widget in self.label_widgets:
             widget[0].set_text("")
 
-        component.get("MainWindow").main_glade.get_widget("progressbar").set_fraction(0.0)
+        self.pieces_bar.clear()
+
+class PiecesBar(gtk.DrawingArea):
+    def __init__(self):
+        gtk.DrawingArea.__init__(self)
+        self.gc = None
+        self.width = 0
+        self.height = 0
+        self.pieces = []
+        
+        self.connect('size-allocate', self.on_size_allocate)
+        self.connect('expose-event', self.update)
+        self.connect('realize', self.on_realize)
+
+        self.show()
+
+    def on_realize(self, widget):
+        map = widget.get_colormap()
+        done_color = map.alloc_color("#325891")
+        wait_color = map.alloc_color("#a8a8a9")
+        outline_color = map.alloc_color("#555555")
+        
+        self.gc_done = widget.window.new_gc(foreground=done_color)
+        self.gc_wait = widget.window.new_gc(foreground=wait_color)
+        self.gc_outline = widget.window.new_gc(foreground=outline_color)
+    
+    def on_size_allocate(self, widget, size):
+        self.width = size.width
+        self.height = size.height
+        
+    def update(self, widget=None, event=None):
+        num_pieces = len(self.pieces)
+        
+        if num_pieces < 1:
+            self.clear()
+            return
+        
+        piece_size = (self.width - 2) / num_pieces
+        padding = [1] * ((self.width - 2) - (piece_size * num_pieces))
+        
+        self.window.draw_rectangle(self.gc_outline, False, 0, 0,
+                                   self.width - 1, self.height - 1)
+        
+        start_pos = 1
+        for piece in self.pieces:
+            if len(padding) > 0:
+                this_piece_size = piece_size + padding.pop()
+            else:
+                this_piece_size = piece_size
+        
+            if piece is True:
+                self.window.draw_rectangle(self.gc_done, True, start_pos, 1, 
+                                           this_piece_size, self.height - 2)
+            else:
+                self.window.draw_rectangle(self.gc_wait, True, start_pos, 1, 
+                                           this_piece_size, self.height - 2) 
+            start_pos += this_piece_size
+    
+    def clear(self):
+        self.window.draw_rectangle(self.gc_wait, True, 0, 0,
+                                   self.width, self.height)
+        self.window.draw_rectangle(self.gc_outline, False, 0, 0,
+                                   self.width - 1, self.height - 1)
+    
+    def get_text(self):
+        return ""
+    
+    def set_text(self, text):
+        pass