mirror of https://github.com/morpheus65535/bazarr
subssabbz, subsunacs, yavkanet - add frame rate to release info
- add subtitle frame rate to release info - better handling of exceptions while dolwnloading subtitles
This commit is contained in:
parent
7fc50a20a8
commit
36cf8ca344
|
@ -55,7 +55,12 @@ class SubsSabBzSubtitle(Subtitle):
|
||||||
self.video = video
|
self.video = video
|
||||||
self.fps = fps
|
self.fps = fps
|
||||||
self.num_cds = num_cds
|
self.num_cds = num_cds
|
||||||
self.release_info = os.path.splitext(filename)[0]
|
self.release_info = filename
|
||||||
|
if fps:
|
||||||
|
if video.fps and float(video.fps) == fps:
|
||||||
|
self.release_info += " <b>[{:.3f}]</b>".format(fps)
|
||||||
|
else:
|
||||||
|
self.release_info += " [{:.3f}]".format(fps)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def id(self):
|
def id(self):
|
||||||
|
@ -168,7 +173,7 @@ class SubsSabBzProvider(Provider):
|
||||||
element = a_element_wrapper.find('a')
|
element = a_element_wrapper.find('a')
|
||||||
if element:
|
if element:
|
||||||
link = element.get('href')
|
link = element.get('href')
|
||||||
notes = element.get('onmouseover')
|
notes = re.sub(r'ddrivetip\(\'<div.*/></div>(.*)\',\'#[0-9]+\'\)', r'\1', element.get('onmouseover'))
|
||||||
title = element.get_text()
|
title = element.get_text()
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
@ -248,12 +253,15 @@ class SubsSabBzProvider(Provider):
|
||||||
else:
|
else:
|
||||||
logger.info('Cache file: %s', codecs.encode(cache_key, 'hex_codec').decode('utf-8'))
|
logger.info('Cache file: %s', codecs.encode(cache_key, 'hex_codec').decode('utf-8'))
|
||||||
|
|
||||||
|
try:
|
||||||
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, link, fps, num_cds)
|
return self.process_archive_subtitle_files(RarFile(archive_stream), language, video, link, fps, num_cds)
|
||||||
elif is_zipfile(archive_stream):
|
elif is_zipfile(archive_stream):
|
||||||
return self.process_archive_subtitle_files(ZipFile(archive_stream), language, video, link, fps, num_cds)
|
return self.process_archive_subtitle_files(ZipFile(archive_stream), language, video, link, fps, num_cds)
|
||||||
else:
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
logger.error('Ignore unsupported archive %r', request.headers)
|
logger.error('Ignore unsupported archive %r', request.headers)
|
||||||
region.delete(cache_key)
|
region.delete(cache_key)
|
||||||
return []
|
return []
|
||||||
|
|
|
@ -55,7 +55,12 @@ class SubsUnacsSubtitle(Subtitle):
|
||||||
self.video = video
|
self.video = video
|
||||||
self.fps = fps
|
self.fps = fps
|
||||||
self.num_cds = num_cds
|
self.num_cds = num_cds
|
||||||
self.release_info = os.path.splitext(filename)[0]
|
self.release_info = filename
|
||||||
|
if fps:
|
||||||
|
if video.fps and float(video.fps) == fps:
|
||||||
|
self.release_info += " <b>[{:.3f}]</b>".format(fps)
|
||||||
|
else:
|
||||||
|
self.release_info += " [{:.3f}]".format(fps)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def id(self):
|
def id(self):
|
||||||
|
@ -168,7 +173,7 @@ class SubsUnacsProvider(Provider):
|
||||||
element = a_element_wrapper.find('a', {'class': 'tooltip'})
|
element = a_element_wrapper.find('a', {'class': 'tooltip'})
|
||||||
if element:
|
if element:
|
||||||
link = element.get('href')
|
link = element.get('href')
|
||||||
notes = element.get('title')
|
notes = re.sub(r'(<img.*)(src=")(/)(.*.jpg">)', r"", element.get('title'))
|
||||||
title = element.get_text()
|
title = element.get_text()
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
@ -230,11 +235,8 @@ class SubsUnacsProvider(Provider):
|
||||||
|
|
||||||
is_7zip = isinstance(archiveStream, SevenZipFile)
|
is_7zip = isinstance(archiveStream, SevenZipFile)
|
||||||
if is_7zip:
|
if is_7zip:
|
||||||
try:
|
|
||||||
file_content = archiveStream.readall()
|
file_content = archiveStream.readall()
|
||||||
file_list = sorted(file_content)
|
file_list = sorted(file_content)
|
||||||
except:
|
|
||||||
return []
|
|
||||||
else:
|
else:
|
||||||
file_list = sorted(archiveStream.namelist())
|
file_list = sorted(archiveStream.namelist())
|
||||||
|
|
||||||
|
@ -268,6 +270,7 @@ class SubsUnacsProvider(Provider):
|
||||||
else:
|
else:
|
||||||
logger.info('Cache file: %s', codecs.encode(cache_key, 'hex_codec').decode('utf-8'))
|
logger.info('Cache file: %s', codecs.encode(cache_key, 'hex_codec').decode('utf-8'))
|
||||||
|
|
||||||
|
try:
|
||||||
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, link, fps, num_cds)
|
return self.process_archive_subtitle_files(RarFile(archive_stream), language, video, link, fps, num_cds)
|
||||||
|
@ -275,7 +278,9 @@ class SubsUnacsProvider(Provider):
|
||||||
return self.process_archive_subtitle_files(ZipFile(archive_stream), language, video, link, fps, num_cds)
|
return self.process_archive_subtitle_files(ZipFile(archive_stream), language, video, link, fps, num_cds)
|
||||||
elif archive_stream.seek(0) == 0 and is_7zfile(archive_stream):
|
elif archive_stream.seek(0) == 0 and is_7zfile(archive_stream):
|
||||||
return self.process_archive_subtitle_files(SevenZipFile(archive_stream), language, video, link, fps, num_cds)
|
return self.process_archive_subtitle_files(SevenZipFile(archive_stream), language, video, link, fps, num_cds)
|
||||||
else:
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
logger.error('Ignore unsupported archive %r', request.headers)
|
logger.error('Ignore unsupported archive %r', request.headers)
|
||||||
region.delete(cache_key)
|
region.delete(cache_key)
|
||||||
return []
|
return []
|
||||||
|
|
|
@ -37,7 +37,12 @@ class YavkaNetSubtitle(Subtitle):
|
||||||
self.type = type
|
self.type = type
|
||||||
self.video = video
|
self.video = video
|
||||||
self.fps = fps
|
self.fps = fps
|
||||||
self.release_info = os.path.splitext(filename)[0]
|
self.release_info = filename
|
||||||
|
if fps:
|
||||||
|
if video.fps and float(video.fps) == fps:
|
||||||
|
self.release_info += " <b>[{:.3f}]</b>".format(fps)
|
||||||
|
else:
|
||||||
|
self.release_info += " [{:.3f}]".format(fps)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def id(self):
|
def id(self):
|
||||||
|
@ -141,7 +146,7 @@ class YavkaNetProvider(Provider):
|
||||||
element = row.find('a', {'class': 'selector'})
|
element = row.find('a', {'class': 'selector'})
|
||||||
if element:
|
if element:
|
||||||
link = element.get('href')
|
link = element.get('href')
|
||||||
notes = element.get('content')
|
notes = re.sub(r'(?s)<p.*><img [A-z0-9=\'/\. :;#]*>(.*)</p>', r"\1", element.get('content'))
|
||||||
title = element.get_text()
|
title = element.get_text()
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
@ -205,12 +210,15 @@ class YavkaNetProvider(Provider):
|
||||||
else:
|
else:
|
||||||
logger.info('Cache file: %s', codecs.encode(cache_key, 'hex_codec').decode('utf-8'))
|
logger.info('Cache file: %s', codecs.encode(cache_key, 'hex_codec').decode('utf-8'))
|
||||||
|
|
||||||
|
try:
|
||||||
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, link, fps)
|
return self.process_archive_subtitle_files(RarFile(archive_stream), language, video, link, fps)
|
||||||
elif is_zipfile(archive_stream):
|
elif is_zipfile(archive_stream):
|
||||||
return self.process_archive_subtitle_files(ZipFile(archive_stream), language, video, link, fps)
|
return self.process_archive_subtitle_files(ZipFile(archive_stream), language, video, link, fps)
|
||||||
else:
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
logger.error('Ignore unsupported archive %r', request.headers)
|
logger.error('Ignore unsupported archive %r', request.headers)
|
||||||
region.delete(cache_key)
|
region.delete(cache_key)
|
||||||
return []
|
return []
|
||||||
|
|
Loading…
Reference in New Issue