From 1ff34630ac8432bcd62a9172890060399bc9194a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=20Midb=C3=B8e?= Date: Sun, 16 Sep 2018 23:05:09 +0200 Subject: [PATCH] Renamed subtitle_languages to subtitles to save the subtitles and not only the subtitle languages available. --- src/core.py | 4 ++-- src/video.py | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/core.py b/src/core.py index e37917b..ca8856e 100755 --- a/src/core.py +++ b/src/core.py @@ -239,7 +239,7 @@ def scan_folder(path): logging.exception('Unexpected error while collecting non-existing path %s', 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) videos.append(video) @@ -256,7 +256,7 @@ def scan_folder(path): # Iterates over our scanned videos with click.progressbar(scanned_videos, label='Parsing videos') as 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) videos.append(v) diff --git a/src/video.py b/src/video.py index d0c09e3..edfb777 100644 --- a/src/video.py +++ b/src/video.py @@ -30,10 +30,10 @@ class Video(object): :param str imdb_id: IMDb id of the video. :param dict name_hash: hashes of the video file by provider names. :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, - imdb_id=None, subtitle_languages=None): + imdb_id=None, subtitles=None): #: Name or path of the video self.name = name @@ -62,7 +62,7 @@ class Video(object): self.imdb_id = imdb_id #: Existing subtitle languages - self.subtitle_languages = subtitle_languages or set() + self.subtitles = subtitles or set() @property def exists(self): @@ -168,12 +168,11 @@ class Episode(Video): def __repr__(self): if self.year is None: return '<%s [%r, %dx%s]>' % (self.__class__.__name__, self.series, self.season, self.episode) - if self.subtitle_languages is not None: - return '<%s [%r, %dx%s] %s>' % (self.__class__.__name__, self.series, self.season, self.episode, self.subtitle_languages) + if self.subtitles is not None: + 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) - class Movie(Video): """Movie :class:`Video`. :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, %d]>' % (self.__class__.__name__, self.title, self.year) + ''' class Episode(): """Episode :class:`Video`.