From fede94e9737a85af90a68cccf3d0852b90e3253c Mon Sep 17 00:00:00 2001 From: dmunozv04 <39565245+dmunozv04@users.noreply.github.com> Date: Thu, 7 Dec 2023 14:26:14 +0100 Subject: [PATCH] ensures data_dir isn't saved to disk --- src/iSponsorBlockTV/constants.py | 3 +++ src/iSponsorBlockTV/helpers.py | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/iSponsorBlockTV/constants.py b/src/iSponsorBlockTV/constants.py index 29117db..a8d05e3 100644 --- a/src/iSponsorBlockTV/constants.py +++ b/src/iSponsorBlockTV/constants.py @@ -19,3 +19,6 @@ skip_categories = ( ) youtube_client_blacklist = ["TVHTML5_FOR_KIDS"] + + +config_file_blacklist_keys = ["config_file", "data_dir"] diff --git a/src/iSponsorBlockTV/helpers.py b/src/iSponsorBlockTV/helpers.py index 713acaa..eb3ffe7 100644 --- a/src/iSponsorBlockTV/helpers.py +++ b/src/iSponsorBlockTV/helpers.py @@ -8,6 +8,7 @@ import time from appdirs import user_data_dir from . import config_setup, main, setup_wizard +from .constants import config_file_blacklist_keys class Device: @@ -68,7 +69,8 @@ class Config: with open(self.config_file, "r") as f: config = json.load(f) for i in config: - setattr(self, i, config[i]) + if i not in config_file_blacklist_keys: + setattr(self, i, config[i]) except FileNotFoundError: print("Could not load config file") # Create data directory if it doesn't exist (if we're not running in docker) @@ -93,9 +95,12 @@ class Config: config_dict = self.__dict__ # Don't save the config file name config_file = self.config_file + data_dir = self.data_dir del config_dict["config_file"] + del config_dict["data_dir"] json.dump(config_dict, f, indent=4) self.config_file = config_file + self.data_dir = data_dir def __eq__(self, other): if isinstance(other, Config):