From 4542c316fa7b30b60cca12cad129a7e33bd09377 Mon Sep 17 00:00:00 2001 From: Jesse Bannon Date: Wed, 14 Sep 2022 13:11:42 -0700 Subject: [PATCH] remove dead code --- src/ytdl_sub/entries/base_entry.py | 3 --- src/ytdl_sub/entries/soundcloud.py | 2 -- src/ytdl_sub/entries/youtube.py | 2 -- src/ytdl_sub/plugins/music_tags.py | 6 ------ src/ytdl_sub/plugins/subtitles.py | 9 -------- src/ytdl_sub/validators/validators.py | 21 ------------------- .../enhanced_download_archive.py | 13 ------------ 7 files changed, 56 deletions(-) diff --git a/src/ytdl_sub/entries/base_entry.py b/src/ytdl_sub/entries/base_entry.py index ad223bf0..e86cf2f6 100644 --- a/src/ytdl_sub/entries/base_entry.py +++ b/src/ytdl_sub/entries/base_entry.py @@ -88,9 +88,6 @@ class BaseEntry(BaseEntryVariables, ABC): Abstract entry object to represent anything download from ytdl (playlist metadata, media, etc). """ - # The ytdl extractor type that the entry represents - entry_extractor: str - def __init__(self, entry_dict: Dict, working_directory: str): """ Initialize the entry using ytdl metadata diff --git a/src/ytdl_sub/entries/soundcloud.py b/src/ytdl_sub/entries/soundcloud.py index 475c63b1..1ab9f74b 100644 --- a/src/ytdl_sub/entries/soundcloud.py +++ b/src/ytdl_sub/entries/soundcloud.py @@ -9,5 +9,3 @@ class SoundcloudTrack(SoundcloudVariables, Entry): Entry object to represent a Soundcloud track yt-dlp that is a single, which implies it does not belong to an album. """ - - entry_extractor = "soundcloud" diff --git a/src/ytdl_sub/entries/youtube.py b/src/ytdl_sub/entries/youtube.py index 6f5dece2..1bfa8513 100644 --- a/src/ytdl_sub/entries/youtube.py +++ b/src/ytdl_sub/entries/youtube.py @@ -10,8 +10,6 @@ class YoutubeVideo(YoutubeVideoVariables, Entry): Entry object to represent a Youtube video. Reserved for shared Youtube entry logic. """ - entry_extractor = "youtube" - @property def ext(self) -> str: """ diff --git a/src/ytdl_sub/plugins/music_tags.py b/src/ytdl_sub/plugins/music_tags.py index 040e2ceb..8b4b3480 100644 --- a/src/ytdl_sub/plugins/music_tags.py +++ b/src/ytdl_sub/plugins/music_tags.py @@ -7,7 +7,6 @@ from ytdl_sub.plugins.plugin import Plugin from ytdl_sub.plugins.plugin import PluginOptions from ytdl_sub.utils.file_handler import FileMetadata from ytdl_sub.validators.string_formatter_validators import DictFormatterValidator -from ytdl_sub.validators.validators import StringValidator class MusicTagsOptions(PluginOptions): @@ -34,17 +33,12 @@ class MusicTagsOptions(PluginOptions): """ _required_keys = {"tags"} - _optional_keys = {"multi_value_separator"} def __init__(self, name, value): super().__init__(name, value) self._tags = self._validate_key(key="tags", validator=DictFormatterValidator) - self.multi_value_separator = self._validate_key_if_present( - key="multi_value_separator", validator=StringValidator - ) - @property def tags(self) -> DictFormatterValidator: """ diff --git a/src/ytdl_sub/plugins/subtitles.py b/src/ytdl_sub/plugins/subtitles.py index f70a4f7a..de98f888 100644 --- a/src/ytdl_sub/plugins/subtitles.py +++ b/src/ytdl_sub/plugins/subtitles.py @@ -1,4 +1,3 @@ -from pathlib import Path from typing import Dict from typing import List from typing import Optional @@ -21,14 +20,6 @@ SUBTITLE_EXTENSIONS: Set[str] = {"srt", "vtt", "ass", "lrc"} logger = Logger.get(name="subtitles") -def _is_entry_subtitle_file(path: Path, entry: Entry) -> bool: - if path.is_file() and path.name.startswith(entry.uid): - for ext in SUBTITLE_EXTENSIONS: - if path.name.endswith(f".{ext}"): - return True - return False - - class SubtitlesTypeValidator(StringSelectValidator): _expected_value_type_name = "subtitles type" _select_values = SUBTITLE_EXTENSIONS diff --git a/src/ytdl_sub/validators/validators.py b/src/ytdl_sub/validators/validators.py index 694ed6c7..e2235587 100644 --- a/src/ytdl_sub/validators/validators.py +++ b/src/ytdl_sub/validators/validators.py @@ -244,24 +244,3 @@ class LiteralDictValidator(DictValidator): def keys(self) -> List[str]: """Returns a sorted list of the dict's keys""" return super()._keys - - -class UniformDictValidator(DictValidator, Generic[ValidatorT], ABC): - """DictValidator where all values have the same validator""" - - uniform_validator_class: Type[ValidatorT] - - def __init__(self, name, value): - super().__init__(name, value) - - for key in self._keys: - _ = self._validate_key_if_present(key=key, validator=self.uniform_validator_class) - - @property - def validator_dict(self) -> Dict[str, ValidatorT]: - """ - Returns - ------- - Dict of name: validator - """ - return self._validator_dict diff --git a/src/ytdl_sub/ytdl_additions/enhanced_download_archive.py b/src/ytdl_sub/ytdl_additions/enhanced_download_archive.py index 24d0ef84..97b20247 100644 --- a/src/ytdl_sub/ytdl_additions/enhanced_download_archive.py +++ b/src/ytdl_sub/ytdl_additions/enhanced_download_archive.py @@ -123,19 +123,6 @@ class DownloadArchive: file.write(f"{line}\n") return self - def contains(self, entry_id: str) -> bool: - """ - Parameters - ---------- - entry_id - Id of the entry - - Returns - ------- - True if the entry id is within this download archive. False otherwise. - """ - return any(entry_id in line for line in self._download_archive_lines) - def remove_entry(self, entry_id: str) -> "DownloadArchive": """ Parameters