From 3ec850760de168bac96b4dcf770ee5bcb62aec1f Mon Sep 17 00:00:00 2001 From: Jesse Bannon Date: Mon, 20 Feb 2023 13:04:02 -0800 Subject: [PATCH] [BACKEND] File lock directory config parameter --- src/ytdl_sub/cli/main.py | 2 +- src/ytdl_sub/config/config_validator.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ytdl_sub/cli/main.py b/src/ytdl_sub/cli/main.py index 5195ac5a..f38dbe93 100644 --- a/src/ytdl_sub/cli/main.py +++ b/src/ytdl_sub/cli/main.py @@ -134,7 +134,7 @@ def _working_directory_lock(config: ConfigFile): working_directory_path = Path(os.getcwd()) / config.config_options.working_directory lock_file_path = ( Path(os.getcwd()) - / config.config_options.flock_directory + / config.config_options.lock_directory / str(working_directory_path).replace("/", "_") ) diff --git a/src/ytdl_sub/config/config_validator.py b/src/ytdl_sub/config/config_validator.py index 8eda224a..88b13dac 100644 --- a/src/ytdl_sub/config/config_validator.py +++ b/src/ytdl_sub/config/config_validator.py @@ -12,7 +12,7 @@ from ytdl_sub.validators.validators import StringValidator class ConfigOptions(StrictDictValidator): _required_keys = {"working_directory"} - _optional_keys = {"umask", "dl_aliases", "flock_directory"} + _optional_keys = {"umask", "dl_aliases", "lock_directory"} def __init__(self, name: str, value: Any): super().__init__(name, value) @@ -26,8 +26,8 @@ class ConfigOptions(StrictDictValidator): self._dl_aliases = self._validate_key_if_present( key="dl_aliases", validator=LiteralDictValidator ) - self._flock_directory = self._validate_key( - key="flock_directory", validator=StringValidator, default="/tmp" + self._lock_directory = self._validate_key( + key="lock_directory", validator=StringValidator, default="/tmp" ) @property @@ -74,13 +74,13 @@ class ConfigOptions(StrictDictValidator): return {} @property - def flock_directory(self) -> str: + def lock_directory(self) -> str: """ Optional. The directory to temporarily store file locks, which prevents multiple instances of ``ytdl-sub`` from running. Note that file locks do not work on network-mounted directories. Ensure that this directory resides on the host machine. Defaults to ``/tmp``. """ - return self._flock_directory.value + return self._lock_directory.value class ConfigValidator(StrictDictValidator):