Merge branch 'beta-branch'

Author: Ephellon

README.md

@@ -16,7 +16,7 @@ Optionally, you can configure NZB Manager (see support table) in the extension's
 | Manager                                         | Movie Support | TV Show Support | Searchable
 | ----------------------------------------------- |:-------------:|:---------------:|:----------:
 | [Watcher 3](https://nosmokingbandit.github.io/) | ✔             | ❌             | ❌
-| [CouchPotato](https://couchpota.to/)            | ✔             | ✔              | ❌
+| [CouchPotato](https://couchpota.to/)            | ✔             | ❌              | ❌
 | [Radarr](https://radarr.video/)                 | ✔             | ❌             | ✔
 | [Sonarr](https://sonarr.tv/)                    | ❌            | ✔              | ✔
 | [Ombi](https://ombi.io/)                        | ❔             | ❔              | ✔

moz.xpi

@@ -181,33 +181,59 @@ UpdateConfiguration();
 // these requests in a background page instead of the content script?
 // This is because Movieo is served over HTTPS, so it won't accept requests to
 // HTTP servers. Unfortunately, many people use CouchPotato over HTTP.
-function Open_CouchPotato(request, sendResponse) {
+function Query_CouchPotato(request, sendResponse) {
 	fetch(`${ request.url }?id=${ request.imdbId }`, {
 		headers: new Headers(request.basicAuth),
 		mode: cors(request.url)
 	})
 	.then(response => response.json())
 	.then(json => {
+		let { success } = json;
+
 		sendResponse({ success, status: (success? json.media.status: null) });
 	})
 	.catch(error => {
-		sendResponse({ error: String(error), location: '@0B: Open_CouchPotato' });
+		sendResponse({ error: String(error), location: '@0B: Query_CouchPotato' });
 	});
 }
 
 function Push_CouchPotato(request, sendResponse) {
-	fetch(`${ request.url }?identifier=${ request.imdbId }`, {
+	let headers = {
+			'Content-Type': 'application/json',
+			'X-Api-Key': request.token,
+			...(new Headers(request.basicAuth))
+		},
+		query = `identifier=${ request.imdbId }`,
+		debug = { headers, query, request };
+
+	fetch(debug.url = `${ request.url }?${ query }`, {
+		method: 'POST',
+		mode: cors(request.url),
+		// body: JSON.stringify(body),
+		headers,
+	})
+		.then(response => response.json())
+		.catch(error => sendResponse({ error: 'Movie not found', location: '@0B: Push_CouchPotato => fetch.then.catch', silent: true }))
+		.then(response => {
+			sendResponse({ success: response.success });
+		})
+		.catch(error => {
+			sendResponse({
+				error: String(error),
+				location: '@0B: Push_CouchPotato => fetch("${ request.url }", { headers }).catch(error => { sendResponse })',
+				debug
+			});
+		});
+}
+
+function Charge_CouchPotato(request, sendResponse) {
+	fetch(request.url, {
 		headers: new Headers(request.basicAuth),
 		mode: cors(request.url)
 	})
 	.then(response => response.json())
-	.catch(error => sendResponse({ error: 'Item not found', location: '@0B: Push_CouchPotato => fetch.then.catch', silent: true }))
-	.then(response => {
-		sendResponse({ success: response.success });
-	})
-	.catch(error => {
-		sendResponse({ error: String(error) , location: '@0B: Push_CouchPotato'});
-	});
+	.then(json => sendResponse(json))
+	.catch(error => sendResponse({ error: String(error), location: '@0B: Charge_CouchPotato' }));
 }
 
 /** Watcher - Movies **/
@@ -303,7 +329,7 @@ function Push_Radarr(request, sendResponse) {
 		.then(body => {
 			return fetch(`${ request.url }?apikey=${ request.token }`, debug.requestHeaders = {
 				method: 'POST',
-				mode: cors(request.url),
+				// mode: cors(request.url),
 				body: JSON.stringify(body),
 				headers
 			});
@@ -383,7 +409,7 @@ function Push_Sonarr(request, sendResponse) {
 		.then(body => {
 			return fetch(`${ request.url }?apikey=${ request.token }`, debug.requestHeaders = {
 				method: 'POST',
-				mode: cors(request.url),
+				// mode: cors(request.url),
 				body: JSON.stringify(body),
 				headers
 			});
@@ -455,7 +481,7 @@ function Push_Medusa(request, sendResponse) {
 		.then(body => {
 			return fetch(`${ request.url }`, debug.requestHeaders = {
 				method: 'POST',
-				mode: cors(request.url),
+				// mode: cors(request.url),
 				body: JSON.stringify({ id: { tvdb: id } }),
 				headers
 			});
@@ -529,7 +555,7 @@ function addMedusa(request, sendResponse) {
 		.then(body => {
 			return fetch(`${ request.url }`, debug.requestHeaders = {
 				method: 'POST',
-				mode: cors(request.url),
+				// mode: cors(request.url),
 				body: JSON.stringify({ id: { tvdb: id } }),
 				headers
 			});
@@ -611,7 +637,7 @@ function Push_SickBeard(request, sendResponse) {
 
 			return fetch(`${ request.url }?cmd=show.${ request.exists? 'addexisting': 'addnew' }&${ body }`, debug.requestHeaders = {
 				method: 'POST',
-				mode: cors(request.url),
+				// mode: cors(request.url),
 				// body: JSON.stringify(body),
 				headers
 			});
@@ -659,8 +685,8 @@ function Push_Ombi(request, sendResponse) {
 		},
 		type = request.contentType,
 		id = (type == 'movie'? request.tmdbId: request.tvdbId),
-		body = ({ [type == 'movie'? 'theMovieDbId': 'theTvDbId']: id }),
-		debug = { headers, request };
+		body = ({ [type == 'movie'? 'theMovieDbId': 'tvDbId']: id, requestAll: true, lastestSeason: true, firstSeason: true }),
+		debug = { headers, body, request };
 			// setup stack trace for debugging
 
 	if(request.contentType == 'movie' && (id || null) === null)
@@ -670,11 +696,11 @@ function Push_Ombi(request, sendResponse) {
 
 	fetch(debug.url = request.url, {
 			method: 'POST',
-			mode: cors(request.url),
+			// mode: cors(request.url),
 			body: JSON.stringify(body),
 			headers
 		})
-		.catch(error => sendResponse({ error: `${ type } not found`, location: '@0B: Push_Ombi => fetch.then.catch', silent: true }))
+		.catch(error => sendResponse({ error: `${ type } not found`, location: '@0B: Push_Ombi => fetch.then.catch', debug, silent: true }))
 		.then(response => response.text())
 		.then(data => {
 			debug.data =
@@ -859,7 +885,7 @@ browser.contextMenus.onClicked.addListener(item => {
 			url = external.SEARCH_PROVIDER == 'VO'?
 				`google.com/search?q=${ p(tl) }+site:vumoo.to`:
 			external.SEARCH_PROVIDER == 'GX'?
-				`gostream.site/?s=${ p(tl) }`:
+				`gostream.site?s=${ p(tl) }`:
 			`google.com/search?q="${ p(tl, ' ') } ${ yr }"+${ pv }db`;
 			break;
 		case 'dl':
@@ -911,8 +937,12 @@ browser.runtime.onMessage.addListener((request = {}, sender, callback) => {
 					Search_Plex(request, callback);
 					break;
 
-				case 'VIEW_COUCHPOTATO':
-					Open_CouchPotato(request, callback);
+				case 'CHARGE_COUCHPOTATO':
+					Charge_CouchPotato(request, callback);
+					break;
+
+				case 'QUERY_COUCHPOTATO':
+					Query_CouchPotato(request, callback);
 					break;
 
 				case 'PUSH_COUCHPOTATO':

moz.zip

@@ -22,27 +22,27 @@
 }
 
 /* Basic/Global Styling */
-*::-moz-scrollbar {
+[class*="web-to-plex"] *::-moz-scrollbar {
     width: 10px;
 }
 
-*::-moz-scrollbar-thumb  {
+[class*="web-to-plex"] *::-moz-scrollbar-thumb  {
     min-height: 50px;
     background: rgba(255, 255, 255, 0.15);
     border: 2px solid rgba(0, 0, 0, 0);
     border-radius: 8px;
     background-clip: padding-box;
 }
 
-*::-moz-scrollbar-track {
+[class*="web-to-plex"] *::-moz-scrollbar-track {
     /* background: url(noise.png) fixed, #3f4245 !important; */
 }
 
-*::placeholder {
+[class*="web-to-plex"] *::placeholder {
     color: #999 !important;
 }
 
-*::-webkit-input-placeholder {
+[class*="web-to-plex"] *::-webkit-input-placeholder {
     color: #999 !important;
 }
 
@@ -405,15 +405,15 @@
    opacity: 0.1;
 }
 
-*:not(#plexit-bookmarklet-frame) ~ .web-to-plex-button {
+[class*="web-to-plex"] *:not(#plexit-bookmarklet-frame) ~ .web-to-plex-button {
    margin-left: 0px;
 }
 
 #plexit-bookmarklet-frame ~ .web-to-plex-button {
    margin-left: 280px !important;
 }
 
-*:not(#plexit-bookmarklet-frame) + .web-to-plex-button #plexit, #plexit-bookmarklet-frame + .web-to-plex-button #wtp-plexit {
+*:not(#plexit-bookmarklet-frame) + .web-to-plex-button [id^="plexit"i], #plexit-bookmarklet-frame + .web-to-plex-button #wtp-plexit {
    display: none !important;
 }
 

moz/background.js

@@ -4,7 +4,7 @@
 	"homepage_url": "https://webtoplex.github.io/",
 
 	"manifest_version": 2,
-	"version": "4.1.2.2",
+	"version": "4.1.2.3",
 	"browser_specific_settings": {
 		"gecko": {
 			"id": "mink.cbos@gmail.com",

moz/common.css

@@ -323,6 +323,7 @@ <h2>Connection Settings</h2>
 		                <input type="text" data-option="couchpotatoToken" placeholder="What's your CouchPotato API key?" default/>
 		                <div>
 		                    1. Go to <strong>CouchPotato</strong> &rarr; <strong>Settings</strong><br/>
+							&mdash; a. Ensure the checkbox <u>Show advanced</u> is checked<br/>
 		                    2. Copy/Paste the <u>API Key</u><br/>
 		                    &mdash; Such as <em>aa756d33242f6a8ffbca2b3963586f21</em>
 		                </div>
@@ -347,20 +348,20 @@ <h3>Login <strong orange>(saved)</strong></h3>
 							This will allow the extension to ask Couchpotato for your list of films, or to add to your list of films.
 						</div>
 		            </section>
-			<!--
+
 		            <section>
-		                <button type="button" id="couchpotato_test" disabled="true">Test Settings <span id="couchpotato_test_status"></span></button>
+		                <button type="button" id="couchpotato_test">Test Settings <span id="couchpotato_test_status"></span></button>
 		            </section>
-		            <section>
+		            <!-- <section>
 		                <label>Quality Profile</label>
 		                <select data-option="couchpotatoQualityProfileId" disabled="true" default>
 		                    <option value="">Press "Test Settings" first</option>
 		                </select>
-		            </section>
-			-->
-					<section>
+		            </section> -->
+
+					<!-- <section>
 						<button id="enable-couchpotato" data-option="enableCouchPotato">Enable CouchPotato</button>
-					</section>
+					</section> -->
 					<hr><br>
 					<section>
 						<button class="test" target="_blank" href="https://webtoplex.github.io/web/">try out couchpotato</button>
@@ -634,7 +635,7 @@ <h2 x-mode>The Minion Button(s)</h2>
 						Allow the use of custom (minion) buttons?
 						<br>
 						<span class="checkbox" prompt"y/n">
-							<!-- When true (checked), will be accessed in CSS (options.css) as ".web-to-plex-minion { ... }" -->
+							<!-- When true (checked), will be accessed in CSS (*.css) as ".web-to-plex-minion { ... }" -->
 							<input id="allow-minions" type="checkbox" data-option="UseMinions" default/>
 							<label for="allow-minions"></label>
 						</span>