morpheus65535/bazarr
1
1
Fork 0
mirror of https://github.com/morpheus65535/bazarr.git synced 2024-09-20 15:35:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix subsunacs subtitle link (#384)

Browse source 
Fix subsunacs and subssabbz subtitle link and downloading button in manual search dialog.
This commit is contained in:
Adrian Dimitrov 2019-04-08 20:58:13 +03:00 committed by morpheus65535
parent 0dcb67b89e
commit 1681d5fc3c
2 changed files with 46 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
libs/subliminal_patch/providers/subssabbz.py
View file

@ -26,16 +26,22 @@ class SubsSabBzSubtitle(Subtitle):
"""SubsSabBz Subtitle.""" """SubsSabBz Subtitle."""
provider_name = 'subssabbz' provider_name = 'subssabbz'
def __init__(self, langauge, filename, type): def __init__(self, langauge, filename, type, video, link):
super(SubsSabBzSubtitle, self).__init__(langauge) super(SubsSabBzSubtitle, self).__init__(langauge)
self.langauge = langauge self.langauge = langauge
self.filename = filename self.filename = filename
self.page_link = link
self.type = type self.type = type
self.video = video
@property @property
def id(self): def id(self):
return self.filename return self.filename
def make_picklable(self):
self.content = None
return self
def get_matches(self, video): def get_matches(self, video):
matches = set() matches = set()
@ -130,15 +136,22 @@ class SubsSabBzProvider(Provider):
return [s for l in languages for s in self.query(l, video)] return [s for l in languages for s in self.query(l, video)]
def download_subtitle(self, subtitle): def download_subtitle(self, subtitle):
pass if subtitle.content:
pass
else:
seeking_subtitle_file = subtitle.filename
arch = self.download_archive_and_add_subtitle_files(subtitle.page_link, subtitle.language, subtitle.video)
for s in arch:
if s.filename == seeking_subtitle_file:
subtitle.content = s.content
def process_archive_subtitle_files(self, archiveStream, language, video): def process_archive_subtitle_files(self, archiveStream, language, video, link):
subtitles = [] subtitles = []
type = 'episode' if isinstance(video, Episode) else 'movie' type = 'episode' if isinstance(video, Episode) else 'movie'
for file_name in archiveStream.namelist(): for file_name in archiveStream.namelist():
if file_name.lower().endswith(('.srt', '.sub')): if file_name.lower().endswith(('.srt', '.sub')):
logger.info('Found subtitle file %r', file_name) logger.info('Found subtitle file %r', file_name)
subtitle = SubsSabBzSubtitle(language, file_name, type) subtitle = SubsSabBzSubtitle(language, file_name, type, video, link)
subtitle.content = archiveStream.read(file_name) subtitle.content = archiveStream.read(file_name)
subtitles.append(subtitle) subtitles.append(subtitle)
return subtitles return subtitles
@ -152,8 +165,8 @@ class SubsSabBzProvider(Provider):
archive_stream = io.BytesIO(request.content) archive_stream = io.BytesIO(request.content)
if is_rarfile(archive_stream): if is_rarfile(archive_stream):
return self.process_archive_subtitle_files( RarFile(archive_stream), language, video ) return self.process_archive_subtitle_files( RarFile(archive_stream), language, video, link )
elif is_zipfile(archive_stream): elif is_zipfile(archive_stream):
return self.process_archive_subtitle_files( ZipFile(archive_stream), language, video ) return self.process_archive_subtitle_files( ZipFile(archive_stream), language, video, link )
else: else:
raise ValueError('Not a valid archive') raise ValueError('Not a valid archive')

41
libs/subliminal_patch/providers/subsunacs.py
View file

@ -26,19 +26,25 @@ class SubsUnacsSubtitle(Subtitle):
"""SubsUnacs Subtitle.""" """SubsUnacs Subtitle."""
provider_name = 'subsunacs' provider_name = 'subsunacs'
def __init__(self, langauge, filename, type): def __init__(self, langauge, filename, type, video, link):
super(SubsUnacsSubtitle, self).__init__(langauge) super(SubsUnacsSubtitle, self).__init__(langauge)
self.langauge = langauge self.langauge = langauge
self.filename = filename self.filename = filename
self.page_link = link
self.type = type self.type = type
self.video = video
@property @property
def id(self): def id(self):
return self.filename return self.filename
def make_picklable(self):
self.content = None
return self
def get_matches(self, video): def get_matches(self, video):
matches = set() matches = set()
video_filename = video.name video_filename = video.name
video_filename = os.path.basename(video_filename) video_filename = os.path.basename(video_filename)
video_filename, _ = os.path.splitext(video_filename) video_filename, _ = os.path.splitext(video_filename)
@ -77,11 +83,11 @@ class SubsUnacsProvider(Provider):
def terminate(self): def terminate(self):
self.session.close() self.session.close()
def query(self, language, video): def query(self, language, video):
subtitles = [] subtitles = []
isEpisode = isinstance(video, Episode) isEpisode = isinstance(video, Episode)
params = { params = {
'm': '', 'm': '',
'l': 0, 'l': 0,
@ -117,7 +123,7 @@ class SubsUnacsProvider(Provider):
soup = BeautifulSoup(response.content, 'html.parser') soup = BeautifulSoup(response.content, 'html.parser')
rows = soup.findAll('td', {'class': 'tdMovie'}) rows = soup.findAll('td', {'class': 'tdMovie'})
# Search on first 10 rows only # Search on first 10 rows only
for row in rows[:10]: for row in rows[:10]:
element = row.find('a', {'class': 'tooltip'}) element = row.find('a', {'class': 'tooltip'})
@ -125,37 +131,44 @@ class SubsUnacsProvider(Provider):
link = element.get('href') link = element.get('href')
logger.info('Found subtitle link %r', link) logger.info('Found subtitle link %r', link)
subtitles = subtitles + self.download_archive_and_add_subtitle_files('https://subsunacs.net' + link, language, video) subtitles = subtitles + self.download_archive_and_add_subtitle_files('https://subsunacs.net' + link, language, video)
return subtitles return subtitles
def list_subtitles(self, video, languages): def list_subtitles(self, video, languages):
return [s for l in languages for s in self.query(l, video)] return [s for l in languages for s in self.query(l, video)]
def download_subtitle(self, subtitle): def download_subtitle(self, subtitle):
pass if subtitle.content:
pass
def process_archive_subtitle_files(self, archiveStream, language, video): else:
seeking_subtitle_file = subtitle.filename
arch = self.download_archive_and_add_subtitle_files(subtitle.page_link, subtitle.language, subtitle.video)
for s in arch:
if s.filename == seeking_subtitle_file:
subtitle.content = s.content
def process_archive_subtitle_files(self, archiveStream, language, video, link):
subtitles = [] subtitles = []
type = 'episode' if isinstance(video, Episode) else 'movie' type = 'episode' if isinstance(video, Episode) else 'movie'
for file_name in archiveStream.namelist(): for file_name in archiveStream.namelist():
if file_name.lower().endswith(('.srt', '.sub')): if file_name.lower().endswith(('.srt', '.sub')):
logger.info('Found subtitle file %r', file_name) logger.info('Found subtitle file %r', file_name)
subtitle = SubsUnacsSubtitle(language, file_name, type) subtitle = SubsUnacsSubtitle(language, file_name, type, video, link)
subtitle.content = archiveStream.read(file_name) subtitle.content = archiveStream.read(file_name)
subtitles.append(subtitle) subtitles.append(subtitle)
return subtitles return subtitles
def download_archive_and_add_subtitle_files(self, link, language, video ): def download_archive_and_add_subtitle_files(self, link, language, video ):
logger.info('Downloading subtitle %r', link) logger.info('Downloading subtitle %r', link)
request = self.session.get(link, headers={ request = self.session.get(link, headers={
'Referer': 'https://subsunacs.net/search.php' 'Referer': 'https://subsunacs.net/search.php'
}) })
request.raise_for_status() request.raise_for_status()
archive_stream = io.BytesIO(request.content) archive_stream = io.BytesIO(request.content)
if is_rarfile(archive_stream): if is_rarfile(archive_stream):
return self.process_archive_subtitle_files( RarFile(archive_stream), language, video ) return self.process_archive_subtitle_files( RarFile(archive_stream), language, video, link )
elif is_zipfile(archive_stream): elif is_zipfile(archive_stream):
return self.process_archive_subtitle_files( ZipFile(archive_stream), language, video ) return self.process_archive_subtitle_files( ZipFile(archive_stream), language, video, link )
else: else:
raise ValueError('Not a valid archive') raise ValueError('Not a valid archive')