codex-storage/deluge
1
0
Fork 0
mirror of https://github.com/codex-storage/deluge.git synced 2025-01-11 20:14:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix speed renderer

Browse Source 
alias fspeed, fsize and ftime to the corresponding formatters
improve the peers grid (flags, fixed renders etc.)
This commit is contained in:
Damien Churchill 2009-02-21 02:31:56 +00:00
parent 26addfd63c
commit 4659cf2438
2 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
deluge/ui/web/js/deluge-details.js
View File

@ -97,7 +97,6 @@ Deluge.Details.Status = {
}, },
onRequestComplete: function(status) { onRequestComplete: function(status) {
var fsize = Deluge.Formatters.size, ftime = Deluge.Formatters.timeRemaining, fspeed = Deluge.Formatters.speed;
var data = { var data = {
downloaded: fsize(status.total_done) + ' (' + fsize(status.total_payload_download) + ')', downloaded: fsize(status.total_done) + ' (' + fsize(status.total_payload_download) + ')',
uploaded: fsize(status.total_uploaded) + ' (' + fsize(status.total_payload_upload) + ')', uploaded: fsize(status.total_uploaded) + ' (' + fsize(status.total_payload_upload) + ')',
@ -160,7 +159,6 @@ Deluge.Details.Details = {
}, },
onRequestComplete: function(torrent, torrentId) { onRequestComplete: function(torrent, torrentId) {
var fsize = Deluge.Formatters.size;
var data = { var data = {
torrent_name: torrent.name, torrent_name: torrent.name,
hash: torrentId, hash: torrentId,
@ -202,7 +200,32 @@ Deluge.Details.Files = {
} }
Deluge.Details.Peers = { Deluge.Details.Peers = {
onRender: function(panel) {
this.panel = panel;
this.panel.update = this.update.bind(this);
},
onRequestComplete: function(torrent) {
var peers = new Array();
torrent.peers.each(function(peer) {
peers.include([peer.country, peer.ip, peer.client, peer.down_speed, peer.up_speed]);
}, this);
this.Store.loadData(peers);
},
update: function(torrentId) {
Deluge.Client.core.get_torrent_status(torrentId, Deluge.Keys.Peers, {
onSuccess: this.onRequestComplete.bindWithEvent(this, torrentId)
});
}
}
function flag(val) {
return String.format('<img src="/flag/{0}" />', val);
}
function progress(val) {
return val.toFixed(1);
} }
Deluge.Details.Peers.Store = new Ext.data.SimpleStore({ Deluge.Details.Peers.Store = new Ext.data.SimpleStore({
@ -266,17 +289,18 @@ Deluge.Details.Panel = new Ext.TabPanel({
title: _('Peers'), title: _('Peers'),
store: Deluge.Details.Peers.Store, store: Deluge.Details.Peers.Store,
columns: [ columns: [
{width: 30, renderer: Deluge.Formatters.plain, dataIndex: 'country'}, {header: '&nbsp;', width: 30, renderer: flag, dataIndex: 'country'},
{header: 'Address', width: 125, sortable: true, renderer: Deluge.Formatters.plain, dataIndex: 'address'}, {header: 'Address', width: 125, sortable: true, renderer: Deluge.Formatters.plain, dataIndex: 'address'},
{header: 'Client', width: 125, sortable: true, renderer: renderHost, dataIndex: 'client'}, {header: 'Client', width: 125, sortable: true, renderer: Deluge.Formatters.plain, dataIndex: 'client'},
{header: 'Progress', width: 150, sortable: true, renderer: Deluge.Formatters.plain, dataIndex: 'progress'}, {header: 'Progress', width: 150, sortable: true, renderer: progress, dataIndex: 'progress'},
{header: 'Down Speed', width: 100, sortable: true, renderer: Deluge.Formatters.speed, dataIndex: 'downspeed'}, {header: 'Down Speed', width: 100, sortable: true, renderer: fspeed, dataIndex: 'downspeed'},
{header: 'Up Speed', width: 100, sortable: true, renderer: Deluge.Formatters.speed, dataIndex: 'upspeed'} {header: 'Up Speed', width: 100, sortable: true, renderer: fspeed, dataIndex: 'upspeed'}
], ],
stripeRows: true, stripeRows: true,
deferredRender:false, deferredRender:false,
autoScroll:true, autoScroll:true,
margins: '0 0 0 0' margins: '0 0 0 0',
listeners: {'render': {fn: Deluge.Details.Peers.onRender, scope: Deluge.Details.Peers}}
}),{ }),{
id: 'options', id: 'options',
title: _('Options') title: _('Options')

5
deluge/ui/web/js/deluge.js
View File

@ -66,6 +66,7 @@ Deluge.Formatters = {
}, },
speed: function(bits) { speed: function(bits) {
if (!bits || bits == 0) return '';
if (bits < 1024) { return bits.toFixed(1) + ' b/s'; } if (bits < 1024) { return bits.toFixed(1) + ' b/s'; }
else { bits = bits / 1024; } else { bits = bits / 1024; }
@ -115,6 +116,10 @@ Deluge.Formatters = {
} }
} }
var fsize = Deluge.Formatters.size;
var fspeed = Deluge.Formatters.speed;
var ftime = Deluge.Formatters.timeRemaining;
Deluge.Keys = { Deluge.Keys = {
Grid: [ Grid: [
'queue', 'name', 'total_size', 'state', 'progress', 'num_seeds', 'queue', 'name', 'total_size', 'state', 'progress', 'num_seeds',