From 345570f160b0ca5df83811c6c0f0b83f8d5c0e63 Mon Sep 17 00:00:00 2001 From: Jesse Bannon Date: Wed, 7 Sep 2022 11:00:54 -0700 Subject: [PATCH] lint --- src/ytdl_sub/utils/file_handler.py | 5 +++-- src/ytdl_sub/utils/xml.py | 3 ++- src/ytdl_sub/validators/nfo_validators.py | 18 +++++++++--------- .../validators/string_formatter_validators.py | 1 + 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/ytdl_sub/utils/file_handler.py b/src/ytdl_sub/utils/file_handler.py index 21388ad7..a125c701 100644 --- a/src/ytdl_sub/utils/file_handler.py +++ b/src/ytdl_sub/utils/file_handler.py @@ -8,6 +8,7 @@ from typing import List from typing import Optional from typing import Set from typing import Union + import yaml @@ -63,8 +64,8 @@ class FileMetadata: if sort_dict: value_dict = json.loads(json.dumps(value_dict, sort_keys=True)) - out = yaml.safe_dump(value_dict, allow_unicode=True, indent=2, default_style='', width=100) - return cls(metadata=out.rstrip().split('\n')) + out = yaml.safe_dump(value_dict, allow_unicode=True, indent=2, default_style="", width=100) + return cls(metadata=out.rstrip().split("\n")) class FileHandlerTransactionLog: diff --git a/src/ytdl_sub/utils/xml.py b/src/ytdl_sub/utils/xml.py index 3e7dbd63..1e5e3179 100644 --- a/src/ytdl_sub/utils/xml.py +++ b/src/ytdl_sub/utils/xml.py @@ -1,7 +1,8 @@ import xml.etree.ElementTree as et from dataclasses import dataclass -from typing import Any, List +from typing import Any from typing import Dict +from typing import List from typing import Union diff --git a/src/ytdl_sub/validators/nfo_validators.py b/src/ytdl_sub/validators/nfo_validators.py index 3b013553..b221970b 100644 --- a/src/ytdl_sub/validators/nfo_validators.py +++ b/src/ytdl_sub/validators/nfo_validators.py @@ -7,8 +7,9 @@ from typing import Type from typing import TypeVar from ytdl_sub.validators.strict_dict_validator import StrictDictValidator -from ytdl_sub.validators.string_formatter_validators import DictFormatterValidator, \ - ListFormatterValidator, ListOverridesFormatterValidator +from ytdl_sub.validators.string_formatter_validators import DictFormatterValidator +from ytdl_sub.validators.string_formatter_validators import ListFormatterValidator +from ytdl_sub.validators.string_formatter_validators import ListOverridesFormatterValidator from ytdl_sub.validators.string_formatter_validators import OverridesDictFormatterValidator from ytdl_sub.validators.string_formatter_validators import OverridesStringFormatterValidator from ytdl_sub.validators.string_formatter_validators import StringFormatterValidator @@ -84,20 +85,21 @@ class NfoOverrideTagsWithAttributesListValidator( ListValidator[NfoOverrideTagsWithAttributesValidator] ): """TagsWithAttributes list for the output directory NFO validator""" + _inner_list_type = NfoOverrideTagsWithAttributesValidator # Generic TagsWithAttribute to use for SharedNfoTagsValidator -TNfoTagsWithAttributesValidator = _NfoTagsWithAttributesValidator[TStringFormatterValidator, TDictFormatterValidator] +TNfoTagsWithAttributesValidator = _NfoTagsWithAttributesValidator[ + TStringFormatterValidator, TDictFormatterValidator +] # List validators TNfoTagsWithAttributesListValidator = ListValidator[TNfoTagsWithAttributesValidator] TNfoTagsListValidator = ListValidator[TStringFormatterValidator] -class SharedNfoTagsValidator( - DictValidator, ABC -): +class SharedNfoTagsValidator(DictValidator, ABC): _tags_validator: Type[TNfoTagsListValidator] _tags_with_attributes_validator: Type[TNfoTagsWithAttributesListValidator] @@ -121,9 +123,7 @@ class SharedNfoTagsValidator( ) elif isinstance(tag_value[0], dict): self._attribute_tags[key].extend( - self._validate_key( - key=key, validator=self._tags_with_attributes_validator - ).list + self._validate_key(key=key, validator=self._tags_with_attributes_validator).list ) else: raise self._validation_exception( diff --git a/src/ytdl_sub/validators/string_formatter_validators.py b/src/ytdl_sub/validators/string_formatter_validators.py index 2893c054..cd62b4a4 100644 --- a/src/ytdl_sub/validators/string_formatter_validators.py +++ b/src/ytdl_sub/validators/string_formatter_validators.py @@ -212,6 +212,7 @@ class ListFormatterValidator(ListValidator[StringFormatterValidator]): class ListOverridesFormatterValidator(ListValidator[StringFormatterValidator]): _inner_list_type = OverridesStringFormatterValidator + class DictFormatterValidator(LiteralDictValidator): """ A dict made up of