Ticket #378: piecesbar_gtk_js.patch

deluge/core/torrent.py

@@ -497 +497 @@
         """Returns the torrents queue position"""
         return self.handle.queue_position()
 
+    def get_pieces(self): 
+        if not self.handle.has_metadata(): 
+            return None 
+        else:
+            return [1 if piece else 0 for piece in self.handle.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():
@@ -690 +696 @@
             "num_pieces": ti_num_pieces,
             "peers": self.get_peers,
             "piece_length": ti_piece_length,
+            "pieces": self.get_pieces,
             "private": ti_priv,
             "queue": self.handle.queue_position,
             "ratio": self.get_ratio,

deluge/ui/gtkui/glade/main_window.glade

@@ -676 +676 @@
                         <property name="orientation">vertical</property>
                         <property name="spacing">5</property>
                         <child>
-                          <widget class="GtkProgressBar" id="progressbar">
+                          <widget class="GtkVBox" id="vbox2">
                             <property name="visible">True</property>
-                            <property name="show_text">True</property>
-                            <property name="pulse_step">0.10000000149</property>
+                            <child>
+                              <widget class="GtkLabel" id="label23">
+                                <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>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkAlignment" id="alignment1">
+                                <property name="height_request">35</property>
+                                <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>
                             <property name="position">0</property>
                           </packing>
                         </child>

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("alignment1").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",)),
-            (glade.get_widget("summary_date_added"), deluge.common.fdate, ("time_added",))
+            (glade.get_widget("summary_date_added"), deluge.common.fdate, ("time_added",)),
+            (self.pieces_bar, None, ("pieces",)),
         ]
 
     def update(self):
@@ -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",
@@ -142 +145 @@
             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 haven't changed     
+        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.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("#888888")
+        
+        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 None
+        
+        self.window.draw_rectangle(self.gc_outline, False, 0, 0,
+                                   self.width - 1, self.height - 1)
+        
+        width = self.width - 2
+        pieces = self.collapse_pieces(width, num_pieces)
+        piece_size = width / len(pieces)
+        padding = (width % len(pieces))
+        start_pos = 1
+        
+        for piece in pieces:
+            if padding > 0:
+                this_piece_size = piece_size + 1
+                padding -= 1
+            else:
+                this_piece_size = piece_size
+        
+            self.draw_piece(piece, start_pos, 1, this_piece_size, 
+                            self.height - 2)
+            start_pos += this_piece_size
+    
+    def collapse_pieces(self, width, num_pieces):
+        group_size = num_pieces / width
+        
+        padding = num_pieces % width
+        i = 0
+        pieces = []
+        
+        while i < num_pieces:
+            if padding > 0:
+                this_group_size = group_size + 1
+                padding -= 1
+            else:
+                this_group_size = group_size
+        
+            pieces.append(1 if all(self.pieces[i:i+this_group_size]) else 0)
+            i += this_group_size
+        return pieces
+    
+    def draw_piece(self, piece, start_x, start_y, width, height):
+        if piece:
+            self.window.draw_rectangle(self.gc_done, True, start_x, start_y, 
+                                       width, height)
+        else:
+            self.window.draw_rectangle(self.gc_wait, True, start_x, start_y, 
+                                       width, height)
+    
+    def clear(self):
+        self.pieces = [0]
+        self.update()
+    
+    def get_text(self):
+        return ""
+    
+    def set_text(self, text):
+        pass

deluge/ui/web/css/deluge.css

@@ -288 +288 @@
         /*background-image: url(../icons/mixed.png);*/
 }
 
+.x-piecesbar {
+    border: 1px solid #888888;
+    margin: 5px;
+    margin-bottom: 0px;
+    background: #ffffff;
+    height: 20px;
+}
+
+.x-piecesbar-done {
+    background: #325891;
+    height: 20px;
+    float: left;
+}
+
+.x-piecesbar-blank {
+    background: #a8a8a9;
+    height: 20px;
+    float: left;
+}
+
 /**
  * Deluge Default Icon Set
  * n.b. this needs to be forked out at some point

deluge/ui/web/js/deluge-all-debug.js

@@ -1262 +1262 @@
  * @class Deluge.details.StatusTab
  * @extends Ext.Panel
  */
+
 Deluge.details.StatusTab = Ext.extend(Ext.Panel, {
         title: _('Status'),
         autoScroll: true,
@@ -1269 +1270 @@
         onRender: function(ct, position) {
                 Deluge.details.StatusTab.superclass.onRender.call(this, ct, position);
                 
-                this.progressBar = this.add({
-                        xtype: 'progress',
-                        cls: 'x-deluge-status-progressbar'
-                });
-                
+                this.piecesBar = this.add({
+            xtype: "box",
+            cls: "x-piecesbar",
+            tpl: new Ext.Template("<div class=\"x-piecesbar-{0}\" style=\"width: {1}px;\"></div>"),
+            compare_pieces: function(pieces) {
+                if (!this.pieces || pieces.length != this.pieces.length) {
+                    return false;
+                }
+                
+                for (var i = 0; i < pieces.length; i++) {
+                    if (pieces[i] != this.pieces[i]) {
+                        return false;
+                    }
+                }
+                return true;
+            },
+            
+            collapse_pieces: function(width, pieces) {
+                var group_size = pieces.length / width;
+
+                var padding = pieces.length % width;
+                        var i = 0;
+                        var new_pieces = []; 
+                var this_group_size;
+                 
+                        while (i < pieces.length) { 
+                    this_group_size = group_size;
+                            if (padding > 0) { 
+                                this_group_size = group_size + 1;
+                                padding -= 1;
+                    }
+                    
+                    if (pieces.slice(i, i+this_group_size).indexOf(0) == -1) {
+                        new_pieces.push(1);
+                    }
+                    else {
+                        new_pieces.push(0);
+                    }
+                            i += this_group_size;
+                }
+                        return new_pieces;
+            },
+            
+            update: function(pieces) {
+                if (!this.compare_pieces(pieces) && typeof(pieces) != "number") {
+                    this.pieces = pieces;
+                    
+                    if (pieces.length > this.getWidth()) {
+                        pieces = this.collapse_pieces(this.getWidth(), pieces);
+                    }
+                                    
+                    while (this.el.dom.hasChildNodes()) {
+                        this.el.dom.removeChild(this.el.dom.lastChild);
+                    }
+                    
+                    var piece_size = Math.floor((this.getWidth() - 2) / pieces.length);
+                    var padding = (this.getWidth() - 2) % pieces.length;
+                    var this_size;
+                    
+                    for (var i = 0; i < pieces.length; i++) {
+                        this_size = piece_size;
+
+                        if (padding > 0) {
+                            this_size = piece_size + 1;
+                            padding -= 1;
+                        }
+
+                        if (pieces[i] == 1) {
+                            this.tpl.append(this.el, ["done", this_size]);
+                        }
+                        else {
+                            this.tpl.append(this.el, ["blank", this_size]);
+                        }
+                    }
+                }
+            }
+        });
+               
                 this.status = this.add({
                         cls: 'x-deluge-status',
                         id: 'deluge-details-status',
@@ -1296 +1370 @@
         },
         
         clear: function() {
-                this.progressBar.updateProgress(0, ' ');
+                this.piecesBar.update([0]);
                 for (var k in this.fields) {
                         this.fields[k].innerHTML = '';
                 }
@@ -1346 +1420 @@
                 for (var field in this.fields) {
                         this.fields[field].innerHTML = data[field];
                 }
-                var text = status.state + ' ' + status.progress.toFixed(2) + '%';
-                this.progressBar.updateProgress(status.progress / 100.0, text);
+        
+                if (parseInt(status.num_pieces) != status.pieces.length) {
+            this.piecesBar.update([1]);
+        }
+        else {
+            this.piecesBar.update(status.pieces);
+        }
         }
 });
 /*!
@@ -6878 +6957 @@
     Status: [
         'total_done', 'total_payload_download', 'total_uploaded',
         'total_payload_upload', 'next_announce', 'tracker_status', 'num_pieces',
-        'piece_length', 'is_auto_managed', 'active_time', 'seeding_time',
-        'seed_rank'
+        'piece_length', 'pieces', 'is_auto_managed', 'active_time', 
+        'seeding_time', 'seed_rank'
     ],
     
     /**

deluge/ui/web/js/deluge-all.js

@@ -253 +253 @@
  * this exception statement from your version. If you delete this exception
  * statement from all source files in the program, then also delete it here.
  */
-Ext.ns("Deluge.details");Deluge.details.StatusTab=Ext.extend(Ext.Panel,{title:_("Status"),autoScroll:true,onRender:function(b,a){Deluge.details.StatusTab.superclass.onRender.call(this,b,a);this.progressBar=this.add({xtype:"progress",cls:"x-deluge-status-progressbar"});this.status=this.add({cls:"x-deluge-status",id:"deluge-details-status",border:false,width:1000,listeners:{render:{fn:function(c){c.load({url:deluge.config.base+"render/tab_status.html",text:_("Loading")+"..."});c.getUpdater().on("update",this.onPanelUpdate,this)},scope:this}}})},clear:function(){this.progressBar.updateProgress(0," ");for(var a in this.fields){this.fields[a].innerHTML=""}},update:function(a){if(!this.fields){this.getFields()}deluge.client.web.get_torrent_status(a,Deluge.Keys.Status,{success:this.onRequestComplete,scope:this})},onPanelUpdate:function(b,a){this.fields={};Ext.each(Ext.query("dd",this.status.body.dom),function(c){this.fields[c.className]=c},this)},onRequestComplete:function(a){seeders=a.total_seeds>-1?a.num_seeds+" ("+a.total_seeds+")":a.num_seeds;peers=a.total_peers>-1?a.num_peers+" ("+a.total_peers+")":a.num_peers;var b={downloaded:fsize(a.total_done,true),uploaded:fsize(a.total_uploaded,true),share:(a.ratio==-1)?"∞":a.ratio.toFixed(3),announce:ftime(a.next_announce),tracker_status:a.tracker_status,downspeed:(a.download_payload_rate)?fspeed(a.download_payload_rate):"0.0 KiB/s",upspeed:(a.upload_payload_rate)?fspeed(a.upload_payload_rate):"0.0 KiB/s",eta:ftime(a.eta),pieces:a.num_pieces+" ("+fsize(a.piece_length)+")",seeders:seeders,peers:peers,avail:a.distributed_copies.toFixed(3),active_time:ftime(a.active_time),seeding_time:ftime(a.seeding_time),seed_rank:a.seed_rank,time_added:fdate(a.time_added)};b.auto_managed=_((a.is_auto_managed)?"True":"False");b.downloaded+=" ("+((a.total_payload_download)?fsize(a.total_payload_download):"0.0 KiB")+")";b.uploaded+=" ("+((a.total_payload_download)?fsize(a.total_payload_download):"0.0 KiB")+")";for(var c in this.fields){this.fields[c].innerHTML=b[c]}var d=a.state+" "+a.progress.toFixed(2)+"%";this.progressBar.updateProgress(a.progress/100,d)}});
+Ext.ns("Deluge.details");Deluge.details.StatusTab=Ext.extend(Ext.Panel,{title:_("Status"),autoScroll:true,onRender:function(b,a){Deluge.details.StatusTab.superclass.onRender.call(this,b,a);this.piecesBar=this.add({xtype:"box",cls:"x-piecesbar",tpl:new Ext.Template('<div class="x-piecesbar-{0}" style="width: {1}px;"></div>'),compare_pieces:function(d){if(!this.pieces||d.length!=this.pieces.length){return false}for(var c=0;c<d.length;c++){if(d[c]!=this.pieces[c]){return false}}return true},collapse_pieces:function(e,f){var c=f.length/e;var h=f.length%e;var d=0;var j=[];var g;while(d<f.length){g=c;if(h>0){g=c+1;h-=1}if(f.slice(d,d+g).indexOf(0)==-1){j.push(1)}else{j.push(0)}d+=g}return j},update:function(e){if(!this.compare_pieces(e)&&typeof(e)!="number"){this.pieces=e;if(e.length>this.getWidth()){e=this.collapse_pieces(this.getWidth(),e)}while(this.el.dom.hasChildNodes()){this.el.dom.removeChild(this.el.dom.lastChild)}var g=Math.floor((this.getWidth()-2)/e.length);var f=(this.getWidth()-2)%e.length;var c;for(var d=0;d<e.length;d++){c=g;if(f>0){c=g+1;f-=1}if(e[d]==1){this.tpl.append(this.el,["done",c])}else{this.tpl.append(this.el,["blank",c])}}}}});this.status=this.add({cls:"x-deluge-status",id:"deluge-details-status",border:false,width:1000,listeners:{render:{fn:function(c){c.load({url:deluge.config.base+"render/tab_status.html",text:_("Loading")+"..."});c.getUpdater().on("update",this.onPanelUpdate,this)},scope:this}}})},clear:function(){this.piecesBar.update([0]);for(var a in this.fields){this.fields[a].innerHTML=""}},update:function(a){if(!this.fields){this.getFields()}deluge.client.web.get_torrent_status(a,Deluge.Keys.Status,{success:this.onRequestComplete,scope:this})},onPanelUpdate:function(b,a){this.fields={};Ext.each(Ext.query("dd",this.status.body.dom),function(c){this.fields[c.className]=c},this)},onRequestComplete:function(a){seeders=a.total_seeds>-1?a.num_seeds+" ("+a.total_seeds+")":a.num_seeds;peers=a.total_peers>-1?a.num_peers+" ("+a.total_peers+")":a.num_peers;var b={downloaded:fsize(a.total_done,true),uploaded:fsize(a.total_uploaded,true),share:(a.ratio==-1)?"&infin;":a.ratio.toFixed(3),announce:ftime(a.next_announce),tracker_status:a.tracker_status,downspeed:(a.download_payload_rate)?fspeed(a.download_payload_rate):"0.0 KiB/s",upspeed:(a.upload_payload_rate)?fspeed(a.upload_payload_rate):"0.0 KiB/s",eta:ftime(a.eta),pieces:a.num_pieces+" ("+fsize(a.piece_length)+")",seeders:seeders,peers:peers,avail:a.distributed_copies.toFixed(3),active_time:ftime(a.active_time),seeding_time:ftime(a.seeding_time),seed_rank:a.seed_rank,time_added:fdate(a.time_added)};b.auto_managed=_((a.is_auto_managed)?"True":"False");b.downloaded+=" ("+((a.total_payload_download)?fsize(a.total_payload_download):"0.0 KiB")+")";b.uploaded+=" ("+((a.total_payload_download)?fsize(a.total_payload_download):"0.0 KiB")+")";for(var c in this.fields){this.fields[c].innerHTML=b[c]}if(parseInt(a.num_pieces)!=a.pieces.length){this.piecesBar.update([1])}else{this.piecesBar.update(a.pieces)}}});
 /*
  * Deluge.add.Window.js
  * 
@@ -1405 +1405 @@
  * this exception statement from your version. If you delete this exception
  * statement from all source files in the program, then also delete it here.
  */
-Deluge.Keys={Grid:["queue","name","total_size","state","progress","num_seeds","total_seeds","num_peers","total_peers","download_payload_rate","upload_payload_rate","eta","ratio","distributed_copies","is_auto_managed","time_added","tracker_host","save_path"],Status:["total_done","total_payload_download","total_uploaded","total_payload_upload","next_announce","tracker_status","num_pieces","piece_length","is_auto_managed","active_time","seeding_time","seed_rank"],Files:["files","file_progress","file_priorities"],Peers:["peers"],Details:["name","save_path","total_size","num_files","tracker_status","tracker","comment"],Options:["max_download_speed","max_upload_speed","max_connections","max_upload_slots","is_auto_managed","stop_at_ratio","stop_ratio","remove_at_ratio","private","prioritize_first_last"]};Ext.each(Deluge.Keys.Grid,function(a){Deluge.Keys.Status.push(a)});
+Deluge.Keys={Grid:["queue","name","total_size","state","progress","num_seeds","total_seeds","num_peers","total_peers","download_payload_rate","upload_payload_rate","eta","ratio","distributed_copies","is_auto_managed","time_added","tracker_host","save_path"],Status:["total_done","total_payload_download","total_uploaded","total_payload_upload","next_announce","tracker_status","num_pieces","piece_length","pieces","is_auto_managed","active_time","seeding_time","seed_rank"],Files:["files","file_progress","file_priorities"],Peers:["peers"],Details:["name","save_path","total_size","num_files","tracker_status","tracker","comment"],Options:["max_download_speed","max_upload_speed","max_connections","max_upload_slots","is_auto_managed","stop_at_ratio","stop_ratio","remove_at_ratio","private","prioritize_first_last"]};Ext.each(Deluge.Keys.Grid,function(a){Deluge.Keys.Status.push(a)});
 /*
  * Deluge.LoginWindow.js
  * 
@@ -1789 +1789 @@
  * this exception statement from your version. If you delete this exception
  * statement from all source files in the program, then also delete it here.
  */
-deluge.ui={errorCount:0,filters:null,initialize:function(){deluge.add=new Deluge.add.AddWindow();deluge.details=new Deluge.details.DetailsPanel();deluge.connectionManager=new Deluge.ConnectionManager();deluge.editTrackers=new Deluge.EditTrackersWindow();deluge.login=new Deluge.LoginWindow();deluge.preferences=new Deluge.preferences.PreferencesWindow();deluge.sidebar=new Deluge.Sidebar();deluge.statusbar=new Deluge.Statusbar();this.MainPanel=new Ext.Panel({id:"mainPanel",iconCls:"x-deluge-main-panel",title:"Deluge",layout:"border",tbar:deluge.toolbar,items:[deluge.sidebar,deluge.details,deluge.torrents],bbar:deluge.statusbar});this.Viewport=new Ext.Viewport({layout:"fit",items:[this.MainPanel]});deluge.events.on("connect",this.onConnect,this);deluge.events.on("disconnect",this.onDisconnect,this);deluge.events.on("PluginDisabledEvent",this.onPluginDisabled,this);deluge.events.on("PluginEnabledEvent",this.onPluginEnabled,this);deluge.client=new Ext.ux.util.RpcClient({url:deluge.config.base+"json"});for(var a in Deluge.pluginStore){a=Deluge.createPlugin(a);a.enable();deluge.plugins[a.name]=a}Ext.QuickTips.init();deluge.client.on("connected",function(b){deluge.login.show()},this,{single:true});this.update=this.update.createDelegate(this);this.checkConnection=this.checkConnection.createDelegate(this);this.originalTitle=document.title},checkConnection:function(){deluge.client.web.connected({success:this.onConnectionSuccess,failure:this.onConnectionError,scope:this})},update:function(){var a=deluge.sidebar.getFilterStates();deluge.client.web.update_ui(Deluge.Keys.Grid,a,{success:this.onUpdate,failure:this.onUpdateError,scope:this});deluge.details.update()},onConnectionError:function(a){},onConnectionSuccess:function(a){deluge.statusbar.setStatus({iconCls:"x-deluge-statusbar icon-ok",text:_("Connection restored")});clearInterval(this.checking);if(!a){deluge.connectionManager.show()}},onUpdateError:function(a){if(this.errorCount==2){Ext.MessageBox.show({title:"Lost Connection",msg:"The connection to the webserver has been lost!",buttons:Ext.MessageBox.OK,icon:Ext.MessageBox.ERROR});deluge.events.fire("disconnect");deluge.statusbar.setStatus({text:"Lost connection to webserver"});this.checking=setInterval(this.checkConnection,2000)}this.errorCount++},onUpdate:function(a){if(!a.connected){deluge.connectionManager.disconnect(true);return}if(deluge.config.show_session_speed){document.title=this.originalTitle+" (Down: "+fspeed(a.stats.download_rate,true)+" Up: "+fspeed(a.stats.upload_rate,true)+")"}deluge.torrents.update(a.torrents);deluge.statusbar.update(a.stats);deluge.sidebar.update(a.filters);this.errorCount=0},onConnect:function(){if(!this.running){this.running=setInterval(this.update,2000);this.update()}deluge.client.web.get_plugins({success:this.onGotPlugins,scope:this})},onDisconnect:function(){this.stop()},onGotPlugins:function(a){Ext.each(a.enabled_plugins,function(b){if(deluge.plugins[b]){return}deluge.client.web.get_plugin_resources(b,{success:this.onGotPluginResources,scope:this})},this)},onPluginEnabled:function(a){if(deluge.plugins[a]){deluge.plugins[a].enable()}else{deluge.client.web.get_plugin_resources(a,{success:this.onGotPluginResources,scope:this})}},onGotPluginResources:function(b){var a=(Deluge.debug)?b.debug_scripts:b.scripts;Ext.each(a,function(c){Ext.ux.JSLoader({url:c,onLoad:this.onPluginLoaded,pluginName:b.name})},this)},onPluginDisabled:function(a){deluge.plugins[a].disable()},onPluginLoaded:function(a){if(!Deluge.hasPlugin(a.pluginName)){return}plugin=Deluge.createPlugin(a.pluginName);plugin.enable();deluge.plugins[plugin.name]=plugin},stop:function(){if(this.running){clearInterval(this.running);this.running=false;deluge.torrents.getStore().removeAll()}}};Ext.onReady(function(a){deluge.ui.initialize()});
- No newline at end of file
+deluge.ui={errorCount:0,filters:null,initialize:function(){deluge.add=new Deluge.add.AddWindow();deluge.details=new Deluge.details.DetailsPanel();deluge.connectionManager=new Deluge.ConnectionManager();deluge.editTrackers=new Deluge.EditTrackersWindow();deluge.login=new Deluge.LoginWindow();deluge.preferences=new Deluge.preferences.PreferencesWindow();deluge.sidebar=new Deluge.Sidebar();deluge.statusbar=new Deluge.Statusbar();this.MainPanel=new Ext.Panel({id:"mainPanel",iconCls:"x-deluge-main-panel",title:"Deluge",layout:"border",tbar:deluge.toolbar,items:[deluge.sidebar,deluge.details,deluge.torrents],bbar:deluge.statusbar});this.Viewport=new Ext.Viewport({layout:"fit",items:[this.MainPanel]});deluge.events.on("connect",this.onConnect,this);deluge.events.on("disconnect",this.onDisconnect,this);deluge.events.on("PluginDisabledEvent",this.onPluginDisabled,this);deluge.events.on("PluginEnabledEvent",this.onPluginEnabled,this);deluge.client=new Ext.ux.util.RpcClient({url:deluge.config.base+"json"});for(var a in Deluge.pluginStore){a=Deluge.createPlugin(a);a.enable();deluge.plugins[a.name]=a}Ext.QuickTips.init();deluge.client.on("connected",function(b){deluge.login.show()},this,{single:true});this.update=this.update.createDelegate(this);this.checkConnection=this.checkConnection.createDelegate(this);this.originalTitle=document.title},checkConnection:function(){deluge.client.web.connected({success:this.onConnectionSuccess,failure:this.onConnectionError,scope:this})},update:function(){var a=deluge.sidebar.getFilterStates();deluge.client.web.update_ui(Deluge.Keys.Grid,a,{success:this.onUpdate,failure:this.onUpdateError,scope:this});deluge.details.update()},onConnectionError:function(a){},onConnectionSuccess:function(a){deluge.statusbar.setStatus({iconCls:"x-deluge-statusbar icon-ok",text:_("Connection restored")});clearInterval(this.checking);if(!a){deluge.connectionManager.show()}},onUpdateError:function(a){if(this.errorCount==2){Ext.MessageBox.show({title:"Lost Connection",msg:"The connection to the webserver has been lost!",buttons:Ext.MessageBox.OK,icon:Ext.MessageBox.ERROR});deluge.events.fire("disconnect");deluge.statusbar.setStatus({text:"Lost connection to webserver"});this.checking=setInterval(this.checkConnection,2000)}this.errorCount++},onUpdate:function(a){if(!a.connected){deluge.connectionManager.disconnect(true);return}if(deluge.config.show_session_speed){document.title=this.originalTitle+" (Down: "+fspeed(a.stats.download_rate,true)+" Up: "+fspeed(a.stats.upload_rate,true)+")"}deluge.torrents.update(a.torrents);deluge.statusbar.update(a.stats);deluge.sidebar.update(a.filters);this.errorCount=0},onConnect:function(){if(!this.running){this.running=setInterval(this.update,2000);this.update()}deluge.client.web.get_plugins({success:this.onGotPlugins,scope:this})},onDisconnect:function(){this.stop()},onGotPlugins:function(a){Ext.each(a.enabled_plugins,function(b){if(deluge.plugins[b]){return}deluge.client.web.get_plugin_resources(b,{success:this.onGotPluginResources,scope:this})},this)},onPluginEnabled:function(a){if(deluge.plugins[a]){deluge.plugins[a].enable()}else{deluge.client.web.get_plugin_resources(a,{success:this.onGotPluginResources,scope:this})}},onGotPluginResources:function(b){var a=(Deluge.debug)?b.debug_scripts:b.scripts;Ext.each(a,function(c){Ext.ux.JSLoader({url:c,onLoad:this.onPluginLoaded,pluginName:b.name})},this)},onPluginDisabled:function(a){deluge.plugins[a].disable()},onPluginLoaded:function(a){if(!Deluge.hasPlugin(a.pluginName)){return}plugin=Deluge.createPlugin(a.pluginName);plugin.enable();deluge.plugins[plugin.name]=plugin},stop:function(){if(this.running){clearInterval(this.running);this.running=false;deluge.torrents.getStore().removeAll()}}};Ext.onReady(function(a){deluge.ui.initialize()});

deluge/ui/web/js/deluge-all/Keys.js

@@ -62 +62 @@
     Status: [
         'total_done', 'total_payload_download', 'total_uploaded',
         'total_payload_upload', 'next_announce', 'tracker_status', 'num_pieces',
-        'piece_length', 'is_auto_managed', 'active_time', 'seeding_time',
-        'seed_rank'
+        'piece_length', 'pieces', 'is_auto_managed', 'active_time', 
+        'seeding_time', 'seed_rank'
     ],
     
     /**

deluge/ui/web/js/deluge-all/details/StatusTab.js

@@ -35 +35 @@
  * @class Deluge.details.StatusTab
  * @extends Ext.Panel
  */
+
 Deluge.details.StatusTab = Ext.extend(Ext.Panel, {
         title: _('Status'),
         autoScroll: true,
@@ -42 +43 @@
         onRender: function(ct, position) {
                 Deluge.details.StatusTab.superclass.onRender.call(this, ct, position);
                 
-                this.progressBar = this.add({
-                        xtype: 'progress',
-                        cls: 'x-deluge-status-progressbar'
-                });
-                
+                this.piecesBar = this.add({
+            xtype: "box",
+            cls: "x-piecesbar",
+            tpl: new Ext.Template("<div class=\"x-piecesbar-{0}\" style=\"width: {1}px;\"></div>"),
+            compare_pieces: function(pieces) {
+                if (!this.pieces || pieces.length != this.pieces.length) {
+                    return false;
+                }
+                
+                for (var i = 0; i < pieces.length; i++) {
+                    if (pieces[i] != this.pieces[i]) {
+                        return false;
+                    }
+                }
+                return true;
+            },
+            
+            collapse_pieces: function(width, pieces) {
+                var group_size = pieces.length / width;
+
+                var padding = pieces.length % width;
+                        var i = 0;
+                        var new_pieces = []; 
+                var this_group_size;
+                 
+                        while (i < pieces.length) { 
+                    this_group_size = group_size;
+                            if (padding > 0) { 
+                                this_group_size = group_size + 1;
+                                padding -= 1;
+                    }
+                    
+                    if (pieces.slice(i, i+this_group_size).indexOf(0) == -1) {
+                        new_pieces.push(1);
+                    }
+                    else {
+                        new_pieces.push(0);
+                    }
+                            i += this_group_size;
+                }
+                        return new_pieces;
+            },
+            
+            update: function(pieces) {
+                if (!this.compare_pieces(pieces) && typeof(pieces) != "number") {
+                    this.pieces = pieces;
+                    
+                    if (pieces.length > this.getWidth()) {
+                        pieces = this.collapse_pieces(this.getWidth(), pieces);
+                    }
+                                    
+                    while (this.el.dom.hasChildNodes()) {
+                        this.el.dom.removeChild(this.el.dom.lastChild);
+                    }
+                    
+                    var piece_size = Math.floor((this.getWidth() - 2) / pieces.length);
+                    var padding = (this.getWidth() - 2) % pieces.length;
+                    var this_size;
+                    
+                    for (var i = 0; i < pieces.length; i++) {
+                        this_size = piece_size;
+
+                        if (padding > 0) {
+                            this_size = piece_size + 1;
+                            padding -= 1;
+                        }
+
+                        if (pieces[i] == 1) {
+                            this.tpl.append(this.el, ["done", this_size]);
+                        }
+                        else {
+                            this.tpl.append(this.el, ["blank", this_size]);
+                        }
+                    }
+                }
+            }
+        });
+               
                 this.status = this.add({
                         cls: 'x-deluge-status',
                         id: 'deluge-details-status',
@@ -69 +143 @@
         },
         
         clear: function() {
-                this.progressBar.updateProgress(0, ' ');
+                this.piecesBar.update([0]);
                 for (var k in this.fields) {
                         this.fields[k].innerHTML = '';
                 }
@@ -119 +193 @@
                 for (var field in this.fields) {
                         this.fields[field].innerHTML = data[field];
                 }
-                var text = status.state + ' ' + status.progress.toFixed(2) + '%';
-                this.progressBar.updateProgress(status.progress / 100.0, text);
+        
+                if (parseInt(status.num_pieces) != status.pieces.length) {
+            this.piecesBar.update([1]);
+        }
+        else {
+            this.piecesBar.update(status.pieces);
+        }
         }
 });