mirror
/
bazarr
mirror of https://github.com/morpheus65535/bazarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Supersubtitles provider: update matcher and downloader

This commit is contained in:
Vitiko 2023-02-15 20:51:55 -04:00
parent f6c0146402
commit 62b5bd84b9
2 changed files with 30 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
libs/subliminal_patch/providers/supersubtitles.py
View File

@ -1,32 +1,34 @@
# coding=utf-8 # coding=utf-8
import io
import logging import logging
from random import randint
import re import re
import time import time
import urllib.parse
from babelfish import language_converters from babelfish import language_converters
from subzero.language import Language from bs4.element import NavigableString
from bs4.element import Tag
from guessit import guessit
from requests import Session from requests import Session
from requests.exceptions import JSONDecodeError from requests.exceptions import JSONDecodeError
import urllib.parse from subliminal.providers import ParserBeautifulSoup
from random import randint from subliminal.score import get_equivalent_release_groups
from subliminal.utils import sanitize
from subliminal.subtitle import fix_line_ending from subliminal.utils import sanitize_release_group
from subliminal.video import Episode
from subliminal.video import Movie
from subliminal_patch.exceptions import APIThrottled
from subliminal_patch.providers import Provider from subliminal_patch.providers import Provider
from subliminal_patch.providers.mixins import ProviderSubtitleArchiveMixin from subliminal_patch.providers.mixins import ProviderSubtitleArchiveMixin
from subliminal.providers import ParserBeautifulSoup from subliminal_patch.subtitle import Subtitle
from bs4.element import Tag, NavigableString from subliminal_patch.utils import fix_inconsistent_naming
from subliminal.score import get_equivalent_release_groups from subliminal_patch.utils import sanitize
from subliminal_patch.subtitle import Subtitle, guess_matches from subzero.language import Language
from subliminal_patch.exceptions import APIThrottled
from subliminal.utils import sanitize, sanitize_release_group
from subliminal.video import Episode, Movie
from zipfile import ZipFile, is_zipfile
from rarfile import RarFile, is_rarfile
from subliminal_patch.utils import sanitize, fix_inconsistent_naming
from guessit import guessit
from .utils import FIRST_THOUSAND_OR_SO_USER_AGENTS as AGENT_LIST
from .utils import FIRST_THOUSAND_OR_SO_USER_AGENTS as AGENT_LIST
from .utils import get_archive_from_bytes
from .utils import get_subtitle_from_archive
from .utils import update_matches
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -78,7 +80,7 @@ class SuperSubtitlesSubtitle(Subtitle):
self.season = season self.season = season
self.episode = episode self.episode = episode
self.version = version self.version = version
self.releases = releases self.releases = releases or []
self.year = year self.year = year
self.uploader = uploader self.uploader = uploader
if year: if year:
@ -91,7 +93,7 @@ class SuperSubtitlesSubtitle(Subtitle):
self.asked_for_episode = asked_for_episode self.asked_for_episode = asked_for_episode
self.imdb_id = imdb_id self.imdb_id = imdb_id
self.is_pack = True self.is_pack = True
self.matches = None self.matches = set()
def numeric_id(self): def numeric_id(self):
return self.subtitle_id return self.subtitle_id
@ -109,8 +111,8 @@ class SuperSubtitlesSubtitle(Subtitle):
return str(self.subtitle_id) return str(self.subtitle_id)
def get_matches(self, video): def get_matches(self, video):
type_ = "movie" if isinstance(video, Movie) else "episode" matches = set()
matches = guess_matches(video, guessit(self.release_info, {"type": type_})) update_matches(matches, video, self.releases)
# episode # episode
if isinstance(video, Episode): if isinstance(video, Episode):
@ -543,21 +545,12 @@ class SuperSubtitlesProvider(Provider, ProviderSubtitleArchiveMixin):
return subtitles return subtitles
def download_subtitle(self, subtitle): def download_subtitle(self, subtitle):
# download as a zip
logger.info('Downloading subtitle %r', subtitle.subtitle_id)
r = self.session.get(subtitle.page_link, timeout=10) r = self.session.get(subtitle.page_link, timeout=10)
r.raise_for_status() r.raise_for_status()
archive_stream = io.BytesIO(r.content) archive = get_archive_from_bytes(r.content)
archive = None
if is_rarfile(archive_stream): if archive is None:
archive = RarFile(archive_stream) raise APIThrottled(f"Invalid archive from {subtitle.page_link}")
elif is_zipfile(archive_stream):
archive = ZipFile(archive_stream)
else:
subtitle.content = fix_line_ending(r.content)
if archive is not None: subtitle.content = get_subtitle_from_archive(archive, episode=subtitle.episode or None)
subtitle.content = self.get_subtitle_from_archive(subtitle, archive)

4
tests/subliminal_patch/test_supersubtitles.py
View File

@ -44,7 +44,7 @@ def test_list_episode_subtitles(episode):
def test_download_episode_subtitle(episode): def test_download_episode_subtitle(episode):
subtitle = SuperSubtitlesSubtitle( subtitle = SuperSubtitlesSubtitle(
Language.fromalpha2("en"), Language.fromalpha2("en"),
"https://www.feliratok.info/index.php?action=letolt&felirat=1643361676", "https://www.feliratok.eu/index.php?action=letolt&felirat=1643361676",
1643361676, 1643361676,
"All of us are dead", "All of us are dead",
1, 1,
@ -82,7 +82,7 @@ def test_download_movie_subtitle(movies):
subtitle = SuperSubtitlesSubtitle( subtitle = SuperSubtitlesSubtitle(
Language.fromalpha2("en"), Language.fromalpha2("en"),
"https://www.feliratok.info/index.php?action=letolt&felirat=1634579718", "https://www.feliratok.eu/index.php?action=letolt&felirat=1634579718",
1634579718, 1634579718,
"Dune", "Dune",
0, 0,