addTrackers refactoring

README.md

@@ -2,20 +2,17 @@
 
 ## TODO (before release)
 
-* use proper node function signatures (first argument is `err`)
-* handle errors by adding retry button (must be using node style callback signatures first)
-* verify bug fix: add torrent successfully, change host, attempt to add torrent again; infinite loop (partially due to cached session id)
-* test: only adds additional trackers if the option is enabled
 * inspect [license of icon file](http://www.veryicon.com/icons/system/arcade-daze-apps-vol-1/transmission-2.html)
 * set up automatic updates
-* do rigorous hand testing
 * bump version
 * package the plugin
 * write up installation/usage for README
 
 
 ## TODO (after release)
 
+* use proper node function signatures (first argument is `err`)
+* handle errors by adding retry button (must be using node style callback signatures first)
 * don't make user type in password repeatedly (send request to background page to store password in closure for X seconds)
 * don't require save button on options page
 * find a way to test this thing

popup.html

@@ -32,8 +32,8 @@ <h3 id="rpc"></h3>
 
 	<p>
 		<button id="addTorrent" disabled="disabled">Add Torrent</button>
-		<button id="close" class="hidden">Close</button>
 		<button id="retry" class="hidden">Retry</button>
+		<button id="close" class="hidden">Close</button>
 	</p>
 
 	<script type="text/javascript" src="popup.js"></script>

popup.js

@@ -163,13 +163,11 @@
 
 	var addTrackers = function(torrent, callback){
 		if(!torrent || !torrent.id || !torrent.hashString)
-			return error('attempted to add trackers to an invalid torrent');
-		info('fetching tracker list');
-		getTrackers(torrent.hashString, function(trackers){
-			info('retrieved tracker list', trackers);
-			if(!trackers || !getOption('AddTrackers')) trackers = [];
-			var additionalTrackers = getOption('AdditionalTrackers');
-			info('adding supplementary trackers', trackers, additionalTrackers);
+			return error('attempted to add trackers to an invalid torrent', torrent);
+		var additionalTrackers = getOption('AdditionalTrackers');
+		var next = function(trackers){
+			if(additionalTrackers.length)
+				info('adding supplementary trackers', additionalTrackers);
 			trackers = trackers.concat(additionalTrackers);
 			if(!trackers.length)
 				return typeof callback=='function' ? callback([]) : null;
@@ -191,7 +189,16 @@
 			var basicAuth = 'Basic '+Base64.encode(authentication.username+':'+authentication.password);
 			if(authentication.enabled) xhr.setRequestHeader('Authorization', basicAuth);
 			xhr.send(JSON.stringify(postData));
-		});
+		}
+		if(getOption('AddTrackers')) {
+			info('fetching tracker list');
+			getTrackers(torrent.hashString, function(trackers){
+				info('retrieved tracker list', trackers);
+				return next(trackers || []);
+			});
+		} else {
+			next([]);
+		}
 	};
 
 
@@ -246,7 +253,9 @@
 						if(trackers)
 							info('added ' + trackers.length + ' additional trackers', trackers);
 						log('done')('done');
-						removeClass.call($(success ? 'close' : 'retry'), 'hidden');
+						if(!success) removeClass.call($('retry'), 'hidden');
+						removeClass.call($('close'), 'hidden');
+						$(success ? 'close' : 'retry').focus();
 					});
 				});
 			});