+
+
-
-
-
diff --git a/js/ctrls/download.js b/js/ctrls/download.js
index a11a6df..4ab07de 100644
--- a/js/ctrls/download.js
+++ b/js/ctrls/download.js
@@ -16,9 +16,11 @@ function(
var re_slashes = /\\/g;
var slash = "/";
+ var allStopped = [];
scope.active = [], scope.waiting = [], scope.stopped = [];
scope.gstats = {};
+ scope.hideLinkedMetadata = true;
// pause the download
// d: the download ctx
@@ -36,30 +38,28 @@ function(
// put it in stopped list if active,
// otherwise permanantly remove it
// d: the download ctx
- scope.remove = function(d, cb) {
+ scope.remove = function(d, cb, noConfirm) {
+ if (!noConfirm && !confirm("Remove %s and associated meta-data?".replace("%s", d.name))) {
+ return;
+ }
var method = 'remove';
if (scope.getType(d) == 'stopped')
method = 'removeDownloadResult';
+ if (d.followedFrom) {
+ scope.remove(d.followedFrom, function() {}, true);
+ d.followedFrom = null;
+ }
rpc.once(method, [d.gid], cb);
-
- // also remove it from client cache assuming that it will be deleted in the aria2 list,
- // but we could be wrong but the cache will update in next global update
- var downloads = [scope.active, scope.waiting, scope.stopped], ind = -1, i;
- for (i = 0; i < downloads.length; i++) {
- ind = downloads[i].indexOf(d);
- if (ind != -1) break;
- }
-
- if (ind == -1) {
- return;
- }
-
- downloads[i].splice(ind, 1);
}
scope.restart = function(d) {
+ // XXX broken in general: does not work with torrents
+ // XXX broken in general: does not carry over prefs
+ // XXX broken in particular: uris no longer stored in context object
+ throw new Error("broken");
+
var uris =
_.chain(d.files).map(function(f) { return f.uris })
.filter(function(uris) { return uris.length })
@@ -79,26 +79,57 @@ function(
// start filling in the model of active,
// waiting and stopped download
rpc.subscribe('tellActive', [], function(data) {
- utils.mergeMap(data[0], scope.active, scope.getCtx);
+ scope.$apply(function() {
+ utils.mergeMap(data[0], scope.active, scope.getCtx);
+ });
});
rpc.subscribe('tellWaiting', [0, 1000], function(data) {
- utils.mergeMap(data[0], scope.waiting, scope.getCtx);
+ scope.$apply(function() {
+ utils.mergeMap(data[0], scope.waiting, scope.getCtx);
+ });
});
rpc.subscribe('tellStopped', [0, 1000], function(data) {
- utils.mergeMap(data[0], scope.stopped, scope.getCtx);
+ scope.$apply(function() {
+ if (!scope.hideLinkedMetadata) {
+ utils.mergeMap(data[0], scope.stopped, scope.getCtx);
+ return;
+ }
+ utils.mergeMap(data[0], allStopped, scope.getCtx);
+ var gids = {};
+ _.forEach(allStopped, function(e) {
+ gids[e.gid] = e;
+ });
+ _.forEach(scope.active, function(e) {
+ gids[e.gid] = e;
+ });
+ _.forEach(scope.waiting, function(e) {
+ gids[e.gid] = e;
+ });
+ scope.stopped = _.filter(allStopped, function(e) {
+ if (!e.metadata || !e.followedBy || !(e.followedBy in gids)) {
+ return true;
+ }
+ var linked = gids[e.followedBy];
+ linked.followedFrom = e;
+ return false;
+ });
+ });
});
rpc.subscribe('getGlobalStat', [], function(data) {
- scope.gstats = data[0];
- window.document.title = utils.getTitle(scope.gstats);
-
+ scope.$apply(function() {
+ scope.gstats = data[0];
+ window.document.title = utils.getTitle(scope.gstats);
+ });
});
rpc.once('getVersion', [], function(data) {
- scope.miscellaneous = data[0];
+ scope.$apply(function() {
+ scope.miscellaneous = data[0];
+ });
});
// total number of downloads, updates dynamically as downloads are
@@ -151,6 +182,7 @@ function(
scope.filterError = !scope.filterError;
scope.filterPaused = !scope.filterPaused;
scope.filterRemoved = !scope.filterRemoved;
+ scope.persistFilters();
};
scope.resetFilters = function() {
@@ -163,9 +195,38 @@ function(
scope.filterRemoved =
true;
scope.clearFilter();
+ scope.persistFilters();
};
- scope.resetFilters();
+ scope.persistFilters = function() {
+ var o = JSON.stringify({
+ s: scope.filterSpeed,
+ a: scope.filterActive,
+ w: scope.filterWaiting,
+ c: scope.filterComplete,
+ e: scope.filterError,
+ p: scope.filterPaused,
+ r: scope.filterRemoved
+ });
+ utils.setCookie("aria2filters", o);
+ };
+
+ scope.loadFilters = function() {
+ var o = JSON.parse(utils.getCookie("aria2filters"));
+ if (!o) {
+ scope.resetFilters();
+ return;
+ }
+ scope.filterSpeed = !!o.s;
+ scope.filterActive = !!o.a;
+ scope.filterWaiting = !!o.w;
+ scope.filterComplete = !!o.c;
+ scope.filterError = !!o.e;
+ scope.filterPaused = !!o.p;
+ scope.filterRemoved = !!o.r;
+ };
+
+ scope.loadFilters();
// max downloads shown in one page
@@ -243,6 +304,9 @@ function(
dir: d.dir,
status: d.status,
gid: d.gid,
+ followedBy: (d.followedBy && d.followedBy.length == 1
+ ? d.followedBy[0] : null),
+ followedFrom: null,
numPieces: d.numPieces,
connections: d.connections,
bitfield: d.bitfield,
@@ -266,6 +330,9 @@ function(
ctx.dir = d.dir;
ctx.status = d.status;
ctx.gid = d.gid;
+ ctx.followedBy = (d.followedBy && d.followedBy.length == 1
+ ? d.followedBy[0] : null);
+ ctx.followedFrom = null;
ctx.numPieces = d.numPieces;
ctx.connections = d.connections;
ctx.bitfield = d.bitfield;
diff --git a/js/old/aria2_settings.js b/js/old/aria2_settings.js
deleted file mode 100755
index f03e56b..0000000
--- a/js/old/aria2_settings.js
+++ /dev/null
@@ -1,551 +0,0 @@
-/* {{{ input_file_settings */
-var input_file_settings = [
- {
- name: "all-proxy",
- desc: 'Use this proxy server for all protocols. To erase previously defined proxy, use "". You can override this setting and specify a proxy server for a particular protocol using http-proxy, https-proxy and ftp-proxy options. This affects all URIs. The format of PROXY is [http://][USER:PASSWORD@]HOST[:PORT].'
- },
- {
- name: "all-proxy-passwd",
- desc: "Set password for all-proxy option."
- },
-
- {
- name: "all-proxy-user",
- desc: "Set user for all-proxy option."
- },
- {
- name: "allow-overwrite",
- desc: "Restart download from scratch if the corresponding control file doesn't exist. See also auto-file-renaming option. Default: false",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "allow-piece-length-change",
- desc: "If false is given, aria2 aborts download when a piece length is different from one in a control file. If true is given, you can proceed but some download progress will be lost. Default: false",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "always-resume",
- desc: "Always resume download. If true is given, aria2 always tries to resume download and if resume is not possible, aborts download. If false is given, when all given URIs do not support resume or aria2 encounters N URIs which does not support resume (N is the value specified using --max-resume-failure-tries option), aria2 downloads file from scratch. See --max-resume-failure-tries option. Default: true",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "async-dns",
- desc: "Enable asynchronous DNS. Default: true",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "auto-file-renaming",
- desc: "Rename file name if the same file already exists. This option works only in HTTP(S)/FTP download. The new file name has a dot and a number(1..9999) appended. Default: true",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "bt-enable-lpd",
- desc: "Enable Local Peer Discovery. If a private flag is set in a torrent, aria2 doesn't use this feature for that download even if true is given. Default: false",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "bt-exclude-tracker",
- desc: "Comma separated list of BitTorrent tracker's announce URI to remove. You can use special value * which matches all URIs, thus removes all announce URIs. When specifying * in shell command-line, don't forget to escape or quote it. See also --bt-tracker option."
- },
- {
- name: "bt-external-ip",
- desc: "Specify the external IP address to report to a BitTorrent tracker. Although this function is named external, it can accept any kind of IP addresses. IPADDRESS must be a numeric IP address."
- },
- {
- name: "bt-hash-check-seed",
- desc: "If true is given, after hash check using --check-integrity option and file is complete, continue to seed file. If you want to check file and download it only when it is damaged or incomplete, set this option to false. This option has effect only on BitTorrent download. Default: true",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "bt-max-open-files",
- desc: "Specify maximum number of files to open in each BitTorrent download. Default: 100"
- },
- {
- name: "bt-max-peers",
- desc: "Specify the maximum number of peers per torrent. 0 means unlimited. See also bt-request-peer-speed-limit option. Default: 55"
- },
- {
- name: "bt-metadata-only",
- desc: "Download metadata only. The file(s) described in metadata will not be downloaded. This option has effect only when BitTorrent Magnet URI is used. See also --bt-save-metadata option. Default: false",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "bt-min-crypto-level",
- desc: "Set minimum level of encryption method. If several encryption methods are provided by a peer, aria2 chooses the lowest one which satisfies the given level. Default: plain",
- option:true,
- options: ["plain", "arc4"]
- },
- {
- name: "bt-prioritize-piece",
- desc: "Try to download first and last pieces of each file first. This is useful for previewing files. The argument can contain 2 keywords: head and tail. To include both keywords, they must be separated by comma. These keywords can take one parameter, SIZE. For example, if head= is specified, pieces in the range of first SIZE bytes of each file get higher priority. tail= means the range of last SIZE bytes of each file. SIZE can include K or M (1K = 1024, 1M = 1024K). If SIZE is omitted, SIZE=1M is used."
- },
- {
- name: "bt-request-peer-speed-limi",
- desc: "If the whole download speed of every torrent is lower than SPEED, aria2 temporarily increases the number of peers to try for more download speed. Configuring this option with your preferred download speed can increase your download speed in some cases. You can append K or M (1K = 1024, 1M = 1024K). Default: 50K"
- },
- {
- name: "bt-require-crypto",
- desc: "If true is given, aria2 doesn't accept and establish connection with legacy BitTorrent handshake(19BitTorrent protocol). Thus aria2 always uses Obfuscation handshake. Default: false",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "bt-save-metadata",
- desc: "Save metadata as .torrent file. This option has effect only when BitTorrent Magnet URI is used. The filename is hex encoded info hash with suffix .torrent. The directory to be saved is the same directory where download file is saved. If the same file already exists, metadata is not saved. See also --bt-metadata-only option. Default: false",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "bt-seed-unverified",
- desc: "Seed previously downloaded files without verifying piece hashes. Default: false",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "bt-stop-timeout",
- desc: "Stop BitTorrent download if download speed is 0 in consecutive SEC seconds. If 0 is given, this feature is disabled. Default: 0"
- },
- {
- name: "bt-tracker",
- desc: "Comma separated list of additional BitTorrent tracker's announce URI. These URIs are not affected by --bt-exclude-tracker option because they are added after URIs in --bt-exclude-tracker option are removed."
- },
- {
- name: "bt-tracker-connect-timeout",
- desc: "Set the connect timeout in seconds to establish connection to tracker. After the connection is established, this option makes no effect and --bt-tracker-timeout option is used instead. Default: 60"
- },
- {
- name: "bt-tracker-interval",
- desc: "Set the interval in seconds between tracker requests. This completely overrides interval value and aria2 just uses this value and ignores the min interval and interval value in the response of tracker. If 0 is set, aria2 determines interval based on the response of tracker and the download progress. Default: 0"
- },
- {
- name: "bt-tracker-timeout",
- desc: "Set timeout in seconds. Default: 60"
- },
- {
- name: "bt-remove-unselected-file",
- desc: "Removes the unselected files when download is completed in BitTorrent. To select files, use --select-file option. If it is not used, all files are assumed to be selected. Please use this option with care because it will actually remove files from your disk. Default: false",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "check-integrity",
- desc: "Check file integrity by validating piece hashes or a hash of entire file. This option has effect only in BitTorrent, Metalink downloads with checksums or HTTP(S)/FTP downloads with --checksum option. If piece hashes are provided, this option can detect damaged portions of a file and re-download them. If a hash of entire file is provided, hash check is only done when file has been already download. This is determined by file length. If hash check fails, file is re-downloaded from scratch. If both piece hashes and a hash of entire file are provided, only piece hashes are used. Default: false",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "conditional-get",
- desc: "Download file only when the local file is older than remote file. This function only works with HTTP(S) downloads only. It does not work if file size is specified in Metalink. It also ignores Content-Disposition header. If a control file exists, this option will be ignored. This function uses If-Modified-Since header to get only newer file conditionally. When getting modification time of local file, it uses user supplied filename(see --out option) or filename part in URI if --out is not specified. To overwrite existing file, --allow-overwrite is required. Default: false",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "connect-timeout",
- desc: "Set the connect timeout in seconds to establish connection to HTTP/FTP/proxy server. After the connection is established, this option makes no effect and --timeout option is used instead. Default: 60"
- },
- {
- name: "continue",
- desc: "Continue downloading a partially downloaded file. Use this option to resume a download started by a web browser or another program which downloads files sequentially from the beginning. Currently this option is only applicable to HTTP(S)/FTP downloads.",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "dir",
- desc: "The directory to store the downloaded file."
- },
- {
- name: "dry-run",
- desc: "If true is given, aria2 just checks whether the remote file is available and doesn't download data. This option has effect on HTTP/FTP download. BitTorrent downloads are canceled if true is specified. Default: false",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "enable-async-dns6",
- desc: "Enable IPv6 name resolution in asynchronous DNS resolver. This option will be ignored when --async-dns=false. Default: false",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "enable-http-keep-alive",
- desc: "Enable HTTP/1.1 persistent connection. Default: true",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "enable-http-pipelining",
- desc: "Enable HTTP/1.1 pipelining. Default: false",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "enable-peer-exchange",
- desc: "Enable Peer Exchange extension. If a private flag is set in a torrent, this feature is disabled for that download even if true is given. Default: true",
- option:true,
- options: ["true", "false"]
- },
- {
- 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",
- option: true,
- options: ["none", "prealloc", "falloc"]
- },
- {
- name: "follow-metalink",
- desc: "If true or mem is specified, when a file whose suffix is .meta4 or .metalink or content type of application/metalink4+xml or application/metalink+xml is downloaded, aria2 parses it as a metalink file and downloads files mentioned in it. If mem is specified, a metalink file is not written to the disk, but is just kept in memory. If false is specified, the action mentioned above is not taken. Default: true",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "follow-torrent",
- desc: "If true or mem is specified, when a file whose suffix is .torrent or content type is application/x-bittorrent is downloaded, aria2 parses it as a torrent file and downloads files mentioned in it. If mem is specified, a torrent file is not written to the disk, but is just kept in memory. If false is specified, the action mentioned above is not taken. Default: true",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "ftp-passwd",
- desc: "Set FTP password. This affects all URIs. If user name is embedded but password is missing in URI, aria2 tries to resolve password using .netrc. If password is found in .netrc, then use it as password. If not, use the password specified in this option. Default: ARIA2USER@"
- },
- {
- name: "ftp-pasv",
- desc: "Use the passive mode in FTP. If false is given, the active mode will be used. Default: true",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "ftp-proxy",
- desc: 'Use this proxy server for FTP. To erase previously defined proxy, use "". See also --all-proxy option. This affects all URIs. The format of PROXY is [http://][USER:PASSWORD@]HOST[:PORT].'
- },
- {
- name: "ftp-proxy-passwd",
- desc: "Set password for --ftp-proxy option."
- },
- {
- name: "ftp-proxy-user",
- desc: "Set user for --ftp-proxy option."
- },
- {
- name: "ftp-reuse-connection",
- desc: "Reuse connection in FTP. Default: true.",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "ftp-type",
- desc: "Set FTP transfer type. TYPE is either binary or ascii. Default: binary",
- option:true,
- options: ["binary", "ascii"]
- },
- {
- name: "ftp-user",
- desc: "Set FTP user. This affects all URIs. Default: anonymous"
- },
- {
- name: "header",
- desc: "Append HEADER to HTTP request header."
- },
- {
- name: "http-accept-gzip",
- desc: "Send Accept: deflate, gzip request header and inflate response if remote server responds with Content-Encoding: gzip or Content-Encoding: deflate. Default: false",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "http-auth-challenge",
- desc: "Send HTTP authorization header only when it is requested by the server. If false is set, then authorization header is always sent to the server. There is an exception: if username and password are embedded in URI, authorization header is always sent to the server regardless of this option. Default: false",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "http-no-cache",
- desc: "Send Cache-Control: no-cache and Pragma: no-cache header to avoid cached content. If false is given, these headers are not sent and you can add Cache-Control header with a directive you like using --header option. Default: true",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "http-proxy",
- desc: 'Use this proxy server for HTTP. To erase previously defined proxy, use "". See also --all-proxy option. This affects all URIs. The format of PROXY is [http://][USER:PASSWORD@]HOST[:PORT].'
- },
- {
- name: "http-proxy-passwd",
- desc: "Set password for --http-proxy option."
- },
- {
- name: "http-proxy-user",
- desc: "Set user for --http-proxy option."
- },
- {
- name: "index-out",
- desc: "Set file path for file with index=INDEX. You can find the file index using the --show-files option. PATH is a relative path to the path specified in --dir option. You can use this option multiple times. Using this option, you can specify the output filenames of BitTorrent downloads."
- },
- {
- name: "lowest-speed-limit",
- desc: "Close connection if download speed is lower than or equal to this value(bytes per sec). 0 means aria2 does not have a lowest speed limit. You can append K or M (1K = 1024, 1M = 1024K). This option does not affect BitTorrent downloads. Default: 0"
- },
- {
- name: "max-connection-per-server",
- desc: "The maximum number of connections to one server for each download. Default: 1"
- },
- {
- name: "max-download-limit",
- desc: "Set max download speed per each download in bytes/sec. 0 means unrestricted. You can append K or M (1K = 1024, 1M = 1024K). To limit the overall download speed, use --max-overall-download-limit option. Default: 0"
- },
- {
- name: "max-file-not-found",
- desc: 'If aria2 receives "file not found" status from the remote HTTP/FTP servers NUM times without getting a single byte, then force the download to fail. Specify 0 to disable this option. This options is effective only when using HTTP/FTP servers. Default: 0'
- },
- {
- name: "max-resume-failure-tries",
- desc: "When used with --always-resume=false, aria2 downloads file from scratch when aria2 detects N number of URIs that does not support resume. If N is 0, aria2 downloads file from scratch when all given URIs do not support resume. See --always-resume option. Default: 0"
- },
- {
- name: "max-tries",
- desc: "Set number of tries. 0 means unlimited. See also --retry-wait. Default: 5"
- },
- {
- name: "max-upload-limit",
- desc: "Set max upload speed per each torrent in bytes/sec. 0 means unrestricted. You can append K or M (1K = 1024, 1M = 1024K). To limit the overall upload speed, use --max-overall-upload-limit option. Default: 0"
- },
- {
- name: "metalink-enable-unique-protocol",
- desc: "If true is given and several protocols are available for a mirror in a metalink file, aria2 uses one of them. Use --metalink-preferred-protocol option to specify the preference of protocol. Default: true",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "metalink-language",
- desc: "The language of the file to download."
- },
- {
- name: "metalink-location",
- desc: "The location of the preferred server. A comma-delimited list of locations is acceptable, for example, jp,us."
- },
- {
- name: "metalink-os",
- desc: "The operating system of the file to download."
- },
- {
- name: "metalink-version",
- desc: "The version of the file to download."
- },
- {
- name: "min-split-size",
- desc: "aria2 does not split less than 2*SIZE byte range. For example, let's consider downloading 20MiB file. If SIZE is 10M, aria2 can split file into 2 range [0-10MiB) and [10MiB-20MiB) and download it using 2 sources(if --split >= 2, of course). If SIZE is 15M, since 2*15M > 20MiB, aria2 does not split file and download it using 1 source. You can append K or M (1K = 1024, 1M = 1024K). Possible Values: 1M -1024M Default: 20M"
- },
- {
- name: "no-file-allocation-limit",
- desc: "No file allocation is made for files whose size is smaller than SIZE. You can append K or M (1K = 1024, 1M = 1024K). Default: 5M"
- },
- {
- name: "no-netrc",
- desc: "Disables netrc support. netrc support is enabled by default.Note netrc file is only read at the startup if --no-netrc is false. So if --no-netrc is true at the startup, no netrc is available throughout the session. You cannot get netrc enabled even if you change this setting.",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "no-proxy",
- desc: "Specify comma separated hostnames, domains and network address with or without CIDR block where proxy should not be used."
- },
- {
- name: "out",
- desc: "The file name of the downloaded file. When --force-sequential option is used, this option is ignored."
- },
- {
- name: "parameterized-uri",
- desc: "Enable parameterized URI support. You can specify set of parts: http://{sv1,sv2,sv3}/foo.iso. Also you can specify numeric sequences with step counter: http://host/image[000-100:2].img. A step counter can be omitted. If all URIs do not point to the same file, such as the second example above, -Z option is required. Default: false",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "proxy-method",
- desc: "Set the method to use in proxy request. METHOD is either get or tunnel. HTTPS downloads always use tunnel regardless of this option. Default: get",
- option:true,
- options: ["get", "tunnel"]
- },
- {
- name: "realtime-chunk-checksum",
- desc: "Validate chunk of data by calculating checksum while downloading a file if chunk checksums are provided. Default: true",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "referer",
- desc: "Set Referer. This affects all URIs."
- },
- {
- name: "remote-time",
- desc: "Retrieve timestamp of the remote file from the remote HTTP/FTP server and if it is available, apply it to the local file. Default: false",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "remove-control-file",
- desc: "Remove control file before download. Using with --allow-overwrite=true, download always starts from scratch. This will be useful for users behind proxy server which disables resume.",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "seed-ratio",
- desc: "Specify share ratio. Seed completed torrents until share ratio reaches RATIO. You are strongly encouraged to specify equals or more than 1.0 here. Specify 0.0 if you intend to do seeding regardless of share ratio. If --seed-time option is specified along with this option, seeding ends when at least one of the conditions is satisfied. Default: 1.0"
- },
- {
- name: "seed-time",
- desc: "Specify seeding time in minutes. Also see the --seed-ratio option. Note Specifying --seed-time=0 disables seeding after download completed."
- },
- {
- name: "select-file",
- desc: "Set file to download by specifying its index. You can find the file index using the --show-files option. Multiple indexes can be specified by using ,, for example: 3,6. You can also use - to specify a range: 1-5. , and - can be used together: 1-5,8,9. When used with the -M option, index may vary depending on the query ."
- },
- {
- name: "split",
- desc: "Download a file using N connections. If more than N URIs are given, first N URIs are used and remaining URIs are used for backup. If less than N URIs are given, those URIs are used more than once so that N connections total are made simultaneously. The number of connections to the same host is restricted by --max-connection-per-server option. See also --min-split-size option. Default: 5"
- },
- {
- name: "timeout",
- desc: "Set timeout in seconds. Default: 60"
- },
- {
- name: "use-head",
- desc: "Use HEAD method for the first request to the HTTP server. Default: false",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "user-agent",
- desc: "Set user agent for HTTP(S) downloads. Default: aria2/$VERSION, $VERSION is replaced by package version."
- },
- {
- name: "retry-wait",
- desc: "Set the seconds to wait between retries. With SEC > 0, aria2 will retry download when the HTTP server returns 503 response. Default: 0."
- },
- {
- name: "metalink-base-uri",
- desc: "Specify base URI to resolve relative URI in metalink:url and metalink:metaurl element in a metalink file stored in local disk. If URI points to a directory, URI must end with /."
- },
- {
- name: "pause",
- desc: "Pause download after added. This option is effective only when --enable-rpc=true is given. Default: false",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "stream-piece-selector",
- desc: "Specify piece selection algorithm used in HTTP/FTP download. Piece means fixed length segment which is downloaded in parallel in segmented download. If default is given, aria2 selects piece so that it reduces the number of establishing connection. This is reasonable default behaviour because establishing connection is an expensive operation. If inorder is given, aria2 selects piece which has minimum index. Index=0 means first of the file. This will be useful to view movie while downloading it. --enable-http-pipelining option may be useful to reduce reconnection overhead. Please note that aria2 honors --min-split-size option, so it will be necessary to specify a reasonable value to --min-split-size option. If geom is given, at the beginning aria2 selects piece which has minimum index like inorder, but it exponentially increasingly keeps space from previously selected piece. This will reduce the number of establishing connection and at the same time it will download the beginning part of the file first. This will be useful to view movie while downloading it. Default: default",
- option:true,
- options: ["default", "inorder", "geom"]
- },
- {
- name: "hash-check-only",
- desc: "If true is given, after hash check using --check-integrity option, abort download whether or not download is complete. Default: false",
- option:true,
- options: ["true", "false"]
- },
- {
- name: "checksum",
- desc: "Set checksum. TYPE is hash type. The supported hash type is listed in Hash Algorithms in aria2c -v. DIGEST is hex digest. For example, setting sha-1 digest looks like this: sha-1=0192ba11326fe2298c8cb4de616f4d4140213838 This option applies only to HTTP(S)/FTP downloads."
- },
- {
- name: "piece-length",
- desc: "Set a piece length for HTTP/FTP downloads. This is the boundary when aria2 splits a file. All splits occur at multiple of this length. This option will be ignored in BitTorrent downloads. It will be also ignored if Metalink file contains piece hashes. Default: 1M"
- },
- {
- name: "uri-selector",
- desc: "Specify URI selection algorithm. The possible values are inorder, feedback and adaptive. If inorder is given, URI is tried in the order appeared in the URI list. If feedback is given, aria2 uses download speed observed in the previous downloads and choose fastest server in the URI list. This also effectively skips dead mirrors. The observed download speed is a part of performance profile of servers mentioned in --server-stat-of and --server-stat-if options. If adaptive is given, selects one of the best mirrors for the first and reserved connections. For supplementary ones, it returns mirrors which has not been tested yet, and if each of them has already been tested, returns mirrors which has to be tested again. Otherwise, it doesn't select anymore mirrors. Like feedback, it uses a performance profile of servers. Default: feedback",
- option:true,
- options: ["inorder", "feedback", "adaptive"]
- }
-];
-/* input file settings end }}}*/
-
-/*{{{ global_settings */
-var global_settings = [
- {
- name: "download-result",
- desc: "This option changes the way Download Results is formatted. If OPT is default, print GID, status, average download speed and path/URI. If multiple files are involved, path/URI of first requested file is printed and remaining ones are omitted. If OPT is full, print GID, status, average download speed, percentage of progress and path/URI. The percentage of progress and path/URI are printed for each requested file in each row. Default: default",
- option:true,
- options: ["default", "full"]
- },
- {
- name: "log",
- desc: 'The file name of the log file. If - is specified, log is written to stdout. If empty string("") is specified, log is not written to file.'
- },
- {
- name: "log-level",
- desc: "Set log level to output. LEVEL is either debug, info, notice, warn or error. Default: debug.",
- option:true,
- options: ["debug", "info", "notice", "warn", "error"]
- },
- {
- name: "max-concurrent-downloads",
- desc: "Set maximum number of parallel downloads for every static (HTTP/FTP) URI, torrent and metalink. See also --split option. Default: 5"
- },
- {
- name: "max-download-result",
- desc: "Set maximum number of download result kept in memory. The download results are completed/error/removed downloads. The download results are stored in FIFO queue and it can store at most NUM download results. When queue is full and new download result is created, oldest download result is removed from the front of the queue and new one is pushed to the back. Setting big number in this option may result high memory consumption after thousands of downloads. Specifying 0 means no download result is kept. Default: 1000"
- },
- {
- name: "max-overall-download-limit",
- desc: "Set max overall download speed in bytes/sec. 0 means unrestricted. You can append K or M (1K = 1024, 1M = 1024K). To limit the download speed per download, use --max-download-limit option. Default: 0."
- },
- {
- name: "max-overall-upload-limit",
- desc: "Set max overall upload speed in bytes/sec. 0 means unrestricted. You can append K or M (1K = 1024, 1M = 1024K). To limit the upload speed per torrent, use --max-upload-limit option. Default: 0."
- },
- {
- name: "save-cookies",
- desc: "Save Cookies to FILE in Mozilla/Firefox(1.x/2.x)/ Netscape format. If FILE already exists, it is overwritten. Session Cookies are also saved and their expiry values are treated as 0. Possible Values: /path/to/file."
- },
- {
- name: "save-session",
- desc: "Save error/unfinished downloads to FILE on exit. You can pass this output file to aria2c with --input-file option on restart."
- },
- {
- name: "server-stat-of",
- desc: "Specify the filename to which performance profile of the servers is saved. You can load saved data using --server-stat-if option. See Server Performance Profile subsection below for file format."
- }
-];
-
-/* global_settings end }}}*/
-
-var global_settings_exclude = [
- "checksum",
- "index-out",
- "out",
- "pause",
- "select-file"
-];
-var download_waiting_exclude = [
- "dry-run",
- "metalink-base-uri",
- "parameterized-uri",
- "pause",
- "piece-length"
-];
-var download_active_settings = [
- {
- name: "bt-max-peers",
- desc: "Specify the maximum number of peers per torrent. 0 means unlimited. See also bt-request-peer-speed-limit option. Default: 55"
- }, {
- name: "bt-request-peer-speed-limit",
- desc: "If the whole download speed of every torrent is lower than SPEED, aria2 temporarily increases the number of peers to try for more download speed. Configuring this option with your preferred download speed can increase your download speed in some cases. You can append K or M (1K = 1024, 1M = 1024K). Default: 50K"
- }, {
- name: "bt-remove-unselected-file",
- desc: "Removes the unselected files when download is completed in BitTorrent. To select files, use --select-file option. If it is not used, all files are assumed to be selected. Please use this option with care because it will actually remove files from your disk. Default: false",
- option: "true",
- options: ["true", "false"]
- }, {
- name: "max-download-limit",
- desc: "Set max download speed per each download in bytes/sec. 0 means unrestricted. You can append K or M (1K = 1024, 1M = 1024K). To limit the overall download speed, use --max-overall-download-limit option. Default: 0"
- },{
- name: "max-upload-limit",
- desc: "Set max upload speed per each torrent in bytes/sec. 0 means unrestricted. You can append K or M (1K = 1024, 1M = 1024K). To limit the overall upload speed, use --max-overall-upload-limit option. Default: 0."
-
- }
-];
diff --git a/js/old/connection.js b/js/old/connection.js
deleted file mode 100644
index 68da8a3..0000000
--- a/js/old/connection.js
+++ /dev/null
@@ -1,163 +0,0 @@
-var JsonRPC = function(conf) {
- if (!this instanceof JsonRPC)
- return new JsonRPC();
- this.avgTimeout = 2000;
- this.serverConf = conf;
-};
-JsonRPC.prototype = {
- encode: function(obj) {
- return base64.btoa(JSON.stringify(obj));
- },
- ariaRequest: function(url, multicall, funcName, params, success, error) {
- var startTime = new Date();
- var conn = this;
- $.ajax({
- url: url,
- timeout: this.avgTimeout,
- data: {
- jsonrpc: 2.0,
- id: 'webui',
- method: funcName.search(/\./g) == -1 ? 'aria2.' + funcName : funcName,
- params: params.length ? this.encode(params) : undefined
- },
- success: function(data) {
- conn.avgTimeout = 3 * (new Date() - startTime);
- return success(data)
- },
- error: error,
- dataType: 'jsonp',
- jsonp: 'jsoncallback'
- });
- },
- invoke: function(opts) {
- var rpc = this;
- var scheme = rpc.serverConf.encryption ? 'https' : 'http';
- rpc.ariaRequest(
- scheme + '://' + rpc.serverConf.host + ':' + rpc.serverConf.port + '/jsonrpc',
- opts.multicall,
- opts.func,
- opts.params,
- opts.success,
- function() {
- // check if authentication details are given, if yes then use a hack to support
- // http authentication otherwise emit error
- if (!rpc.serverConf.user.length) {
- console.log("no user name and still error!!!");
- return opts.error();
- }
-
- var authUrl = scheme + '://' +
- rpc.serverConf.user + ":" +
- rpc.serverConf.pass + "@" +
- rpc.serverConf.host + ':' +
- rpc.serverConf.port + '/jsonrpc';
-
- // hack is to basically inject an image with same uri as the aria2 rpc url,
- // most browsers will then cache the authentication details and we dont have
- // to give them next time we make a request
- var img = $('');
- if (txt.trim().length)
- $('#newDownload_url').val(txt + '\n');
- $('#multiple_uris i').removeClass('icon-plus-sign').addClass('icon-minus-sign');
- }
- else {
- $('#newDownload_url').replaceWith('' + ctx.files[i].path + ' (' + ctx.files[i].size + ') ';
- }
- elem.find('.download-files').html(html);
-
- // update progress bar
- if (oldctx.percentage != ctx.percentage)
- elem.find('.progress .bar').css('width', ctx.percentage + '%');
-
- // update the chunks bar
- var chunks = ctx.chunks;
- if (!chunks || !chunks.length) {
- return;
- }
- var canvas = elem.find(".chunk-canvas")[0];
- if (!canvas) {
- return;
- }
- var ctx = canvas.getContext('2d');
- ctx.fillStyle = "#149BDF";
- ctx.clearRect(0, 0, canvas.width, canvas.height);
- var x = 0,
- width = canvas.width,
- height = canvas.height;
- chunks.forEach(function(c) {
- var dx = c.ratio * width;
- if (c.show)
- ctx.fillRect(x, 0, dx, height);
- x += dx;
- });
- elem.data('ctx', ctx);
-}
-function deleteDownloadTemplates($top_elem, data) {
- if(!data) {
- graphData = [];
- $top_elem.html("");
- } else {
- var elems = $top_elem.find('[data-gid]');
- for(var i = 0; i < elems.length; i++) {
- var elem = $(elems[i]);
- var gid = elem.attr('data-gid').toString();
- var found = false;
- for(var j = 0; j < data.length; j++) {
- if(gid === data[j].gid.toString())
- found = true;
- }
- if(!found) {
- for (var k = 0; k < graphData.length; k++) {
- if (graphData[k].gid == gid) {
- graphData.splice(k, 1);
- break;
- }
- }
- elem.remove();
- }
- }
- }
-}
-function refreshDownloadTemplates(top_elem, data) {
- var down_template = $('#download_template').text(),
- new_items = [],
- $top_elem = $('#' + top_elem + '_downloads');
-
- deleteDownloadTemplates($top_elem, data);
- for(var i = 0; i < data.length; i++) {
- var ctx = getTemplateCtx(data[i]);
- var elem = $top_elem.find('[data-gid=' + ctx.gid + ']');
- if(elem.length) {
- updateDownloadTemplates(elem, ctx);
- } else {
- var item = Mustache.render(down_template, ctx);
- new_items.push(item);
- }
- }
- if (new_items.length > 0) {
- $top_elem.append(new_items);
- }
- $top_elem.children('.hero-unit').remove();
-}
-function updateGraph(gid) {
- var elem = $('[data-gid=' + gid + ']');
- for (var i = 0; i < graphData.length; i++) {
- if (graphData[i].gid == gid) {
- var moreInfo = $(elem).find(".more_info");
- if (moreInfo.hasClass("in")) {
- graphData[i].plot.setData([{
- label: "Download Speed",
- data: graphData[i].downSpeed,
- color: "#ff0000",
- lines: { show: true }
- }, {
- label: "Upload Speed",
- data: graphData[i].upSpeed,
- color: "#00ff00",
- lines: { show: true }
- }]);
- graphData[i].plot.resize();
- graphData[i].plot.setupGrid();
- graphData[i].plot.draw();
- }
- }
- }
-}
-function createGraph(selector) {
- var elem = $(selector);
- elem.height(elem.width() / 2);
-
- return $.plot(elem, [{
- label: "Download Speed",
- data: [],
- color: "#ff0000",
- lines: { show: true }
- }, {
- label: "Upload Speed",
- data: [],
- color: "#00ff00",
- lines: { show: true }
- }], {
- legend: { show: true },
- xaxis: { show: true },
- yaxis: {
- tickFormatter: function(val, axis) {
- return changeLength(val, "B/s");
- },
- min: 0
- }
- });
-}
-function updateGraphData(data) {
- for (var i = 0; i < data.length; i++) {
- var gid = data[i].gid;
- var graph = null;
- for (var k = 0; k < graphData.length; k++) {
- if (graphData[k].gid == gid) {
- graph = graphData[k];
- break;
- }
- }
- var downSpeed = data[i].downloadSpeed;
- var upSpeed = data[i].uploadSpeed;
- var that = this;
- if (!graph) {
- graphData.push((function() {
- return {
- gid: gid,
- downSpeed: [],
- upSpeed: [],
- add: function(arr, val) {
- if (arr.length == graphSize) {
- arr.shift();
- }
- arr.push([((new Date - this.start)/1000).toFixed(0), val]);
- },
- addDown: function(val) {
- this.add(this.downSpeed, val);
- return this;
- },
- addUp: function(val) {
- this.add(this.upSpeed, val);
- return this;
- },
- plot: that.createGraph('[data-gid=' + gid + '] .download-graph'),
- start: new Date()
- }
- })().addDown(downSpeed).addUp(upSpeed));
- }
- else {
- graph.addDown(downSpeed).addUp(upSpeed);
- }
- this.updateGraph(gid);
- }
-}
-function getActiveSettings(gid, cb) {
- var sets = [];
- var tmp_set = [];
- for(var i = 0; i < download_active_settings.length; i++) {
- tmp_set = $.extend(true, {}, download_active_settings[i]);
- sets.push(tmp_set);
- }
- aria_syscall({
- func: 'getOption',
- params: [gid],
- success: function(data) {
- var res = data.result;
- merge_settings_data(sets, res);
- cb(sets);
- },
- error: function() {
- alert("Connection to aria server failed");
- }
- });
-}
-function check_waiting(name) {
- for(var i = 0; i < download_waiting_exclude.length; i++) {
- if(download_waiting_exclude[i] === name) {
- return false;
- }
- }
- return true;
-}
-function getWaitingSettings(gid, cb) {
- var sets = [];
- var tmp_set = [];
- for(var i = 0; i < input_file_settings.length; i++) {
- tmp_set = $.extend(true, {}, input_file_settings[i]);
- if(check_waiting(tmp_set)) {
- sets.push(tmp_set);
- }
- }
- for(var i = 0; i < download_active_settings.length; i++) {
- tmp_set = $.extend(true, {}, download_active_settings[i]);
- if(check_waiting(tmp_set)) {
- sets.push(tmp_set);
- }
- }
- aria_syscall({
- func: 'getOption',
- params: [gid],
- success: function(data) {
- var res = data.result;
- merge_settings_data(sets, res);
- cb(sets);
- },
- error: function() {
- alert("Connection to aria server failed");
- }
- });
-}
-function empty_download_set(elem) {
- var len = d_files.active.length;
- len += d_files.waiting.length;
- len += d_files.stopped.length;
- if(len === 0) {
- var html = '
';
-
- html += 'Currently no downloads in line to display, use the Add download button to start downloading files!';
- html += ' ';
- $(elem).html(html);
- }
-}
-function updateActiveDownloads(data) {
- refreshDownloadTemplates('active', data);
- updateGraphData(data);
- empty_download_set('#active_downloads');
- $('.active-download .download_settings').unbind('click').click(function() {
- var gid = $(this).parents('.active-download').attr('data-gid');
- var settings_name = $(this).parents('.active-download').attr('data-settingsName');
- var gen = function(name) {
- return { name: name, values: [] };
- };
- var general_settings = gen("General Settings");
- var torrent_settings = gen("Bit-Torrent Settings");
-
- getActiveSettings(gid, 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
- general_settings.values.push(set);
-
- }
-
- var templ = $('#download_settings_template').text();
- var item = Mustache.render(templ, {
- settings_name: settings_name,
- gid: gid,
- settings: [
- general_settings,
- torrent_settings
- ]
- });
- $('#download_settings_modal').html(item);
- modals.download_settings_modal.modal('show');
- $("#save_download_settings").one('click',function() {
- var settings = {};
- for(var i = 0; i < sets.length; i++) {
- var elem = $("#download_settings_" + sets[i].name);
- if(sets[i].value) {
- if(elem.val() !== sets[i].value) {
- settings[sets[i].name] = elem.val();
- }
- }
- else if(elem.val() !== "no_val" && elem.val() !== "") {
- settings[sets[i].name] = elem.val();
- }
- }
- if(!$.isEmptyObject(settings)) {
- aria_syscall({
- func: 'changeOption',
- params: [gid, settings],
- success: function(data) {
- clear_dialogs();
- }
- });
- }
- else {
- clear_dialogs();
- }
- });
- });
- });
- $('.active-download .download_pause').unbind('click').click(function() {
- var gid = $(this).parents('.active-download').attr('data-gid');
- aria_syscall({
- func: 'forcePause',
- params: [gid],
- success: function() {
- update_ui();
- },
- error: function(err) {
- console.log("error pausing active download!!!");
- console.log(err);
- }
- });
- });
- $('.active-download .torrent_info').unbind('click').click(function() {
- var info_name = $(this).parents('.active-download').attr('data-settingsName');
- var gid = $(this).parents('.active-download').attr('data-gid');
- aria_syscall({
- func: 'getPeers',
- params: [gid],
- success: function(data) {
- var peers = data.result.map(function(e) {
- e.downloadSpeed = changeLength(e.downloadSpeed, "B/s");
- e.uploadSpeed = changeLength(e.uploadSpeed, "B/s");
- return e;
- });
- var download = d_files.active.filter(function(d) {
- d.gid == gid
- })[1];
- var templ = $('#torrent_info_template').text();
- var item = Mustache.render(templ, {
- info_name: info_name,
- gid: gid,
- peers: peers
- });
- $('#torrent_info_modal').html(item);
- modals.torrent_info_modal.modal('show');
- console.log($('#torrent_info_modal'));
- update_ui();
- },
- error: function(err) {
- console.log("error pausing active download!!!");
- console.log(err);
- }
- });
- });
- $('.active-download .download_remove').unbind('click').click(function() {
- var gid = $(this).parents('.active-download').attr('data-gid');
- aria_syscall({
- func: 'remove',
- params: [gid],
- success: function() {
- update_ui();
- },
- error: function(err) {
- console.log("error removing active download!!!");
- console.log(err);
- }
- });
- });
-}
-function updateWaitingDownloads(data) {
- refreshDownloadTemplates('waiting', data);
- $('.waiting-download .download_settings').unbind('click').click(function() {
- var gid = $(this).parents('.waiting-download').attr('data-gid');
- var settings_name = $(this).parents('.waiting-download').attr('data-settingsName');
- 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");
-
- getWaitingSettings(gid, 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 = $('#download_settings_template').text();
- var item = Mustache.render(templ, {
- settings_name: settings_name,
- gid: gid,
- settings: [
- general_settings,
- http_settings,
- ftp_settings,
- torrent_settings,
- metalink_settings
- ]
- });
- $('#download_settings_modal').html(item);
- modals.download_settings_modal.modal('show');
- $("#save_download_settings").one('click',function() {
- var settings = {};
- for(var i = 0; i < sets.length; i++) {
- var elem = $("#download_settings_" + sets[i].name);
- if(sets[i].value) {
- if(elem.val() !== sets[i].value) {
- settings[sets[i].name] = elem.val();
- }
- }
- else if(elem.val() !== "no_val" && elem.val() !== "") {
- settings[sets[i].name] = elem.val();
- }
- }
- if(!$.isEmptyObject(settings)) {
- aria_syscall({
- func: 'changeOption',
- params: [gid, settings],
- success: function(data) {
- clear_dialogs();
- }
- });
- }
- else {
- clear_dialogs();
- }
- });
- });
- });
- $('.waiting-download .download_play').unbind('click').click(function() {
- var gid = $(this).parents('.waiting-download').attr('data-gid');
- aria_syscall({
- func: 'unpause',
- params: [gid],
- success: function(data) {
- update_ui();
- },
- error: function(err) {
- console.log("error playing waiting download!!!");
- console.log(err);
- }
- });
- });
- $('.waiting-download .download_remove').unbind('click').click(function() {
- var gid = $(this).parents('.waiting-download').attr('data-gid');
- aria_syscall({
- func: 'remove',
- params: [gid],
- success: function() {
- update_ui();
- },
- error: function(err) {
- console.log("error removing waiting download!!!");
- console.log(err);
- }
- });
- });
-}
-
-function updateStoppedDownloads(data) {
- refreshDownloadTemplates('stopped', data);
- $('.stopped-download .download_remove').unbind('click').click(function() {
- var gid = $(this).parents('.stopped-download').attr('data-gid');
- aria_syscall({
- func: 'removeDownloadResult',
- params: [gid],
- success: function() {
- update_ui();
- },
- error: function(err) {
- console.log("error removing stopped download!!!");
- console.log(err);
- }
- });
- });
- $('.stopped-download .download_restart').unbind('click').click(function() {
- var gid = $(this).parents('.stopped-download').attr('data-gid');
- var files;
- var uris = [];
- for(var i = 0; i < d_files.stopped.length; i++) {
- if(d_files.stopped[i].gid === gid) {
- files = d_files.stopped[i].files;
- break;
- }
- }
- for(var i = 0; i < files.length; i++) {
- var tmp_uris = [];
- for(var j = 0; j < files[i].uris.length; j++) {
- tmp_uris.push(files[i].uris[j].uri);
- }
- uris.push(tmp_uris);
- }
- addDownload(uris);
- aria_syscall({
- func: 'removeDownloadResult',
- params: [gid],
- success: function() {
- update_ui();
- },
- error: function(err) {
- console.log("error removing stopped download!!!");
- console.log(err);
- }
- });
- });
-}
-
-
-function mergeDownloads(data) {
- d_files.active = data[0][0];
- d_files.waiting = data[1][0];
- d_files.stopped = data[2][0];
-}
-
-function updateDownloads() {
- aria_syscall({
- func: 'system.multicall',
- params:[[{
- methodName: 'aria2.tellActive'
- }, {
- methodName: 'aria2.tellWaiting',
- params: [0,100]
- }, {
- methodName: 'aria2.tellStopped',
- params: [0, 100]
- }, {
- methodName: "aria2.getGlobalStat"
- }]],
- success: function(data) {
- mergeDownloads(data.result);
- updateStoppedDownloads(d_files.stopped);
- updateWaitingDownloads(d_files.waiting);
- updateActiveDownloads(d_files.active);
- updateGlobalStatistics(data.result[3][0]);
- },
- error: function() {
- server_conf.dirty = true;
- modals.err_connect.modal('show');
- }
- }, true);
-}
-function calculateProg() {
- var total = 0, done = 0;
- _.forEach(d_files.active, function(d) {
- total += d.totalLength;
- done += d.completedLength;
- });
- return 100 * (done / total);
-}
-function updateGlobalStatistics(data) {
- var title = "aria2 Web Client";
- if (data.uploadSpeed > 0 || data.downloadSpeed > 0) {
- title = "- " + title;
- if (data.uploadSpeed > 0) {
- title = "↑" + changeLength(data.uploadSpeed, "B/s") + " " + title;
- }
- if (data.downloadSpeed > 0) {
- title = "↓" + changeLength(data.downloadSpeed, "B/s") + " " + title;
- }
- }
- //title = '(' + calculateProg().toFixed(2) + '%) ' + title;
- Piecon.setProgress(calculateProg());
- document.title = title;
- data.downloadSpeed = changeLength(data.downloadSpeed, "B/s");
- data.uploadSpeed = changeLength(data.uploadSpeed, "B/s");
- for(var i in data) {
- $('.stat_' + i).text(data[i]);
- }
- if (globalGraphData) {
- globalGraphData.addDown(parseFloat(data.downloadSpeed));
- globalGraphData.addUp(parseFloat(data.uploadSpeed));
- globalGraphData.plot.setData([{
- label: "Download Speed",
- data: globalGraphData.downSpeed,
- color: "#ff0000",
- lines: { show: true }
- }, {
- label: "Upload Speed",
- data: globalGraphData.upSpeed,
- color: "#00ff00",
- lines: { show: true }
- }]);
- globalGraphData.plot.resize();
- globalGraphData.plot.setupGrid();
- globalGraphData.plot.draw();
- }
-}
-function custom_global_statistics() {
- var tmpl = $('#global_statistics_template').text();
- modals.global_statistics_modal.modal('show');
-}
-
-function show_about() {
- aria_syscall({
- func: 'getVersion',
- success: function(data) {
- $('.about_aria_version').text(data.result.version);
- $('.about_webclient_version').text('beta testing');
- modals.about_modal.modal('show');
- }
- });
-}
-
-function force_pause_all() {
- aria_syscall({
- func: 'forcePauseAll',
- success: update_ui
- });
-}
-
-function force_remove_all() {
- var remove_params = [];
- var func = function(downs) {
- for(var i = 0; i < downs.length; i++) {
- remove_params.push({
- methodName: 'aria2.remove',
- params: [downs[i].gid]
- });
- }
- }
- func(d_files.active);
- func(d_files.waiting);
-
- aria_syscall({
- func: 'system.multicall',
- params:[remove_params],
- success: purge_all
- }, true);
-
-}
-
-function purge_all() {
- aria_syscall({
- func: "purgeDownloadResult",
- success: update_ui
- });
-}
-function resume_paused() {
- aria_syscall({
- func: "unpauseAll",
- success: update_ui
- });
-}
-
-function add_torrent() {
- var file_node = $('#input_torrent')[0];
- var files = file_node.files;
- if (files.length) {
- for (var i = 0, f; f = files[i]; i++) {
- var reader = new FileReader();
-
- reader.onload = function(e) {
- var txt = e.target.result;
- txt = txt.split(',')[1];
- aria_syscall({
- func: 'addTorrent',
- params: [txt],
- success: function() {
- clear_dialogs();
- update_ui();
- }
- });
- };
- reader.onerror = function(e) {
- alert('error reading torrent, your browser policy does not allow to read local files, please change to firefox');
- };
- reader.readAsDataURL(f);
- }
-
- }
- else {
- alert("please select a torrent first!");
- }
-}
-function add_metalink() {
- var file_node = $('#input_metalink')[0];
- var files = file_node.files;
- if (files.length) {
- for (var i = 0, f; f = files[i]; i++) {
- var reader = new FileReader();
-
- reader.onload = function(e) {
- var txt = e.target.result;
- txt = txt.split(',')[1];
- aria_syscall({
- func: 'addMetalink',
- params: [txt],
- success: function() {
- clear_dialogs();
- update_ui();
- }
- });
- };
- reader.onerror = function(e) {
- alert('error reading metalink, your browser policy does not allow to read local files, please change to firefox');
- };
- reader.readAsDataURL(f);
-
- }
- }
- else {
- alert("please select a metalink first!");
- }
-}
diff --git a/js/old/utils.js b/js/old/utils.js
deleted file mode 100644
index 622b858..0000000
--- a/js/old/utils.js
+++ /dev/null
@@ -1,18 +0,0 @@
-var utils = {
- randStr: function() {
- var str = [];
- var hexDigits = "0123456789abcdef";
- for (var i = 0; i < 36; i++) {
- str[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
- }
- return str.join("");
- },
- mixin: function(fromObj, toObj) {
- for (var key in toObj) {
- if (toObj.hasOwnProperty(key) && fromObj[key]) {
- toObj[key] = fromObj[key];
- }
- }
- return toObj;
- }
-};
diff --git a/js/services/utils.js b/js/services/utils.js
index f2bc24e..35e076e 100644
--- a/js/services/utils.js
+++ b/js/services/utils.js
@@ -1,5 +1,5 @@
-angular.module('webui.services.utils', [])
-.factory('$utils', ['$filter', function(filter) {
+angular.module('webui.services.utils', ['webui.services.constants'])
+.factory('$utils', ['$filter', "$name", function(filter, $name) {
var rnd16 = (function() {
"use strict";
var rndBuffer = new Uint8Array(16);
@@ -119,12 +119,11 @@ angular.module('webui.services.utils', [])
// get info title from global statistics
getTitle: function(stats) {
var title =
- '('
- + ' active:' + stats.numActive
- + ' waiting:' + stats.numWaiting
- + ' stopped:' + stats.numStopped
- + ') '
- + 'aria2 Web Client';
+ 'active: ' + stats.numActive
+ + ' - waiting: ' + stats.numWaiting
+ + ' - stopped: ' + stats.numStopped
+ + ' — '
+ + $name;
return title;
},
diff --git a/old.html b/old.html
deleted file mode 100644
index fb98fa3..0000000
--- a/old.html
+++ /dev/null
@@ -1,728 +0,0 @@
-
-
-
-
-
- aria2 web client
-
-
-
-
-
- Make sure that aria2c is running and rpc is enabled.
- aria2c --enable-rpc
-
-
-
-
-
-
-
- To use this feature, please upgrade your browser to a somewhat recent version.
- If you have no clue then head on to http://firefox.com
- and follow instructions there.
-
-
-
-
-
-
-
-
Overall Download Speed:
-
Overall Upload Speed:
-
Total Active Downloads:
-
Total Waiting Downloads:
-
Total Stopped Downloads:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-