Changeset 7764

Timestamp:

Jan 20, 2009, 6:58:57 AM (13 years ago)

Author:

duncanbeevers

Message:

Merge 7762 from trunk. Add support for uploading torrents by url to web interface.

Location:

branches/1.5x/web

Files:

• index.html (modified) (1 diff)
• javascript/transmission.js (modified) (1 diff)
• javascript/transmission.remote.js (modified) (1 diff)
• stylesheets/common.css (modified) (1 diff)

branches/1.5x/web/index.html

@@ -256 +256 @@
                                         enctype="multipart/form-data" target="torrent_upload_frame">  
                                         <div class="dialog_message">
-                                                Please select a torrent file to upload:
+                                                <label for="torrent_upload_file">Please select a torrent file to upload:</label>
                                                         <input type="file" name="torrent_file" id="torrent_upload_file"/>
+                                                <label for="torrent_upload_url">Or enter a URL:</label>
+                                                        <input type="text" id="torrent_upload_url"/>
                                         </div>
                                         <a href="#upload" id="upload_confirm_button">Upload</a>

branches/1.5x/web/javascript/transmission.js

@@ -1165 +1165 @@
                         var tr = this;
                         var args = { };
-                        args.url = '/transmission/upload?paused=' + (this[Prefs._AutoStart] ? 'false' : 'true');
-                        args.type = 'POST';
-                        args.dataType = 'xml';
-                        args.iframe = true;
-                        args.success = function( data ) {
-                                tr.remote.loadTorrents( );
-                                tr.togglePeriodicRefresh( true );
-                        };
-                        this.togglePeriodicRefresh( false );
-                        $('#torrent_upload_form').ajaxSubmit( args );
+                        if ('' != $('#torrent_upload_url').val()) {
+                                tr.remote.addTorrentByUrl($('#torrent_upload_url').val(), { paused: !this[Prefs._Autostart] });
+                        } else {
+                                args.url = '/transmission/upload?paused=' + (this[Prefs._AutoStart] ? 'false' : 'true');
+                                args.type = 'POST';
+                                args.dataType = 'xml';
+                                args.iframe = true;
+                                args.success = function( data ) {
+                                        tr.remote.loadTorrents( );
+                                        tr.togglePeriodicRefresh( true );
+                                };
+                                this.togglePeriodicRefresh( false );
+                                $('#torrent_upload_form').ajaxSubmit( args );
+                        }
                 }
         },

branches/1.5x/web/javascript/transmission.remote.js

@@ -122 +122 @@
                 this.sendTorrentCommand( 'torrent-remove', torrents );
         },
-
+        addTorrentByUrl: function( url, options ) {
+                this.sendRequest( RPC._Root, $.toJSON({
+                        method: 'torrent-add',
+                        arguments: {
+                                paused: (options.paused ? 'true' : 'false'),
+                                filename: url
+                        }
+                }) );
+        },
         savePrefs: function( args ) {
                 var remote = this;

branches/1.5x/web/stylesheets/common.css

@@ -727 +727 @@
 div#upload_container div.dialog_window div.dialog_message input {
         width: 249px;
-        margin: 10px 0 0 0;
+        margin: 3px 0 0 0;
         display: block;
 }