Store properties to storage.sync

Author: slgobinath

extension/background.js

@@ -74,35 +74,37 @@ sendMessageToHost({
     version: "2.0.9"
 });
 
-// Read the local storage for excluded keywords
-if (localStorage["uget-keywords-exclude"]) {
-    keywordsToExclude = localStorage["uget-keywords-exclude"].split(/[\s,]+/);
-} else {
-    localStorage["uget-keywords-exclude"] = '';
-}
-
-// Read the local storage for included keywords
-if (localStorage["uget-keywords-include"]) {
-    keywordsToInclude = localStorage["uget-keywords-include"].split(/[\s,]+/);
-} else {
-    localStorage["uget-keywords-include"] = '';
-}
+// Read the storage for excluded keywords
+current_browser.storage.sync.get(function(items) {
+    if (items["uget-keywords-exclude"]) {
+        keywordsToExclude = items["uget-keywords-exclude"].split(/[\s,]+/);
+    } else {
+        current_browser.storage.sync.set({"uget-keywords-exclude": ''});
+    }
 
-// Read the local storage for the minimum file-size to interrupt
-if (localStorage["uget-min-file-size"]) {
-    minFileSizeToInterrupt = parseInt(localStorage["uget-min-file-size"]);
-} else {
-    localStorage["uget-min-file-size"] = minFileSizeToInterrupt;
-}
+    // Read the local storage for included keywords
+    if (items["uget-keywords-include"]) {
+        keywordsToInclude = items["uget-keywords-include"].split(/[\s,]+/);
+    } else {
+        current_browser.storage.sync.set({"uget-keywords-include": ''});
+    }
 
-// Read the local storage for enabled flag
-if (!localStorage["uget-interrupt"]) {
-    localStorage["uget-interrupt"] = 'true';
-} else {
-    var interrupt = (localStorage["uget-interrupt"] == "true");
-    setInterruptDownload(interrupt);
-}
+    // Read the local storage for the minimum file-size to interrupt
+    if (items["uget-min-file-size"]) {
+        minFileSizeToInterrupt = parseInt(items["uget-min-file-size"]);
+    } else {
+        current_browser.storage.sync.set({"uget-min-file-size": minFileSizeToInterrupt});
+    }
 
+    // Read the local storage for enabled flag
+    if (!items["uget-interrupt"]) {
+        // Keep the value string
+        current_browser.storage.sync.set({"uget-interrupt": 'true'});
+    } else {
+        var interrupt = (items["uget-interrupt"] == "true");
+        setInterruptDownload(interrupt);
+    }
+});
 // Message format to send the download information to the uget-chrome-wrapper
 var message = {
     url: '',
@@ -464,6 +466,8 @@ function parseCookies(cookies_arr) {
 function updateKeywords(include, exclude) {
     keywordsToInclude = include.split(/[\s,]+/);
     keywordsToExclude = exclude.split(/[\s,]+/);
+    current_browser.storage.sync.set({"uget-keywords-include": include});
+    current_browser.storage.sync.set({"uget-keywords-exclude": exclude});
 }
 
 /**
@@ -472,6 +476,7 @@ function updateKeywords(include, exclude) {
  */
 function updateMinFileSize(size) {
     minFileSizeToInterrupt = size;
+    current_browser.storage.sync.set({"uget-min-file-size": size});
 }
 
 /**
@@ -519,6 +524,6 @@ function setInterruptDownload(interrupt, writeToStorage) {
         });
     }
     if (writeToStorage) {
-        localStorage["uget-interrupt"] = interrupt.toString();
+        current_browser.storage.sync.set({"uget-interrupt": interrupt.toString()});
     }
 }

extension/popup.js

@@ -35,41 +35,31 @@ try {
 }
 
 function saveChanges() {
-	var keywordsToExclude = document.getElementById("keywordsToExclude").value;
-	var keywordsToInclude = document.getElementById("keywordsToInclude").value;
+	var keywordsToExclude = document.getElementById("keywordsToExclude").value.trim();
+	var keywordsToInclude = document.getElementById("keywordsToInclude").value.trim();
 	var interrupt = document.getElementById('chk-interrupt').checked;
 	var minFileSize = parseInt(document.getElementById("fileSize").value) * 1024;
 	if (isNaN(minFileSize)) {
 		minFileSize = 300 * 1024;
 	} else if(minFileSize < 0) {
-		minFileSize = 0;
+		minFileSize = -1024;	// Which is -1 KB
 	}
 
-	localStorage["uget-keywords-exclude"] = keywordsToExclude;
-	localStorage["uget-keywords-include"] = keywordsToInclude;
-	localStorage["uget-min-file-size"] = minFileSize;
-
 	current_browser.runtime.getBackgroundPage(function(backgroundPage) {
 		backgroundPage.updateKeywords(keywordsToInclude, keywordsToExclude);
 		backgroundPage.setInterruptDownload(interrupt, true);
 		backgroundPage.updateMinFileSize(minFileSize);
 	});
 
 	window.close();
+	alert(document.getElementById("fileSize").value);
 }
 
 // When the popup HTML has loaded
 window.addEventListener('load', function(evt) {
 	// Show the system status
 	current_browser.runtime.getBackgroundPage(function(backgroundPage) {
 		var state = backgroundPage.getState();
-		// if (state == 0) {
-		// 	document.getElementById('info').innerHTML = "Info: Found uGet and uget-chrome-wrapper";
-		// } else if (state == 1) {
-		// 	document.getElementById('warn').innerHTML = "Warning: Please update the uget-chrome-wrapper to the latest version";
-		// } else {
-		// 	document.getElementById('error').innerHTML = "Error: Unable to connect to the uget-chrome-wrapper";
-		// }
 		if (state == 0) {
 			// document.getElementById('info').innerHTML = "Info: Found uGet and uget-chrome-wrapper";
 			document.getElementById('info').style.display = 'block';
@@ -90,10 +80,12 @@ window.addEventListener('load', function(evt) {
 		}
 	});
 
-	let interrupt = (localStorage["uget-interrupt"] == "true");
+	let interrupt = (current_browser.storage.sync["uget-interrupt"] == "true");
 	document.getElementById('save').addEventListener('click', saveChanges);
-	document.getElementById('keywordsToExclude').value = localStorage["uget-keywords-exclude"];
-	document.getElementById('keywordsToInclude').value = localStorage["uget-keywords-include"];
-	document.getElementById('fileSize').value = localStorage["uget-min-file-size"] / 1024;
-	document.getElementById('chk-interrupt').checked = interrupt;
+	current_browser.storage.sync.get(function(items) {
+		document.getElementById('keywordsToExclude').value = items["uget-keywords-exclude"];
+		document.getElementById('keywordsToInclude').value = items["uget-keywords-include"];
+		document.getElementById('fileSize').value = parseInt(items["uget-min-file-size"]) / 1024;
+		document.getElementById('chk-interrupt').checked = items["uget-interrupt"] == "true";
+	});
 });