Fully working support for queue

AshbyGeek · Dec 16, 2015 · 4374dec · 4374dec
1 parent 00be999
commit 4374dec
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 22 deletions.
diff --git a/ChromeExtension/js/background.js b/ChromeExtension/js/background.js
@@ -2,10 +2,10 @@ function stopNote() {
 	chrome.notifications.clear('notif', function(id) { console.log("Last error:", chrome.runtime.lastError); });
 }
 
-function notif(msg) {
+function notif(title, msg) {
 	var opt = {
 		type: "basic",
-		title: "Raspberry Pi",
+		title: title,
 		message: msg,
 		iconUrl: "48.png"
 	};
@@ -20,19 +20,21 @@ function mkrequest(url, response) {
 	try {
 		var newURL = "http://"+localStorage.getItem('raspip')+":2020"+url;
 		if (response == 1) {
-			notif("Trying to get video stream URL. Please wait ~ 10 seconds.");
+			notif("RaspberryCast", "Processing video. Please wait ~ 10 seconds.");
 		}
 		var req = new XMLHttpRequest();
 		req.open('GET', newURL, true);
 		req.onreadystatechange = function (aEvt) {
 			if (req.readyState == 4) {
 				if (req.status == 200) {
-					if (req.responseText == "1") {
-						if (response == 1) {
-							notif("Success ! Video should now be playing.");	
+					if (response == 1) {
+						if (req.responseText == "1") {
+							notif("RaspberryCast", "Video should now start playing.");	
+						} else if (req.responseText == "2") {
+							notif("RaspberryCast", "Video has been added to queue.");	
+						} else {
+							notif("Error", "Please make sure the link is compatible");
 						}
-					} else {
-						notif("An error occured during the treatment of the link. Please make sure the link is compatible");
 					}
 				} else {
 					chrome.notifications.clear('notif', function(id) { console.log("Last error:", chrome.runtime.lastError); });

diff --git a/ChromeExtension/js/popup.js b/ChromeExtension/js/popup.js
@@ -5,15 +5,15 @@ function handlers() {
 			var url_encoded = encodeURIComponent(tabs[0].url);
 			chrome.extension.getBackgroundPage().mkrequest("/stream?url=" + url_encoded + "&slow="+localStorage.modeslow, 1);
 		});
-			
+		window.close();
 	});
 
 	$( "#addqueue" ).click(function() {
 		chrome.tabs.query({currentWindow: true, active: true}, function(tabs){
 			var url_encoded = encodeURIComponent(tabs[0].url);
-			chrome.extension.getBackgroundPage().mkrequest("/queue?url="+url_encoded + "&slow="+localStorage.modeslow, 0);
+			chrome.extension.getBackgroundPage().mkrequest("/queue?url="+url_encoded + "&slow="+localStorage.modeslow, 1);
 		});
-
+		window.close();	
 	});	
 
 	$( "#pause" ).click(function() {
@@ -22,6 +22,7 @@ function handlers() {
 
 	$( "#stop" ).click(function() {
 		chrome.extension.getBackgroundPage().mkrequest("/video?control=stop", 0);
+		window.close();
 	});
 
 	$( "#backward" ).click(function() {

diff --git a/ChromeExtension/manifest.json b/ChromeExtension/manifest.json
@@ -19,5 +19,5 @@
    "manifest_version": 2,
    "name": "RaspberryCast",
    "permissions": [ "contextMenus", "tabs", "notifications" ],
-   "version": "1.2.2"
+   "version": "1.3.0"
 }
diff --git a/FirefoxExtension/index.js b/FirefoxExtension/index.js
@@ -89,21 +89,21 @@ cm.Item({
 });
 
 function mkrequest(url) {
-	if (url.indexOf("/stream") > -1) {
-		notifications.notify({ title: "Processing media", text: "Please wait ~10 seconds." });
+	if (url.indexOf("/stream") > -1 || url.indexOf("/queue") > -1) {
+		notifications.notify({ title: "RaspberryCast", text: "Processing video. Please wait ~10 seconds." });
 	}
 
 	Request({
 	  url: "http://"+prefs.raspIp+":2020" + url,
 	  onComplete: function (response) {
-		if (response.text == "1") {
-			if (url.indexOf("/stream") > -1) {
-				notifications.notify({ title: "Success !", text: "Video should start playing." });
-			} else if (url.indexOf("/queue") > -1) {
-				notifications.notify({ title: "Success !", text: "Video has been added to queue." });
+	  	if (url.indexOf("/stream") > -1 || url.indexOf("/queue") > -1) {
+			if (response.text == "1") {
+				notifications.notify({ title: "RaspberryCast", text: "Video should start playing." });
+			} else if (response.text == "2") {
+				notifications.notify({ title: "RaspberryCast", text: "Video has been added to queue." });
+			} else {
+				notifications.notify({ title: "RaspberryCast", text: "An error occured during the request." });
 			}
-		} else {
-			notifications.notify({ title: "RaspberryCast", text: "An error occured during the request." });
 		}
 	  }
 	}).get();

diff --git a/FirefoxExtension/package.json b/FirefoxExtension/package.json
@@ -1,7 +1,7 @@
 {
   "title": "RaspberryCast",
   "name": "raspberrycast",
-  "version": "1.0.2",
+  "version": "1.2.0",
   "description": "Firefox add-on for RaspberryCast",
   "main": "index.js",
   "author": "VinceLwt",