Merge branch 'pr/146' into beta-branch

PRIVACY

@@ -0,0 +1,8 @@
+Privacy Policy
+==============
+
+Credentials: The extension saves your credentials locally and may request other permissions (e.g. allowing a website to use a credential) using a secondary prompt. Your credentials will only be used to perform API requests to the requested service respectively (Plex, CouchPotato, Medusa, Ombi, Radarr, Sonarr, and/or Watcher). These credentials will never be shared with outside sources without express permission (i.e. a prompt will appear).
+
+Sharing: To find out if the media is already available on Plex (or other services), the extension may send the title and year, and/or any IDs provided to the service.
+
+Usage/Stats: The extension will not collect any information about your usage.

README.md

@@ -67,7 +67,7 @@ The sites used as search engines (IMDb, TMDb, and TVDb) will automatically creat
 
 1.  [Movieo](http://movieo.me/)
 2.  [IMDb](http://imdb.com/)
-3.  [Trakt.tv](https://trakt.tv/)
+3.  [Trakt](https://trakt.tv/)
 4.  [Letterboxd](https://letterboxd.com/)
 5.  [GoStream](https://gostream.site/)<sup>1</sup>
 6.  [TV Maze](http://www.tvmaze.com/)
@@ -105,6 +105,9 @@ The sites used as search engines (IMDb, TMDb, and TVDb) will automatically creat
 38. [Free Movies Cinema](https://freemoviescinema.com/)<sup>6</sup>
 39. [SnagFilms](https://snagfilms.com/)<sup>6</sup>
 40. [Fox Searchlight](http://foxsearchlight.com/)<sup>6</sup>
+41. [Verizon](https://tv.verizon.com/)<sup>5</sup>
+42. [Tubi](https://tubitv.com/)
+43. [Plex](https://app.plex.tv/)
 
 </details>
 
@@ -123,13 +126,15 @@ The sites used as search engines (IMDb, TMDb, and TVDb) will automatically creat
 
 ### Install the extension (Store)
 
-<a href="https://chrome.google.com/webstore/detail/movieo-to-plex/kmcinnefmnkfnmnmijfmbiaflncfifcn"><img alt="Get it for Chrome" src="badge.chrome.png" /></a>
-<a href="https://addons.mozilla.org/en-US/firefox/addon/web-to-plex/"><img alt="Get it for Firefox" src="badge.firefox.png" /></a>
+<a href="https://chrome.google.com/webstore/detail/web-to-plex/cbpdknicmfolbdpakjihphblioajkcfl"><img alt="Get it for Chrome" src="badge.crx.png" /></a>
+<a href="https://addons.mozilla.org/en-US/firefox/addon/web-2-plex/"><img alt="Get it for Firefox" src="badge.moz.png" /></a>
+<a href="https://microsoftedge.microsoft.com/addons/detail/njkjmenckbpknhnepepbiikcjeboooon"><img alt="Get it for Edge" src="badge.win.png" /></a>
 
 ### Install the source code (ZIP)
 
-<a href="src.zip"><img alt="Get it for Chrome" src="source.chrome.png" /></a>
-<a href="moz.zip"><img alt="Get it for Firefox" src="source.firefox.png" /></a>
+<a href="src.zip"><img alt="Get it for Chrome" src="badge.src.crx.png" /></a>
+<a href="moz.zip"><img alt="Get it for Firefox" src="badge.src.moz.png" /></a>
+<a href="win.zip"><img alt="Get it for Edge" src="badge.src.win.png" /></a>
 
 ## Requirements
 

moz/manifest.json

@@ -4,7 +4,7 @@
 	"homepage_url": "https://github.com/SpaceK33z/web-to-plex/",
 
 	"manifest_version": 2,
-	"version": "4.1.1.7",
+	"version": "4.1.1.8",
 	"browser_specific_settings": {
 		"gecko": {
 			"id": "[email protected]",
@@ -24,7 +24,6 @@
 	"content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'",
 
 	"content_scripts": [
-		// Allow media downloads
 		{
 			"matches": [
 				"*://*.openload.co/*", "*://*.oload.co/*",
@@ -70,7 +69,6 @@
 			"all_frames": true
 		},
 
-		// The sites
 		{
 			"matches": ["*://*.movieo.me/*"],
 			"js": ["history-hack.js", "utils.js", "movieo$.js"]

moz/options.css

@@ -104,6 +104,30 @@ article {
     z-index: 3;
 }
 
+.h1 {
+    font-size: 300%;
+}
+
+.h2 {
+    font-size: 200%;
+}
+
+.h3 {
+    font-size: 150%;
+}
+
+.h4 {
+    font-size: 100%;
+}
+
+.h5 {
+    font-size: 75%;
+}
+
+.h6 {
+    font-size: 50%;
+}
+
 section {
     display: block !important;
     margin-bottom: 20px;
@@ -524,13 +548,26 @@ span.checkbox {
     opacity: 0.25;
 }
 
-[white] {
+[white], .checkbox[white]::before {
     color: #fff !important;
 }
+.checkbox[white] input:checked + label {
+    background: #fff !important;
+}
 
-[orange] {
+[orange], .checkbox[orange]::before {
     color: #cc7b19 !important;
 }
+.checkbox[orange] input:checked + label {
+    background: #cc7b19 !important;
+}
+
+[blue], .checkbox[blue]::before {
+    color: #197bcc !important;
+}
+.checkbox[blue] input:checked + label {
+    background: #197bcc !important;
+}
 
 input[type="range"] {
     appearance: none;

moz/options.html

@@ -330,7 +330,7 @@ <h3>Login <em>(saved)</em></h3>
 		            </section>
 
 		            <section>
-		                <div>This information will be used for <a href="https://wikipedia.org/wiki/Basic_access_authentication" target="_blank">Basic Access Authentication</a> only. This will allow the extension to ask Couchpotato for your list of videos, or to add to your list of videos.</div>
+		                <div>This information will be used for <a href="https://wikipedia.org/wiki/Basic_access_authentication" target="_blank">Basic Access Authentication</a> only. This will allow the extension to ask Couchpotato for your list of films, or to add to your list of films.</div>
 		            </section>
 			<!--
 		            <section>
@@ -413,7 +413,6 @@ <h3>Login <em>(saved)</em></h3>
 							<option>User Defined</option>
 							<option>Any Defined Type</option>
 						</select>
-						<hr/>
 		                <label>Quality Profile</label>
 		                <select data-option="medusaQualityProfileId">
 		                    <option value="">Press "Test [?]" first</option>
@@ -551,7 +550,6 @@ <h3>Login <em>(saved)</em></h3>
 							<option>Initial</option>
 				            <option>Archive</option>
 				        </select>
-				        <hr/>
 				        <label>Quality Profile</label>
 				        <select data-option="sickBeardQualityProfileId">
 				            <option value="">Press "Test [?]" first</option>
@@ -575,17 +573,19 @@ <h3>Login <em>(saved)</em></h3>
 					<summary>Theme Settings</summary>
 
 					<h2>The Button</h2>
+					<!--
 					<section>
 						What shape should the button be?
 						<br>
 						<span class="checkbox" prompt-size="large" prompt-yes="&#9723;" prompt-no="&#9675;">
-							<!-- When true (checked), will be accessed in CSS (/sites/theme.css) as ".button-shape-box { ... }" -->
+							<!-- When true (checked), will be accessed in CSS (/sites/theme.css) as ".button-shape-box { ... }" --/>
 							<input data-option="theme:button-shape" theme="true:box" type="checkbox"/>
 							<label for="theme:button-shape"></label>
 						</span>
 					</section>
+					-->
 					<section>
-						Where should the button be (<span orange>&#9711;</span> only)?
+						Which direction should the button open (<span orange>&#9711;</span> only)?
 						<br>
 						<span class="checkbox" prompt-size="large" prompt-yes="&#8672;" prompt-no="&#8674;">
 							<!-- When true (checked), will be accessed in CSS (/sites/theme.css) as ".button-location-right { ... }" -->
@@ -608,13 +608,16 @@ <h2>The Button</h2>
 						<span counter-for="sites">...</span>
 					</summary>
 
-		            <h2>Experimental Sites</h2>
+					<strong class="h2">Experimental Sites</strong>
+					<div class="checkbox" blue><input id="all-plugin" type="checkbox"/><label for="all-plugin"></label></div>
+					<hr>
 		            <section id="plugins">
 		                <!-- Filled in via the options.js script -->
 		            </section>
 					<hr>
-
-		            <h2>Default Sites</h2>
+					<strong class="h2">Default Sites</strong>
+					<div class="checkbox" blue><input id="all-builtin" type="checkbox"/><label for="all-builtin"></label></div>
+					<hr>
 		            <section id="builtin">
 		                <!-- Filled in via the options.js script -->
 		            </section>
@@ -830,16 +833,18 @@ <h3 x-mode>Data Compression</h3>
 						</div>
 						<div>
 							<em>WARNING</em>: may cause data loss.<br>
-							Enabling this option will compress your cached search data using the <a href="https://wikipedia.org/wiki/Lempel%E2%80%93Ziv%E2%80%93Welch" target="_blank">LZW Compression Algorithm</a>.
+							Enabling this option will compress your cached search data using the <a href="https://wikipedia.org/wiki/Burrows%E2%80%93Wheeler_transform" target="_blank">BWT (transform)</a> and <a href="https://wikipedia.org/wiki/Lempel%E2%80%93Ziv%E2%80%93Welch" target="_blank">LZW Compression Algorithm</a>.
 						</div>
 					</section>
 					<hr>
 		            <section>
 		                <h3>Configuration Data (Copy/Paste)</h3>
 		                <input id="json_data" type="text" code placeholder="Enter your configuration data"/>
-		                <div>
-		                    Use this for testing purposes only, as it may contain saved usernames and/or passwords.
-		                </div>
+						<div>
+ 						   Use this for testing purposes only, as it may contain saved usernames and/or passwords.
+ 						   <br>
+ 						   You cannot use this feature with <strong>Data Compression</strong> enabled.
+ 					   </div>
 		                <br>
 		                <button type="button" id="json_set">Generate Data</button>
 		                <button type="button" id="json_get">Restore Data</button>