From 8501ccde77ca1ca091b5813681e4f1c6a692cf13 Mon Sep 17 00:00:00 2001 From: Hamza Zia Date: Wed, 6 Jun 2012 22:50:59 +0800 Subject: [PATCH] updating the values for global settings, very near to completing the feature --- index.html | 76 +++++++++++++++++++------------ js/aria2_settings.js | 3 +- js/script.js | 103 ++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 148 insertions(+), 34 deletions(-) diff --git a/index.html b/index.html index 27add40..5aa8815 100755 --- a/index.html +++ b/index.html @@ -109,31 +109,58 @@ @@ -282,13 +309,8 @@

Global Settings

-
-
- General Settings -
- -
-
+ +
diff --git a/js/aria2_settings.js b/js/aria2_settings.js index 4bb4870..63b1056 100644 --- a/js/aria2_settings.js +++ b/js/aria2_settings.js @@ -199,7 +199,8 @@ var input_file_settings = [ }, { name: "file-allocation", - desc: "Specify file allocation method. none doesn't pre-allocate file space. prealloc pre-allocates file space before download begins. This may take some time depending on the size of the file. If you are using newer file systems such as ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), falloc is your best choice. It allocates large(few GiB) files almost instantly. Don't use falloc with legacy file systems such as ext3 and FAT32 because it takes almost same time as prealloc and it blocks aria2 entirely until allocation finishes. falloc may not be available if your system doesn't have posix_fallocate(3) function. Possible Values: none, prealloc, falloc Default: prealloc" + desc: "Specify file allocation method. none doesn't pre-allocate file space. prealloc pre-allocates file space before download begins. This may take some time depending on the size of the file. If you are using newer file systems such as ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), falloc is your best choice. It allocates large(few GiB) files almost instantly. Don't use falloc with legacy file systems such as ext3 and FAT32 because it takes almost same time as prealloc and it blocks aria2 entirely until allocation finishes. falloc may not be available if your system doesn't have posix_fallocate(3) function. Possible Values: none, prealloc, falloc Default: prealloc", + options: ["none", "prealloc", "falloc"] }, { name: "follow-metalink", diff --git a/js/script.js b/js/script.js index 92a50e8..b26291b 100755 --- a/js/script.js +++ b/js/script.js @@ -127,13 +127,104 @@ $(function() { }); $('#addNewDownload').click(newDownload); }); -function custom_global_settings() { - var templ = $('#global_general_settings_template').text(); - var item = Mustache.render(templ, { - general: input_file_settings +function check_global(name) { + for(var i = 0; i < global_settings_exclude.length; i++) { + if(global_settings_exclude[i] === name) { + return false; + } + } + return true; +} +function get_global_settings(cb) { + var sets = []; + var tmp_set; + for(var i = 0; i < input_file_settings.length; i++) { + tmp_set = input_file_settings[i]; + if(check_global(tmp_set)) { + sets.push(tmp_set); + } + } + for(var i = 0; i < global_settings.length; i++) { + tmp_set = global_settings[i]; + if(check_global(tmp_set)) { + sets.push(tmp_set); + } + } + aria_syscall({ + func: 'getGlobalOption', + success: function(data) { + var res = data.result; + console.log(res); + for(var i in data.result) { + for(var j = 0; j < sets.length; j++) { + if(sets[j].name === i) { + sets[j].value = res[i].trim(); + sets[j].has_value = true; + if(sets[j].option) { + for(var k = 0; k < sets[j].options.length; k++) { + var tmp = { + val: sets[j].options[k].toString(), + disp: sets[j].options[k].toString() + }; + if(sets[j].options[k].toString() === sets[j].value) { + tmp.val = sets[j].value + '" selected="true'; + } + sets[j].options[k] = tmp; + } + } + } + } + } + cb(sets); + }, + error: function() { + alert("Connection to aria server failed"); + } + }); +} +function custom_global_settings() { + var gen = function(name) { + return { name: name, values: [] }; + } + var general_settings = gen("General Settings"); + var torrent_settings = gen("Bit-Torrent Settings"); + var ftp_settings = gen("FTP Settings"); + var http_settings = gen("HTTP(S) Settings"); + var metalink_settings = gen("Metalink Settings"); + + get_global_settings(function(sets) { + for(var i = 0; i < sets.length; i++) { + var set = sets[i]; + if(set.name.indexOf("bt") !== -1 || set.name.indexOf("torrent") !== -1) { + torrent_settings.values.push(set); + } + else if(set.name.indexOf("metalink") !== -1) { + metalink_settings.values.push(set); + } + else if(set.name.indexOf("http") !== -1) { + http_settings.values.push(set); + } + else if(set.name.indexOf("ftp") !== -1) { + ftp_settings.values.push(set); + } + else + general_settings.values.push(set); + + } + + var templ = $('#global_general_settings_template').text(); + var item = Mustache.render(templ, { + settings: [ + general_settings, + http_settings, + ftp_settings, + torrent_settings, + metalink_settings + ] + }); + $('#dynamic_global_settings').html(item); + modals.global_settings_modal.modal('show'); }); - $('#dynamic_global_settings').html(item); - modals.global_settings_modal.modal('show'); } function addDownload(uris) {