Extract Config.merge to ConfigMergeMixin
MODIFY
plextraktsync/config/Config.py
plextraktsync/config/Config.py
from dotenv import load_dotenv
from plextraktsync.config.ConfigLoader import ConfigLoader
+from plextraktsync.config.ConfigMergeMixin import ConfigMergeMixin
from plextraktsync.path import (cache_dir, config_file, config_yml,
default_config_file, env_file)
-class Config(dict):
+class Config(dict, ConfigMergeMixin):
env_keys = [
"PLEX_BASEURL",
"PLEX_FALLBACKURL", # legacy, used before 0.18.21
@@ -108,18 +109,6 @@ def initialize(self):
"$PTS_CACHE_DIR", cache_dir
)
- # https://stackoverflow.com/a/20666342/2314626
- def merge(self, source, destination):
- for key, value in source.items():
- if isinstance(value, dict):
- # get node or create one
- node = destination.setdefault(key, {})
- self.merge(value, node)
- else:
- destination[key] = value
-
- return destination
-
def dump(self, print=None):
"""
Print config serialized as yaml.

Extract Config.merge to ConfigMergeMixin