fix: It will no longer trigger notification from other sources

resolve #42
RossWang · Dec 20, 2018 · cf9660e · cf9660e
1 parent 311701f
commit cf9660e
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 27 deletions.
diff --git a/App/common.js b/App/common.js
@@ -57,7 +57,7 @@ function sendTo(url, fileName, filePath, header, server) {
 							function (res) {
 								aria2.addUri([url], params).then(
 									function (res) {
-										monitor(options);
+										monitor(options, res);
 										notify(browser.i18n.getMessage("success_connect", fileName) + "\n\n" + url);
 										aria2.close();
 									},
@@ -66,7 +66,7 @@ function sendTo(url, fileName, filePath, header, server) {
 										setTimeout( () => {
 											aria2.addUri([url], params).then(
 												function (res) {
-													monitor(options);
+													monitor(options, res);
 													notify(browser.i18n.getMessage("success_connect", fileName) + "\n\n" + url);
 													aria2.close();
 												},
@@ -86,7 +86,7 @@ function sendTo(url, fileName, filePath, header, server) {
 									aria2.open().then( () => {
 										aria2.addUri([url], params).then(
 											function (res) {
-												monitor(options);
+												monitor(options, res);
 												notify(browser.i18n.getMessage("success_connect", fileName) + "\n\n" + url);
 												aria2.close();
 											},

diff --git a/App/lib/tools.js b/App/lib/tools.js
@@ -32,35 +32,35 @@ async function correctFileName(name) {
 	return tmp;
 }
 
-function monitor(options) {
+function monitor(options, gid) {
 	if (mon == undefined) {
 		mon = new Worker("/lib/worker.js");
-	}
-	browser.storage.local.get(config.command.guess, function(item) {
-		mon.postMessage([options]);
 		mon.onmessage = function(e) {
 			console.log(e.data);
-			if (e.data[0] == "complete") {
-				notify(browser.i18n.getMessage("download_complete", e.data[1] ));
-				if (item.sound != "0") {
-					var audio = new Audio('/data/Sound/complete' + item.sound + '.wav');
-					audio.play();
+			browser.storage.local.get(config.command.guess, function(item) {
+				if (e.data[0] == "complete") {
+					notify(browser.i18n.getMessage("download_complete", e.data[1] ));
+					if (item.sound != "0") {
+						var audio = new Audio('/data/Sound/complete' + item.sound + '.wav');
+						audio.play();
+					}
 				}
-			}	
-			else if (e.data[0] == "badge" && item.badge){
-				if(e.data[1] == 0){
-					browser.browserAction.setBadgeText({text: ""});
-					mon = null;
+				else if (e.data[0] == "badge" && item.badge){
+					if(e.data[1] == 0){
+						browser.browserAction.setBadgeText({text: ""});
+						mon = null;
+					}
+					else {
+						browser.browserAction.setBadgeText({text: e.data[1].toString()});
+					}
 				}
-				else {
-					browser.browserAction.setBadgeText({text: e.data[1].toString()});
+				else if (e.data[0] == "error"){
+					notify(browser.i18n.getMessage("download_error", e.data[1] ));
 				}
-			}
-			else if (e.data[0] == "error"){
-				notify(browser.i18n.getMessage("download_error", e.data[1] ));
-			}
+			});
 		}
-	});
+	}
+	mon.postMessage([options, gid]);
 }
 
 function notify(message) {

diff --git a/App/lib/worker.js b/App/lib/worker.js
@@ -4,8 +4,10 @@ postMessage("init");
 importScripts("aria.js");
 importScripts("polygoat.js");
 var aria2;
+var gids = [];
 
 onmessage = function(e) {
+	gids.push(e.data[1]);
 	if (aria2 == undefined){
 		connect(e.data[0]);
 		postMessage("connect");
@@ -36,9 +38,12 @@ function connect(options) {
 		});
 	};
 	aria2.onDownloadComplete = function(d) {
-		aria2.getFiles(d.gid).then((info) => {
-			postMessage(["complete", info[0].path]);
-		});
+		if (gids.includes(d.gid)) {
+			aria2.getFiles(d.gid).then((info) => {
+				postMessage(["complete", info[0].path]);
+			});
+			gids = gids.filter(gid => gid != d.gid);
+		}
 		aria2.tellActive(["gid"]).then((info) => {
 			postMessage(["badge", info.length]);
 			if(info.length == 0) {