Changeset 401

Timestamp:

07/02/08 08:17:50 (2 months ago)

Author:

charles

Message:

(1) implement sorting by tracker, by ratio, and by activity. (2) get the torrent list's pause/resume button working again. (3) fix ratio error.

Files:

• branches/rpc/web/javascript/common.js (modified) (1 diff)
• branches/rpc/web/javascript/torrent.js (modified) (15 diffs)
• branches/rpc/web/javascript/transmission.js (modified) (4 diffs)
• branches/rpc/web/javascript/transmission.remote.js (modified) (2 diffs)

branches/rpc/web/javascript/common.js

@@ -254 +254 @@
-}
-
+/**
+ * @brief strcmp()-style compare useful for sorting
+ */
+String.prototype.compareTo = function( that ) {
+        // FIXME: how to fold these two comparisons together?
+        if( this < that ) return -1;
+        if( this > that ) return 1;
+        return 0;
+}
+
+
-/***
-****  Preferences

branches/rpc/web/javascript/torrent.js

@@ -12 +12 @@
-
-// Constants
-Seeding         = 'seeding'
-Downloading     = 'downloading'
-Paused          = 'paused'
-Checking        = 'verifying local data'
-WaitingToCheck  =  'waiting to verify'
+WaitingToCheck  = 1
+Checking        = 2
+Downloading     = 4
+Seeding         = 8
+Paused          = 16
-Torrent._InfiniteTimeRemaining = 215784000; // 999 Hours - may as well be infinite
-Torrent._MaxProgressBarWidth   = 100; // reduce this to make the progress bar shorter (%)
@@ -132 +132 @@
-        size: function() { return this._size; },
-        state: function() { return this._state; },
+        stateStr: function() {
+                switch( this.state() ) {
+                        case Torrent._StatusSeeding:        return 'Seeding';
+                        case Torrent._StatusDownloading:    return 'Downloading';
+                        case Torrent._StatusPaused:         return 'Paused';
+                        case Torrent._StatusChecking:       return 'Verifying local data';
+                        case Torrent._StatusWaitingToCheck: return 'Waiting to verify';
+                        default:                            return 'error';
+                }
+        },
-        swarmSpeed: function() { return this._swarm_speed; },
-        totalLeechers: function() { return this._total_leechers; },
@@ -207 +217 @@
-         * Process a click event on the pause/resume button
-         */
-
-
+
+
+
-                event.stopPropagation();
+
+                // either stop or start the torrent
-                var torrent = event.data.element._torrent;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-        },
-
@@ -244 +247 @@
-        {
-                // These variables never change after the inital load
-                if (data.name)         this._name         = data.name;
-                if (data.isPrivate)    this._is_private   = data.isPrivate;
-                if (data.hashString)   this._hashString   = data.hashString;
@@ -254 +256 @@
-                if (data.dateCreated)  this._creator_date = data.dateCreated;
-                if (data.path)         this._torrent_file = data.path;//FIXME
+                if (data.name) {
+                        this._name = data.name;
+                        this._name_lc = this._name.toLowerCase( );
+                }
-                
-                // Set the regularly-changing torrent variables
@@ -272 +278 @@
-                this._total_leechers    = data.leechers;
-                this._total_seeders     = data.seeders;
-
-
-
-
-
-
-
-
-
-
+
-                
-                // Get -1 returned sometimes (maybe torrents with errors?)
@@ -299 +296 @@
-                
-                // Figure out the percent completed
-_completed
-_completed
+
+
-                
-                // Add the progress bar
@@ -306 +303 @@
-                if( notDone )
-                {
+                        var eta = '';
+                        
+                        if( this.isActive( ) )
+                        {
+                                eta = '-';
+                                if (this._eta < 0 || this._eta >= Torrent._InfiniteTimeRemaining )
+                                        eta += 'remaining time unknown';
+                                else
+                                        eta += Math.formatSeconds(this._eta) + ' remaining';
+                        }
+                        
-                        // Create the 'progress details' label
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                        
-                        // Update the 'in progress' bar
-                        var class_name = (this.isActive()) ? 'in_progress' : 'incomplete_stopped';
-
-
-
-
+
+
+
+
+
-                        
-                        // Update the 'incomplete' bar
-
-
-
+
+
+
+
-                        }
-root._progress_incomplete_container
-root._progress_incomplete_container
+e
+e
-                        
-                        // Create the 'peer details' label
-                        // Eg: 'Downloading from 36 of 40 peers - DL: 60.2 KB/s UL: 4.3 KB/s'
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-                        
-
-
+
+
+
-                        // Update the 'in progress' bar
-                        var class_name = (this.isActive()) ? 'complete' : 'complete_stopped';
-
-
+
+
+
-                        
-                        // Create the 'progress details' label
-                        // Eg: '698.05 MB, uploaded 8.59 GB (Ratio: 12.3)'
-
-
-
+
+
+
+
+
+
-                        
-                        // Hide the 'incomplete' bar
@@ -368 +383 @@
-                        // Create the 'peer details' label
-                        // Eg: 'Seeding to 13 of 22 peers - UL: 36.2 KB/s'
-
-
-
+
+
+
+
+
+
+
+
+
+
-                }
-                
@@ -377 +399 @@
-                
-                // Update the peer details and pause/resume button
-if (this._state == Torrent._StatusPaused ) {
-       peer_details = 'Paused';
-root._pause_resume_button_image[0]
-root._pause_resume_button_image[0]
+e = root._pause_resume_button_image[0];
+if ( this.state() == Torrent._StatusPaused ) {
+e
+e
-                } else {
-
-
-
-
-
+
+
+
+
+
+
+
-                        peer_details = this._error_message;
-                }
@@ -432 +456 @@
-                        return pass;
-                
-name().toLowerCase()
+_name_lc
-                pass = pos != -1;
-                return pass;
@@ -450 +474 @@
-/** Helper function for sortTorrents(). */
-Torrent.compareByName = function( a, b ) {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-};
-
@@ -461 +492 @@
-};
-
+/** Helper function for sortTorrents(). */
+Torrent.compareByProgress = function( a, b ) {
+        var a_prog = Math.ratio( a._completed, a._size );
+        var b_prog = Math.ratio( b._completed, b._size );
+        if( a_prog !== b_prog )
+                return a_prog - b_prog;
+        var a_ratio = Math.ratio( a._upload_total, a._download_total );
+        var b_ratio = Math.ratio( b._upload_total, b._download_total );
+        return a_ratio - b_ratio;
+}
-
-/**
@@ -472 +513 @@
-        {
-                case Prefs._SortByActivity:
-this.compareByAge
+ this.compareByActivity 
-                        break;
-                case Prefs._SortByAge:
-this.compareByAge
+ this.compareByAge 
-                        break;
-                case Prefs._SortByQueue:
-this.compareById
+ this.compareById 
-                        break;
-                case Prefs._SortByProgress:
-
+
+
-                case Prefs._SortByState:
-
+
+
-                case Prefs._SortByTracker:
-
+
+
-                case Prefs._SortByName:
-this.compareByName
+ this.compareByName 
-                        break;
-                default:
@@ -501 +545 @@
-
-/**
+ * @brief fast binary search to find a torrent
- * @param torrents an array of torrents sorted by Id
- * @param id the id to search for

branches/rpc/web/javascript/transmission.js

@@ -853 +853 @@
-                        total_swarm_speed    += t.swarmSpeed();
-                        if( total_state == null )
-
-
-
+Str
+Str
+Str
-                        var tracker = t._tracker;
-                        if ( total_tracker.search ( tracker ) == -1 )  
@@ -1119 +1119 @@
-                        var torrent = torrents[0];
-                        var header = 'Remove ' + torrent.name() + '?';
-
+Str
-                        if( torrent._error_message && torrent._error_message != '' ) message += ', but reporting an error';
-                        message += '. Remove this torrent? ';
@@ -1144 +1144 @@
-                tr.startTorrents( tr.getAllTorrents( ) );
-        },
+        startTorrent: function( torrent ) {
+                this.startTorrents( [ torrent ] );
+        },
-        startTorrents: function( torrents ) {
-                this.remote.startTorrents( torrents );
@@ -1155 +1158 @@
-                var tr = transmission;
-                tr.stopTorrents( tr.getAllTorrents( ) );
+        },
+        stopTorrent: function( torrent ) {
+                this.stopTorrents( [ torrent ] );
-        },
-        stopTorrents: function( torrents ) {

branches/rpc/web/javascript/transmission.remote.js

@@ -39 +39 @@
-
-        /*
-         * Perform a generic remote request
-         */
-        request: function(action, param ) {
-                if (param == null) {
-                        param = '0';
-                }
-                
-                $.ajax({
-                        type: 'GET',
-                        url: 'remote/index.php?action=' + action + 
-                                '&param=' + param,
-                        dataType: "script",
-                        error: this.ajaxError
-                });
-        },
-
-        /*
-         * Display an error if an ajax request fails, and stop sending requests
-         */
-        ajaxError: function(request, error_string, exception) {
-
-
+
+
+
+
-                        this._error = 'Server not responding';
-                
@@ -122 +107 @@
-                o.method = 'session-set';
-                o.arguments = args;
-
+
+
+
-        },
-
-        /*
-         * Upload Torrent by URL
-         */
-        addTorrentByURL: function() {
-                $('#torrent_upload_form')[0].action = 'remote/index.php?action=addTorrentByURL&param=[]';
-                $('#torrent_upload_form').ajaxSubmit({dataType: 'script', type: 'POST'});
-        },
+         */
-};