KevinMidboe/seasonedParser
1
0
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases 1 Wiki Activity

Renamed subtitle_languages to subtitles to save the subtitles and not only the subtitle languages available.

Browse Source
This commit is contained in:
Kevin
2018-09-16 23:05:09 +02:00
parent 2108f2f25a
commit 1ff34630ac
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core.py
View File

@@ -239,7 +239,7 @@ def scan_folder(path):
logging.exception('Unexpected error while collecting non-existing path %s', path) logging.exception('Unexpected error while collecting non-existing path %s', path)
errored_paths.append(path) errored_paths.append(path)
video.subtitle_languages |= set(search_external_subtitles(video.name, directory=path).values()) video.subtitles |= set(search_external_subtitles(video.name, directory=path))
refine(video) refine(video)
videos.append(video) videos.append(video)
@@ -256,7 +256,7 @@ def scan_folder(path):
# Iterates over our scanned videos # Iterates over our scanned videos
with click.progressbar(scanned_videos, label='Parsing videos') as bar: with click.progressbar(scanned_videos, label='Parsing videos') as bar:
for v in bar: for v in bar:
v.subtitle_languages |= set(search_external_subtitles(v.name).values()) v.subtitles |= set(search_external_subtitles(v.name))
refine(v) refine(v)
videos.append(v) videos.append(v)

12
src/video.py
View File

@@ -30,10 +30,10 @@ class Video(object):
:param str imdb_id: IMDb id of the video. :param str imdb_id: IMDb id of the video.
:param dict name_hash: hashes of the video file by provider names. :param dict name_hash: hashes of the video file by provider names.
:param int size: size of the video file in bytes. :param int size: size of the video file in bytes.
:param set subtitle_languages: existing subtitle languages. :param set subtitles: existing subtitle languages.
""" """
def __init__(self, name, hash=None, size=None, format=None, release_group=None, resolution=None, video_codec=None, audio_codec=None, def __init__(self, name, hash=None, size=None, format=None, release_group=None, resolution=None, video_codec=None, audio_codec=None,
imdb_id=None, subtitle_languages=None): imdb_id=None, subtitles=None):
#: Name or path of the video #: Name or path of the video
self.name = name self.name = name
@@ -62,7 +62,7 @@ class Video(object):
self.imdb_id = imdb_id self.imdb_id = imdb_id
#: Existing subtitle languages #: Existing subtitle languages
self.subtitle_languages = subtitle_languages or set() self.subtitles = subtitles or set()
@property @property
def exists(self): def exists(self):
@@ -168,12 +168,11 @@ class Episode(Video):
def __repr__(self): def __repr__(self):
if self.year is None: if self.year is None:
return '<%s [%r, %dx%s]>' % (self.__class__.__name__, self.series, self.season, self.episode) return '<%s [%r, %dx%s]>' % (self.__class__.__name__, self.series, self.season, self.episode)
if self.subtitle_languages is not None: if self.subtitles is not None:
return '<%s [%r, %dx%s] %s>' % (self.__class__.__name__, self.series, self.season, self.episode, self.subtitle_languages) return '<%s [%r, %dx%s] %s>' % (self.__class__.__name__, self.series, self.season, self.episode, self.subtitles)
return '<%s [%r, %d, %dx%d]>' % (self.__class__.__name__, self.series, self.year, self.season, self.episode) return '<%s [%r, %d, %dx%d]>' % (self.__class__.__name__, self.series, self.year, self.season, self.episode)
class Movie(Video): class Movie(Video):
"""Movie :class:`Video`. """Movie :class:`Video`.
:param str title: title of the movie. :param str title: title of the movie.
@@ -210,6 +209,7 @@ class Movie(Video):
return '<%s [%r]>' % (self.__class__.__name__, self.title) return '<%s [%r]>' % (self.__class__.__name__, self.title)
return '<%s [%r, %d]>' % (self.__class__.__name__, self.title, self.year) return '<%s [%r, %d]>' % (self.__class__.__name__, self.title, self.year)
''' '''
class Episode(): class Episode():
"""Episode :class:`Video`. """Episode :class:`Video`.