Skip to content

Commit

Permalink
Removed closed subscene provider
Browse files Browse the repository at this point in the history
  • Loading branch information
morpheus65535 committed May 9, 2024
1 parent f914ed0 commit bb4b01f
Show file tree
Hide file tree
Showing 9 changed files with 2 additions and 1,203 deletions.
13 changes: 0 additions & 13 deletions bazarr/app/config.py
Expand Up @@ -293,10 +293,6 @@ def check_parser_binary(value):
Validator('napisy24.username', must_exist=True, default='', is_type_of=str, cast=str),
Validator('napisy24.password', must_exist=True, default='', is_type_of=str, cast=str),

# subscene section
Validator('subscene.username', must_exist=True, default='', is_type_of=str, cast=str),
Validator('subscene.password', must_exist=True, default='', is_type_of=str, cast=str),

# betaseries section
Validator('betaseries.token', must_exist=True, default='', is_type_of=str, cast=str),

Expand Down Expand Up @@ -686,15 +682,6 @@ def save_settings(settings_items):
reset_providers = True
region.delete('oscom_token')

if key == 'settings-subscene-username':
if key != settings.subscene.username:
reset_providers = True
region.delete('subscene_cookies2')
elif key == 'settings-subscene-password':
if key != settings.subscene.password:
reset_providers = True
region.delete('subscene_cookies2')

if key == 'settings-titlovi-username':
if key != settings.titlovi.username:
reset_providers = True
Expand Down
7 changes: 1 addition & 6 deletions bazarr/app/get_providers.py
Expand Up @@ -125,7 +125,7 @@ def provider_throttle_map():


PROVIDERS_FORCED_OFF = ["addic7ed", "tvsubtitles", "legendasdivx", "napiprojekt", "shooter",
"hosszupuska", "supersubtitles", "titlovi", "assrt", "subscene"]
"hosszupuska", "supersubtitles", "titlovi", "assrt"]

throttle_count = {}

Expand Down Expand Up @@ -259,11 +259,6 @@ def get_providers_auth():
'also_foreign': False, # fixme
'verify_ssl': settings.podnapisi.verify_ssl
},
'subscene': {
'username': settings.subscene.username,
'password': settings.subscene.password,
'only_foreign': False, # fixme
},
'legendasdivx': {
'username': settings.legendasdivx.username,
'password': settings.legendasdivx.password,
Expand Down
16 changes: 1 addition & 15 deletions bazarr/subtitles/manual.py
Expand Up @@ -18,7 +18,7 @@
from utilities.helper import get_target_folder, force_unicode
from app.database import get_profiles_list

from .pool import update_pools, _get_pool, _init_pool
from .pool import update_pools, _get_pool
from .utils import get_video, _get_lang_obj, _get_scores, _set_forced_providers
from .processing import process_subtitle

Expand Down Expand Up @@ -46,21 +46,7 @@ def manual_search(path, profile_id, providers, sceneName, title, media_type):
try:
if providers:
subtitles = list_all_subtitles([video], language_set, pool)

if 'subscene' in providers:
s_pool = _init_pool("movie", profile_id, {"subscene"})

subscene_language_set = set()
for language in language_set:
if language.forced:
subscene_language_set.add(language)
if len(subscene_language_set):
s_pool.provider_configs.update({"subscene": {"only_foreign": True}})
subtitles_subscene = list_all_subtitles([video], subscene_language_set, s_pool)
s_pool.provider_configs.update({"subscene": {"only_foreign": False}})
subtitles[video] += subtitles_subscene[video]
else:
subtitles = []
logging.info("BAZARR All providers are throttled")
return 'All providers are throttled'
except Exception:
Expand Down
1 change: 0 additions & 1 deletion bazarr/subtitles/utils.py
Expand Up @@ -97,7 +97,6 @@ def _set_forced_providers(pool, also_forced=False, forced_required=False):
pool.provider_configs.update(
{
"podnapisi": {'also_foreign': also_forced, "only_foreign": forced_required},
"subscene": {"only_foreign": forced_required},
"opensubtitles": {'also_foreign': also_forced, "only_foreign": forced_required}
}
)
1 change: 0 additions & 1 deletion custom_libs/custom_version.txt
Expand Up @@ -15,5 +15,4 @@ deathbycaptcha # unknown version, only found on gist
git+https://github.com/pannal/libfilebot#egg=libfilebot
git+https://github.com/RobinDavid/pyADS.git@28a2f6dbfb357f85b2c2f49add770b336e88840d#egg=pyads
py7zr==0.7.0 # modified to prevent importing of modules that can't be vendored
subscene-api==1.0.0 # modified specificaly for Bazarr
subliminal==2.1.0 # modified specifically for Bazarr
92 changes: 0 additions & 92 deletions custom_libs/subliminal_patch/converters/subscene.py

This file was deleted.

0 comments on commit bb4b01f

Please sign in to comment.