mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-02-22 06:00:41 +00:00
Code Issues Releases Wiki Activity

(trunk web) store torrents in a hash instead of an array

Browse source
This commit is contained in:
Kevin Glowacz 2009-06-07 23:55:42 +00:00
parent 6a568403d2
commit 10d5a762ec
2 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
web/javascript/torrent.js
View file

@ -635,18 +635,6 @@ Torrent.indexOf = function( torrents, id )
} }
}; };
/**
* @param torrents an array of torrents sorted by Id
* @param id the id to search for
* @return the torrent, or null
*/
Torrent.lookup = function( torrents, id )
{
var immutable_array = torrents.slice();
var pos = Torrent.indexOf( immutable_array, id );
return pos >= 0 ? immutable_array[pos] : null;
};
function TorrentFile(file_data) { function TorrentFile(file_data) {
this.initialize(file_data); this.initialize(file_data);
} }

24
web/javascript/transmission.js
View file

@ -25,7 +25,7 @@ Transmission.prototype =
// Initialize the implementation fields // Initialize the implementation fields
this._current_search = ''; this._current_search = '';
this._torrents = [ ]; this._torrents = { };
this._rows = [ ]; this._rows = [ ];
// Initialize the clutch preferences // Initialize the clutch preferences
@ -310,7 +310,10 @@ Transmission.prototype =
getAllTorrents: function() getAllTorrents: function()
{ {
return this._torrents; var torrents = [];
for(var key in this._torrents)
torrents.push(this._torrents[key]);
return torrents;
}, },
getVisibleTorrents: function() getVisibleTorrents: function()
@ -657,7 +660,7 @@ Transmission.prototype =
var match = $(element).closest('.inspector_torrent_file_list_entry').attr('id').match(/^t(\d+)f(\d+)$/); var match = $(element).closest('.inspector_torrent_file_list_entry').attr('id').match(/^t(\d+)f(\d+)$/);
var torrent_id = match[1]; var torrent_id = match[1];
var file_id = match[2]; var file_id = match[2];
var torrent = Torrent.lookup( this._torrents, torrent_id ); var torrent = this._torrents[torrent_id];
return torrent._file_view[file_id]; return torrent._file_view[file_id];
}, },
@ -1151,7 +1154,7 @@ Transmission.prototype =
var new_torrent_ids = []; var new_torrent_ids = [];
var refresh_files_for = []; var refresh_files_for = [];
jQuery.each( active, function() { jQuery.each( active, function() {
var t = Torrent.lookup(tr._torrents, this.id); var t = tr._torrents[this.id];
if (t){ if (t){
t.refresh(this); t.refresh(this);
if(t.isSelected()) if(t.isSelected())
@ -1181,7 +1184,7 @@ Transmission.prototype =
var tr = this; var tr = this;
var listIsVisible = tr.fileListIsVisible( ); var listIsVisible = tr.fileListIsVisible( );
jQuery.each( torrents, function() { jQuery.each( torrents, function() {
var t = Torrent.lookup(tr._torrents, this.id); var t = tr._torrents[this.id];
if (t) { if (t) {
t.refreshFileModel(this); t.refreshFileModel(this);
if( listIsVisible && t.isSelected()) if( listIsVisible && t.isSelected())
@ -1200,8 +1203,10 @@ Transmission.prototype =
var transferFragment = document.createDocumentFragment( ); var transferFragment = document.createDocumentFragment( );
var fileFragment = document.createDocumentFragment( ); var fileFragment = document.createDocumentFragment( );
for( var i=0, row; row=new_torrents[i]; ++i ) for( var i=0, row; row=new_torrents[i]; ++i ) {
this._torrents.push( new Torrent( transferFragment, fileFragment, this, row ) ); var new_torrent = new Torrent( transferFragment, fileFragment, this, row );
this._torrents[new_torrent.id()] = new_torrent;
}
this._inspector_file_list.appendChild( fileFragment ); this._inspector_file_list.appendChild( fileFragment );
this._torrent_list.appendChild( transferFragment ); this._torrent_list.appendChild( transferFragment );
@ -1215,7 +1220,7 @@ Transmission.prototype =
var tr = this; var tr = this;
var removedAny = false; var removedAny = false;
$.each( torrent_ids, function(index, id){ $.each( torrent_ids, function(index, id){
var torrent = Torrent.lookup(tr._torrents, id); var torrent = tr._torrents[id];
if(torrent) { if(torrent) {
removedAny = true; removedAny = true;
@ -1227,10 +1232,9 @@ Transmission.prototype =
e.remove(); e.remove();
} }
var pos = Torrent.indexOf( tr._torrents, torrent.id( ) );
torrent.hideFileList(); torrent.hideFileList();
torrent.deleteFiles(); torrent.deleteFiles();
tr._torrents.splice( pos, 1 ); delete tr._torrents[torrent.id()];
} }
}); });