fix: fix "AriaNg's RPC config lost after clear browser history"

closes #4
RossWang · Nov 17, 2017 · b5e8dd8 · b5e8dd8
1 parent 3ed829f
commit b5e8dd8
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 15 deletions.
diff --git a/App/_locales/en/messages.json b/App/_locales/en/messages.json
@@ -235,6 +235,16 @@
 		"description": ""
 	},
 
+	"OP_autoSet": {
+		"message": "AriaNg Auto Set",
+		"description": ""
+	},
+
+	"OPN_autoSet": {
+		"message": "Set AriaNg automatically when the user click 'details'",
+		"description": ""
+	},
+
 	"OP_winWidth": {
 		"message": "Download Panel width offset",
 		"description": ""

diff --git a/App/_locales/zh_CN/messages.json b/App/_locales/zh_CN/messages.json
@@ -234,6 +234,16 @@
 		"message": "按下下载按钮后自动启动 Aria2",
 		"description": ""
 	},
+
+	"OP_autoSet": {
+		"message": "自动设置 AriaNg",
+		"description": ""
+	},
+
+	"OPN_autoSet": {
+		"message": "按下详细按钮后自动设置 AriaNg",
+		"description": ""
+	},
 
 	"OP_winWidth": {
 		"message": "下载窗口宽度改变量",

diff --git a/App/_locales/zh_TW/messages.json b/App/_locales/zh_TW/messages.json
@@ -230,6 +230,16 @@
 		"description": ""
 	},
 
+	"OP_autoSet": {
+		"message": "自動設定 AriaNg",
+		"description": ""
+	},
+
+	"OPN_autoSet": {
+		"message": "按下詳細按鈕後自動設定 AriaNg",
+		"description": ""
+	},
+
 	"OP_winWidth": {
 		"message": "下載視窗寬度改變量",
 		"description": ""

diff --git a/App/config.js b/App/config.js
@@ -17,6 +17,7 @@ config.command = {
 			aggressive: false,
 			windowLoc: false,
 			auto: true,
+			autoSet: true,
 		};
 	}
 };
diff --git a/App/data/action/index.html b/App/data/action/index.html
@@ -142,6 +142,7 @@
     </div>
   </div>
   <!-- <script src="gwd-init-code.js"></script> -->
+  <script src="../../config.js"></script>
   <script src="index.js"></script>
 
 

diff --git a/App/data/action/index.js b/App/data/action/index.js
@@ -27,15 +27,24 @@ function detail() {
 	browser.storage.local.get("initialize", item => {
 		if (!item.initialize || (item.initialize == undefined)) {
 			browser.runtime.openOptionsPage();
-			browser.notifications.create({
+				browser.notifications.create({
 				type: 'basic',
-				iconUrl: '../../data/icons/48.png',
-				title: "Aria2 Integration",
-				message: "you need to set(save) the config first"
+				iconUrl: '/data/icons/48.png',
+				title: browser.i18n.getMessage("extensionName"),
+				message: message.message || message
 			});
-		} else {
-			browser.tabs.create({
-				url: "../../data/ariang/index.html"
+		} 
+		else {
+			browser.storage.local.get(config.command.guess, function(item) {
+				var ariangUrl = "../../data/ariang/index.html"
+				if (item.autoSet) {
+					ariangUrl += "#!/settings/rpc/set/";
+					ariangUrl += (item.protocol + "/" + item.host + "/" + item.port + "/" + 
+					item.interf + "/" + btoa(item.token));
+				}
+				browser.tabs.create({
+					url: ariangUrl
+				});
 			});
 		}
 	});

diff --git a/App/data/options/index.html b/App/data/options/index.html
@@ -172,6 +172,17 @@
 			<td></td>
 			<td data-message="OPN_auto" class="note">Start Aria2 automatically when the download start</td>
 		</tr>
+		<tr>
+			<td></td>
+			<td>
+				<input id="autoSet" style="margin-left: 0px; margin-top: 5px;" type="checkbox">
+				<label data-message="OP_autoSet" for="auto">AriaNg Auto Set</label>
+			</td>
+		</tr>
+		<tr>
+			<td></td>
+			<td data-message="OPN_autoSet" class="note">Set AriaNg automatically when the user click "details"</td>
+		</tr>
 		<tr>
 			<td></td>
 			<td>

diff --git a/App/data/options/index.js b/App/data/options/index.js
@@ -14,6 +14,7 @@ function save() {
 	const aggresive = document.getElementById('aggre').checked;
 	const windowLoc = document.getElementById('winLoc').checked;
 	const auto = document.getElementById('auto').checked;
+	const autoSet = document.getElementById('autoSet').checked;
 	const dpHeight = document.getElementById('dpHeight').value;
 	const dpWidth = document.getElementById('dpWidth').value;
 	if (!windowLoc){
@@ -40,19 +41,14 @@ function save() {
 		aggresive,
 		windowLoc,
 		auto,
+		autoSet,
 		dpHeight,
 		dpWidth
 	}, () => {
 		const status = document.getElementById('status');
 		status.textContent = browser.i18n.getMessage("OP_saveComplete");
 		setTimeout(() => {
 			status.textContent = '';
-			var ariangUrl = "../../data/ariang/index.html#!/settings/rpc/set/"
-			ariangUrl += (protocol + "/" + host + "/" + port + "/" + interf + "/" +
-				btoa(token));
-			browser.tabs.create({
-				url: ariangUrl
-			});
 		}, 750);
 		browser.storage.local.set({
 			initialize: true
@@ -77,6 +73,7 @@ function restore() {
 		document.getElementById('aggre').checked = prefs.aggressive;
 		document.getElementById('winLoc').checked = prefs.windowLoc;
 		document.getElementById('auto').checked = prefs.auto;
+		document.getElementById('autoSet').checked = prefs.autoSet;
 	});
 	browser.storage.local.get(['dpWidth', 'dpHeight'], prefs => {
 		document.getElementById('dpWidth').value = prefs.dpWidth;

diff --git a/App/manifest.json b/App/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "__MSG_extensionName__",
   "description": "__MSG_extensionDescription__",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "default_locale": "en",
   "manifest_version": 2,
   "permissions": [
@@ -18,7 +18,9 @@
   "background": {
     "scripts": [
       "config.js",
-      "common.js"
+      "common.js",
+	  "/lib/tool.js",
+	  "/lib/polygoat.js"
     ]
   },
   "browser_action": {