From 82e6c809338d98fcfb1216fdc7578c0521d89f64 Mon Sep 17 00:00:00 2001
From: jbannon <jbann1994@gmail.com>
Date: Tue, 12 Apr 2022 05:50:38 +0000
Subject: [PATCH] clean up requirements

---
 requirements.txt                                       | 10 +---------
 requirements_dev.txt                                   |  6 ++++++
 ytdl_subscribe/entries/entry.py                        |  4 ++--
 ytdl_subscribe/entries/soundcloud.py                   |  4 ++--
 ytdl_subscribe/subscriptions/subscription.py           |  2 +-
 .../validators/config/overrides/overrides_validator.py |  6 ++----
 6 files changed, 14 insertions(+), 18 deletions(-)
 create mode 100644 requirements_dev.txt

diff --git a/requirements.txt b/requirements.txt
index 4d0fc968..d06a60c3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,15 +1,7 @@
 argparse==1.4.0
-black==21.11b1
-coverage==6.3.2
 dicttoxml==1.7.4
-isort==5.10.1
-jsonschema==4.4.0
 mergedeep==1.3.4
 music-tag==0.4.3
-pathvalidate==2.4.1
 Pillow==8.3.2
-pylint==2.13.3
-pytest==7.1.1
-pyYAML==5.4.1
-sanitize-filename==1.2.0
+PyYAML==6.0
 yt-dlp==2022.4.8
\ No newline at end of file
diff --git a/requirements_dev.txt b/requirements_dev.txt
new file mode 100644
index 00000000..151e942d
--- /dev/null
+++ b/requirements_dev.txt
@@ -0,0 +1,6 @@
+-r requirements.txt
+black==21.11b1
+coverage==6.3.2
+isort==5.10.1
+pylint==2.13.3
+pytest==7.1.1
\ No newline at end of file
diff --git a/ytdl_subscribe/entries/entry.py b/ytdl_subscribe/entries/entry.py
index 0943126a..43a963f5 100644
--- a/ytdl_subscribe/entries/entry.py
+++ b/ytdl_subscribe/entries/entry.py
@@ -4,7 +4,7 @@ from typing import Any
 from typing import Dict
 from typing import Optional
 
-from sanitize_filename import sanitize
+from yt_dlp.utils import sanitize_filename
 
 
 @dataclass
@@ -80,7 +80,7 @@ class Entry(BaseEntry):
     @property
     def sanitized_title(self) -> str:
         """Returns the entry's sanitized title"""
-        return sanitize(self.title)
+        return sanitize_filename(self.title)
 
     @property
     def ext(self) -> str:
diff --git a/ytdl_subscribe/entries/soundcloud.py b/ytdl_subscribe/entries/soundcloud.py
index e3345464..889f3fb2 100644
--- a/ytdl_subscribe/entries/soundcloud.py
+++ b/ytdl_subscribe/entries/soundcloud.py
@@ -2,7 +2,7 @@ from typing import Dict
 from typing import List
 from typing import Optional
 
-from sanitize_filename import sanitize
+from yt_dlp.utils import sanitize_filename
 
 from ytdl_subscribe.entries.entry import Entry
 from ytdl_subscribe.entries.entry import PlaylistMetadata
@@ -32,7 +32,7 @@ class SoundcloudTrack(Entry):
     @property
     def sanitized_album(self) -> str:
         """Returns the entry's sanitized album name"""
-        return sanitize(self.album)
+        return sanitize_filename(self.album)
 
     @property
     def album_year(self) -> int:
diff --git a/ytdl_subscribe/subscriptions/subscription.py b/ytdl_subscribe/subscriptions/subscription.py
index 15f1aecc..7dfddeab 100644
--- a/ytdl_subscribe/subscriptions/subscription.py
+++ b/ytdl_subscribe/subscriptions/subscription.py
@@ -140,7 +140,7 @@ class Subscription(Generic[SourceT], ABC):
             ytdl_options = dict(ytdl_options, **source_ytdl_options)
 
         return downloader_type(
-            output_directory=self.working_directory,
+            working_directory=self.working_directory,
             ytdl_options=ytdl_options,
             download_archive_file_name=self._enhanced_download_archive.archive_file_name,
         )
diff --git a/ytdl_subscribe/validators/config/overrides/overrides_validator.py b/ytdl_subscribe/validators/config/overrides/overrides_validator.py
index 44e797ff..30ee0157 100644
--- a/ytdl_subscribe/validators/config/overrides/overrides_validator.py
+++ b/ytdl_subscribe/validators/config/overrides/overrides_validator.py
@@ -1,4 +1,4 @@
-import sanitize_filename
+from yt_dlp.utils import sanitize_filename
 
 from ytdl_subscribe.validators.base.string_formatter_validators import DictFormatterValidator
 from ytdl_subscribe.validators.base.string_formatter_validators import StringFormatterValidator
@@ -12,9 +12,7 @@ class OverridesValidator(DictFormatterValidator):
         for key in self._keys:
             sanitized_key_name = f"sanitized_{key}"
             # First, sanitize the format string
-            self._value[sanitized_key_name] = sanitize_filename.sanitize(
-                self._value[key].format_string
-            )
+            self._value[sanitized_key_name] = sanitize_filename(self._value[key].format_string)
 
             # Then, convert it into a StringFormatterValidator
             self._value[sanitized_key_name] = StringFormatterValidator(