q3aql/webui-aria2
q3aql/webui-aria2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #192 from Twilight/master

Browse Source 
do not try default config if we have cookie
This commit is contained in:
hamza zia 2016-03-10 13:43:20 -05:00
commit 864bc8a5a6
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/services/rpc/rpc.js
View File

@ -6,7 +6,7 @@ angular
.factory('$rpc', [ .factory('$rpc', [
'$syscall', '$globalTimeout', '$alerts', '$utils', '$syscall', '$globalTimeout', '$alerts', '$utils',
'$rootScope', '$location', '$authconf', '$rootScope', '$location', '$authconf',
function(syscall, time, alerts, utils, rootScope, uri, authconf) { function(syscall, globalTimeout, alerts, utils, rootScope, uri, authconf) {
var subscriptions = [] var subscriptions = []
, configurations = [authconf] , configurations = [authconf]
@ -16,9 +16,8 @@ function(syscall, time, alerts, utils, rootScope, uri, authconf) {
, forceNextUpdate = false; , forceNextUpdate = false;
var cookieConf = utils.getCookie('aria2conf'); var cookieConf = utils.getCookie('aria2conf');
// try at the start, so that it is presistant even when default authconf works // try at the start, so that it is presistant even when default authconf works
if (cookieConf) configurations.push(cookieConf); if(cookieConf) configurations.unshift(cookieConf);
if (['http', 'https'].indexOf(uri.protocol()) != -1 && uri.host() != 'localhost') { if (['http', 'https'].indexOf(uri.protocol()) != -1 && uri.host() != 'localhost') {
console.log(uri.host()); console.log(uri.host());
@ -95,7 +94,7 @@ function(syscall, time, alerts, utils, rootScope, uri, authconf) {
} }
else { else {
alerts.addAlert('<strong>Oh Snap!</strong> Could not connect to the aria2 RPC server. Will retry in 10 secs. You might want to check the connection settings by going to Settings > Connection Settings', 'error'); alerts.addAlert('<strong>Oh Snap!</strong> Could not connect to the aria2 RPC server. Will retry in 10 secs. You might want to check the connection settings by going to Settings > Connection Settings', 'error');
timeout = setTimeout(update, $globalTimeout); timeout = setTimeout(update, globalTimeout);
} }
}; };
@ -109,7 +108,7 @@ function(syscall, time, alerts, utils, rootScope, uri, authconf) {
if (failed) { if (failed) {
alerts.addAlert('<strong>Oh Snap!</strong> Authentication failed while connecting to Aria2 RPC server. Will retry in 10 secs. You might want to confirm your authentication details by going to Settings > Connection Settings', 'error'); alerts.addAlert('<strong>Oh Snap!</strong> Authentication failed while connecting to Aria2 RPC server. Will retry in 10 secs. You might want to confirm your authentication details by going to Settings > Connection Settings', 'error');
timeout = setTimeout(update, $globalTimeout); timeout = setTimeout(update, globalTimeout);
return; return;
} }
@ -153,7 +152,7 @@ function(syscall, time, alerts, utils, rootScope, uri, authconf) {
timeout = setTimeout(update, 0); timeout = setTimeout(update, 0);
} }
else { else {
timeout = setTimeout(update, time); timeout = setTimeout(update, globalTimeout);
} }
}, },
error: error error: error
@ -161,7 +160,7 @@ function(syscall, time, alerts, utils, rootScope, uri, authconf) {
}; };
// initiate the update loop // initiate the update loop
timeout = setTimeout(update, time); timeout = setTimeout(update, globalTimeout);
return { return {
// conf can be configuration or array of configurations, // conf can be configuration or array of configurations,