From dcad32ade00bd29d4a5faa9f04c9b5c67cdd61ce Mon Sep 17 00:00:00 2001 From: Timmy Welch Date: Sat, 24 Feb 2024 19:55:28 -0800 Subject: [PATCH] Fix settngs generation --- build-tools/generate_settngs.py | 2 +- .../ctsettings/settngs_namespace.py | 26 ------------------- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/build-tools/generate_settngs.py b/build-tools/generate_settngs.py index 603fa86..8006f32 100644 --- a/build-tools/generate_settngs.py +++ b/build-tools/generate_settngs.py @@ -15,7 +15,7 @@ def generate() -> str: imports2, types2 = settngs.generate_ns(app.manager.definitions) i = imports.splitlines() i.extend(set(imports2.splitlines()) - set(i)) - return "\n\n".join((imports, types2, types)) + return "\n\n".join(("\n".join(i), types2, types)) if __name__ == "__main__": diff --git a/comictaggerlib/ctsettings/settngs_namespace.py b/comictaggerlib/ctsettings/settngs_namespace.py index 0decc75..3a3accf 100644 --- a/comictaggerlib/ctsettings/settngs_namespace.py +++ b/comictaggerlib/ctsettings/settngs_namespace.py @@ -1,6 +1,5 @@ from __future__ import annotations -import pathlib import typing import settngs @@ -108,17 +107,6 @@ class SettngsNS(settngs.TypedNS): Archive__rar: str - Source_gcd__gcd_key: typing.Any - Source_gcd__gcd_url: str - Source_gcd__gcd_use_series_start_as_volume: bool - Source_gcd__gcd_use_ongoing: bool - Source_gcd__gcd_prefer_story_titles: bool - Source_gcd__gcd_combine_notes: bool - Source_gcd__gcd_gui_covers: bool - Source_gcd__gcd_tag_covers: bool - Source_gcd__gcd_currency: str - Source_gcd__gcd_filepath: pathlib.Path - Source_comicvine__comicvine_key: str Source_comicvine__comicvine_url: str Source_comicvine__cv_use_series_start_as_volume: bool @@ -244,19 +232,6 @@ class Archive(typing.TypedDict): rar: str -class Source_gcd(typing.TypedDict): - gcd_key: typing.Any - gcd_url: str - gcd_use_series_start_as_volume: bool - gcd_use_ongoing: bool - gcd_prefer_story_titles: bool - gcd_combine_notes: bool - gcd_gui_covers: bool - gcd_tag_covers: bool - gcd_currency: str - gcd_filepath: pathlib.Path - - class Source_comicvine(typing.TypedDict): comicvine_key: str comicvine_url: str @@ -278,7 +253,6 @@ SettngsDict = typing.TypedDict( "General": General, "Dialog Flags": Dialog_Flags, "Archive": Archive, - "Source gcd": Source_gcd, "Source comicvine": Source_comicvine, }, )