Compare commits

...

12 Commits

Author SHA1 Message Date
pannal 50ceb6ef90 remove old TLD file due to licensing issues 2023-07-09 15:07:38 +02:00
pannal a8bce7c4c4 Merge branch 'master' into develop-2.6
# Conflicts:
#	Contents/Info.plist
2023-07-09 05:14:08 +02:00
pannal f888cadb8f release 2.6.5.3277 2023-07-09 04:49:32 +02:00
pannal ccf264cffb core: fix enabled library/agents detection (Plex removed certain features) 2023-07-09 04:42:24 +02:00
panni 19a66dcf1c core: fix adding guessit-supplied titles as alternative titles (were overridden by plex before) 2023-07-09 04:42:24 +02:00
panni 67b20b357d back to dev 2023-07-09 04:42:24 +02:00
pannal fd06dbc434 core: fix enabled library/agents detection (Plex removed certain features) 2023-07-07 16:14:47 +02:00
pannal d33bc1b148 Merge pull request #788 from sugarman402/patch-1
Change supersubtitles server url
2022-11-28 04:23:11 +01:00
Tamás Németh 8de63e92e5 Change supersupbtitles server url
Supersubtitles' url changed from feliratok.info to feliratok.eu
2022-06-05 18:22:01 +02:00
panni a18d01213b core: fix adding guessit-supplied titles as alternative titles (were overridden by plex before) 2021-08-26 13:05:14 +02:00
pannal 2788b0e0b2 Update README.md 2021-05-07 02:36:16 +02:00
panni 67ac4b61f8 back to dev 2021-05-07 02:30:13 +02:00
7 changed files with 37 additions and 4427 deletions
+13 -2
View File
@@ -671,12 +671,23 @@ class Config(object):
enabled_for_primary_agents = {"movie": [], "show": []}
enabled_sections = {}
legacy_agents = {
"com.plexapp.agents.thetvdb": [SHOW],
"com.plexapp.agents.thetvdbdvdorder": [SHOW],
"com.plexapp.agents.hama": [SHOW, MOVIE],
"com.plexapp.agents.themoviedb": [SHOW, MOVIE],
"com.plexapp.agents.imdb": [SHOW, MOVIE],
}
# find which agents we're enabled for
for agent in Plex.agents():
if not agent.primary:
#if not agent.primary:
# continue
if agent.identifier not in legacy_agents:
continue
media_types = [t.media_type for t in list(agent.media_types)]
#media_types = [t.media_type for t in list(agent.media_types)]
media_types = legacy_agents[agent.identifier] + []
# the new movie agent doesn't populate its media types, workaround
if not media_types and agent.identifier == "tv.plex.agents.movie":
+3 -3
View File
@@ -13,7 +13,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>2.6.5.3268</string>
<string>2.6.5.3277</string>
<key>PlexFrameworkVersion</key>
<string>2</string>
<key>PlexPluginClass</key>
@@ -23,7 +23,7 @@
<key>PlexPluginConsoleLogging</key>
<string>0</string>
<key>PlexPluginDevMode</key>
<string>0</string>
<string>1</string>
<key>PlexPluginCodePolicy</key>
<!-- this allows channels to access some python methods which are otherwise blocked, as well as import external code libraries, and interact with the PMS HTTP API -->
<string>Elevated</string>
@@ -32,7 +32,7 @@
&lt;h1&gt;Sub-Zero for Plex&lt;/h1&gt;&lt;i&gt;Subtitles done right&lt;/i&gt;
Version 2.6.5.3268
Version 2.6.5.3277 DEV
Originally based on @bramwalet's awesome &lt;a href=&quot;https://github.com/bramwalet/Subliminal.bundle&quot;&gt;Subliminal.bundle&lt;/a&gt;
@@ -529,7 +529,7 @@ def scan_video(path, dont_use_actual_file=False, hints=None, providers=None, ski
video.hints = hints
# get possibly alternative title from the filename itself
alt_guess = guessit(filename, options=hints)
alt_guess = guessit(filename, options={k: v for k, v in hints.items() if k not in ('expected_title', 'title')})
if "title" in alt_guess and alt_guess["title"] != guessed_result["title"]:
if video_type == "episode":
video.alternative_series.append(alt_guess["title"])
@@ -143,7 +143,7 @@ class SuperSubtitlesProvider(Provider, ProviderSubtitleArchiveMixin):
]}
video_types = (Episode, Movie)
# https://www.feliratok.info/?search=&soriSorszam=&nyelv=&sorozatnev=The+Flash+%282014%29&sid=3212&complexsearch=true&knyelv=0&evad=4&epizod1=1&cimke=0&minoseg=0&rlsr=0&tab=all
server_url = 'https://www.feliratok.info/'
server_url = 'https://www.feliratok.eu/'
subtitle_class = SuperSubtitlesSubtitle
hearing_impaired_verifiable = False
multi_result_throttle = 2 # seconds
@@ -181,6 +181,14 @@ class FixUppercase(SubtitleModification):
entry.plaintext = self.capitalize(entry.plaintext)
"""
subsync
subsync --cli --offline --overwrite --window-size=600 --max-point-dist=2.0 --min-points-no=20 --min-word-prob=0.3 --min-word-len=5 --min-correlation=0.9999 --min-words-sim=0.6 --out-time-offset=-0.08 sync --out SUBTITLE -s SUBTITLE --sub-lang=eng --sub-enc=utf-8 -r REF_FILE --ref-stream-by-type=audio --ref-stream-by-lang=eng
"""
registry.register(CommonFixes)
registry.register(RemoveTags)
registry.register(ReverseRTL)
File diff suppressed because it is too large Load Diff
+11 -2
View File
@@ -1,7 +1,7 @@
# Sub-Zero for Plex
[![](https://img.shields.io/github/release/pannal/Sub-Zero.bundle.svg?style=flat&label=stable)](https://github.com/pannal/Sub-Zero.bundle/releases/latest)
[![master](https://img.shields.io/badge/master-stable-green.svg?maxAge=2592000)]()
[![Maintenance](https://img.shields.io/maintenance/yes/2021.svg)]()
[![Maintenance](https://img.shields.io/maintenance/yes/2023.svg)]()
[![Slack Status](https://szslack.fragstore.net/badge.svg)](https://szslack.fragstore.net)
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fpannal%2FSub-Zero.bundle.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fpannal%2FSub-Zero.bundle?ref=badge_shield)
@@ -12,6 +12,9 @@ Check out **[the Sub-Zero Wiki](https://github.com/pannal/Sub-Zero.bundle/wiki)*
<br />
## Legacy maintenance mode
This addon will not be developed any further. It still works and arguably is still the best for managing subtitles when using Plex. As long as Plex Inc. supports agents, Sub-Zero will be maintained to work with the latest PMS version.
---
**[Kitana is now required to have a UI](https://github.com/pannal/Kitana)**
@@ -24,7 +27,7 @@ Check out **[the Sub-Zero Wiki](https://github.com/pannal/Sub-Zero.bundle/wiki)*
## Helping development
If you like this, buy me a beer: <br>[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=G9VKR2B8PMNKG) <br>or become a Patreon starting at **1 $ / month** <br><a href="https://www.patreon.com/subzero_plex" target="_blank"><img src="https://i0.wp.com/tablecakes.com/wp-content/uploads/2018/08/become-a-patron-button.png" height="54" /></a> <br>or use the OpenSubtitles Sub-Zero affiliate link to become VIP <br>**10€/year, ad-free subs, 1000 subs/day, no-cache *VIP* server**<br><a href="http://v.ht/osvip" target="_blank"><img src="https://static.opensubtitles.org/gfx/logo.gif" height="50" /></a>
If you like this, buy me a beer: <br>[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=G9VKR2B8PMNKG) <br>or become a Patreon starting at **1 $ / month** <br><a href="https://www.patreon.com/subzero_plex" target="_blank"><img src="https://images.squarespace-cdn.com/content/v1/56c7831bf8baf3ae17ce9259/1561826418792-IJOMFASTOR6CW80N5W0Z/ke17ZwdGBToddI8pDm48kEycOuEejcFJqqLot0yQ4VVZw-zPPgdn4jUwVcJE1ZvWEtT5uBSRWt4vQZAgTJucoTqqXjS3CfNDSuuf31e0tVFrfGYmOrPFZFUXr1UxW4wA0PgPOjs31URy2JeWL9DdYhur-lC0WofN0YB1wFg-ZW0/footer-patreon.png?format=500w" height="54" /></a>
If you register with an anti-captcha service and you decide to use [Anti-Captcha.com](http://getcaptchasolution.com/kkvviom7nh), you can use [this affiliate link](http://getcaptchasolution.com/kkvviom7nh) to help development.
@@ -93,6 +96,12 @@ the.vbm, mmgoodnow, Vertig0ne, thliu78, tattoomees, ostman, count_confucius, ehe
## Changelog
2.6.5.3277
- core: fix enabled library/agents detection (Plex removed certain features)
fix Plex agent integration; Plex Inc removed certain attributes; SZ is now limited to thetvdb, thetvdbdvdorder, hama, themoviedb, imdb)
2.6.5.3268
subscene, addic7ed
- either of those providers might impose a reCAPTCHA verification. In order to use those providers, please create an account at an AntiCaptcha service ([anti-captcha.com](http://getcaptchasolution.com/kkvviom7nh) or [deathbycaptcha.com](http://deathbycaptcha.com)), add funds, then supply your credentials/apikey in the configuration