Skip to content

Commit cb92faf

Browse files
committed
Merge branch 'pr/146' into beta-branch
2 parents 87a1f25 + e022337 commit cb92faf

File tree

228 files changed

+14210
-92
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

228 files changed

+14210
-92
lines changed

PRIVACY

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Privacy Policy
2+
==============
3+
4+
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).
5+
6+
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.
7+
8+
Usage/Stats: The extension will not collect any information about your usage.

README.md

+10-5
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ The sites used as search engines (IMDb, TMDb, and TVDb) will automatically creat
6767

6868
1. [Movieo](http://movieo.me/)
6969
2. [IMDb](http://imdb.com/)
70-
3. [Trakt.tv](https://trakt.tv/)
70+
3. [Trakt](https://trakt.tv/)
7171
4. [Letterboxd](https://letterboxd.com/)
7272
5. [GoStream](https://gostream.site/)<sup>1</sup>
7373
6. [TV Maze](http://www.tvmaze.com/)
@@ -105,6 +105,9 @@ The sites used as search engines (IMDb, TMDb, and TVDb) will automatically creat
105105
38. [Free Movies Cinema](https://freemoviescinema.com/)<sup>6</sup>
106106
39. [SnagFilms](https://snagfilms.com/)<sup>6</sup>
107107
40. [Fox Searchlight](http://foxsearchlight.com/)<sup>6</sup>
108+
41. [Verizon](https://tv.verizon.com/)<sup>5</sup>
109+
42. [Tubi](https://tubitv.com/)
110+
43. [Plex](https://app.plex.tv/)
108111

109112
</details>
110113

@@ -123,13 +126,15 @@ The sites used as search engines (IMDb, TMDb, and TVDb) will automatically creat
123126

124127
### Install the extension (Store)
125128

126-
<a href="https://chrome.google.com/webstore/detail/movieo-to-plex/kmcinnefmnkfnmnmijfmbiaflncfifcn"><img alt="Get it for Chrome" src="badge.chrome.png" /></a>
127-
<a href="https://addons.mozilla.org/en-US/firefox/addon/web-to-plex/"><img alt="Get it for Firefox" src="badge.firefox.png" /></a>
129+
<a href="https://chrome.google.com/webstore/detail/web-to-plex/cbpdknicmfolbdpakjihphblioajkcfl"><img alt="Get it for Chrome" src="badge.crx.png" /></a>
130+
<a href="https://addons.mozilla.org/en-US/firefox/addon/web-2-plex/"><img alt="Get it for Firefox" src="badge.moz.png" /></a>
131+
<a href="https://microsoftedge.microsoft.com/addons/detail/njkjmenckbpknhnepepbiikcjeboooon"><img alt="Get it for Edge" src="badge.win.png" /></a>
128132

129133
### Install the source code (ZIP)
130134

131-
<a href="src.zip"><img alt="Get it for Chrome" src="source.chrome.png" /></a>
132-
<a href="moz.zip"><img alt="Get it for Firefox" src="source.firefox.png" /></a>
135+
<a href="src.zip"><img alt="Get it for Chrome" src="badge.src.crx.png" /></a>
136+
<a href="moz.zip"><img alt="Get it for Firefox" src="badge.src.moz.png" /></a>
137+
<a href="win.zip"><img alt="Get it for Edge" src="badge.src.win.png" /></a>
133138

134139
## Requirements
135140

badge.chrome.png badge.crx.png

File renamed without changes.

badge.firefox.png badge.moz.png

File renamed without changes.
2.78 KB
Loading
File renamed without changes.

badge.src.win.png

6.38 KB
Loading

badge.win.png

3.53 KB
Loading

example.png

0 Bytes
Loading

moz/manifest.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"homepage_url": "https://github.com/SpaceK33z/web-to-plex/",
55

66
"manifest_version": 2,
7-
"version": "4.1.1.7",
7+
"version": "4.1.1.8",
88
"browser_specific_settings": {
99
"gecko": {
1010
@@ -24,7 +24,6 @@
2424
"content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'",
2525

2626
"content_scripts": [
27-
// Allow media downloads
2827
{
2928
"matches": [
3029
"*://*.openload.co/*", "*://*.oload.co/*",
@@ -70,7 +69,6 @@
7069
"all_frames": true
7170
},
7271

73-
// The sites
7472
{
7573
"matches": ["*://*.movieo.me/*"],
7674
"js": ["history-hack.js", "utils.js", "movieo$.js"]

moz/options.css

+39-2
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,30 @@ article {
104104
z-index: 3;
105105
}
106106

107+
.h1 {
108+
font-size: 300%;
109+
}
110+
111+
.h2 {
112+
font-size: 200%;
113+
}
114+
115+
.h3 {
116+
font-size: 150%;
117+
}
118+
119+
.h4 {
120+
font-size: 100%;
121+
}
122+
123+
.h5 {
124+
font-size: 75%;
125+
}
126+
127+
.h6 {
128+
font-size: 50%;
129+
}
130+
107131
section {
108132
display: block !important;
109133
margin-bottom: 20px;
@@ -524,13 +548,26 @@ span.checkbox {
524548
opacity: 0.25;
525549
}
526550

527-
[white] {
551+
[white], .checkbox[white]::before {
528552
color: #fff !important;
529553
}
554+
.checkbox[white] input:checked + label {
555+
background: #fff !important;
556+
}
530557

531-
[orange] {
558+
[orange], .checkbox[orange]::before {
532559
color: #cc7b19 !important;
533560
}
561+
.checkbox[orange] input:checked + label {
562+
background: #cc7b19 !important;
563+
}
564+
565+
[blue], .checkbox[blue]::before {
566+
color: #197bcc !important;
567+
}
568+
.checkbox[blue] input:checked + label {
569+
background: #197bcc !important;
570+
}
534571

535572
input[type="range"] {
536573
appearance: none;

moz/options.html

+17-12
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ <h3>Login <em>(saved)</em></h3>
330330
</section>
331331

332332
<section>
333-
<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>
333+
<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>
334334
</section>
335335
<!--
336336
<section>
@@ -413,7 +413,6 @@ <h3>Login <em>(saved)</em></h3>
413413
<option>User Defined</option>
414414
<option>Any Defined Type</option>
415415
</select>
416-
<hr/>
417416
<label>Quality Profile</label>
418417
<select data-option="medusaQualityProfileId">
419418
<option value="">Press "Test [?]" first</option>
@@ -551,7 +550,6 @@ <h3>Login <em>(saved)</em></h3>
551550
<option>Initial</option>
552551
<option>Archive</option>
553552
</select>
554-
<hr/>
555553
<label>Quality Profile</label>
556554
<select data-option="sickBeardQualityProfileId">
557555
<option value="">Press "Test [?]" first</option>
@@ -575,17 +573,19 @@ <h3>Login <em>(saved)</em></h3>
575573
<summary>Theme Settings</summary>
576574

577575
<h2>The Button</h2>
576+
<!--
578577
<section>
579578
What shape should the button be?
580579
<br>
581580
<span class="checkbox" prompt-size="large" prompt-yes="&#9723;" prompt-no="&#9675;">
582-
<!-- When true (checked), will be accessed in CSS (/sites/theme.css) as ".button-shape-box { ... }" -->
581+
<!-- When true (checked), will be accessed in CSS (/sites/theme.css) as ".button-shape-box { ... }" --/>
583582
<input data-option="theme:button-shape" theme="true:box" type="checkbox"/>
584583
<label for="theme:button-shape"></label>
585584
</span>
586585
</section>
586+
-->
587587
<section>
588-
Where should the button be (<span orange>&#9711;</span> only)?
588+
Which direction should the button open (<span orange>&#9711;</span> only)?
589589
<br>
590590
<span class="checkbox" prompt-size="large" prompt-yes="&#8672;" prompt-no="&#8674;">
591591
<!-- When true (checked), will be accessed in CSS (/sites/theme.css) as ".button-location-right { ... }" -->
@@ -608,13 +608,16 @@ <h2>The Button</h2>
608608
<span counter-for="sites">...</span>
609609
</summary>
610610

611-
<h2>Experimental Sites</h2>
611+
<strong class="h2">Experimental Sites</strong>
612+
<div class="checkbox" blue><input id="all-plugin" type="checkbox"/><label for="all-plugin"></label></div>
613+
<hr>
612614
<section id="plugins">
613615
<!-- Filled in via the options.js script -->
614616
</section>
615617
<hr>
616-
617-
<h2>Default Sites</h2>
618+
<strong class="h2">Default Sites</strong>
619+
<div class="checkbox" blue><input id="all-builtin" type="checkbox"/><label for="all-builtin"></label></div>
620+
<hr>
618621
<section id="builtin">
619622
<!-- Filled in via the options.js script -->
620623
</section>
@@ -830,16 +833,18 @@ <h3 x-mode>Data Compression</h3>
830833
</div>
831834
<div>
832835
<em>WARNING</em>: may cause data loss.<br>
833-
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>.
836+
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>.
834837
</div>
835838
</section>
836839
<hr>
837840
<section>
838841
<h3>Configuration Data (Copy/Paste)</h3>
839842
<input id="json_data" type="text" code placeholder="Enter your configuration data"/>
840-
<div>
841-
Use this for testing purposes only, as it may contain saved usernames and/or passwords.
842-
</div>
843+
<div>
844+
Use this for testing purposes only, as it may contain saved usernames and/or passwords.
845+
<br>
846+
You cannot use this feature with <strong>Data Compression</strong> enabled.
847+
</div>
843848
<br>
844849
<button type="button" id="json_set">Generate Data</button>
845850
<button type="button" id="json_get">Restore Data</button>

0 commit comments

Comments
 (0)