From ac36118d57ac00ad317a197ea13bd37d367a9ddf Mon Sep 17 00:00:00 2001 From: kramo Date: Tue, 26 Sep 2023 19:54:36 +0200 Subject: [PATCH] Cleanups --- src/importer/{sources => }/bottles_source.py | 4 ++-- src/importer/{sources => }/desktop_source.py | 2 +- src/importer/{sources => }/flatpak_source.py | 4 ++-- src/importer/{sources => }/heroic_source.py | 4 ++-- src/importer/importer.py | 4 ++-- src/importer/{sources => }/itch_source.py | 4 ++-- .../{sources => }/legendary_source.py | 4 ++-- src/importer/{sources => }/location.py | 0 src/importer/{sources => }/lutris_source.py | 4 ++-- .../{sources => }/retroarch_source.py | 10 +++------- src/importer/{sources => }/source.py | 2 +- src/importer/{sources => }/steam_source.py | 4 ++-- src/main.py | 20 +++++++++---------- src/preferences.py | 20 +++++++++---------- 14 files changed, 40 insertions(+), 46 deletions(-) rename src/importer/{sources => }/bottles_source.py (96%) rename src/importer/{sources => }/desktop_source.py (99%) rename src/importer/{sources => }/flatpak_source.py (96%) rename src/importer/{sources => }/heroic_source.py (99%) rename src/importer/{sources => }/itch_source.py (95%) rename src/importer/{sources => }/legendary_source.py (97%) rename src/importer/{sources => }/location.py (100%) rename src/importer/{sources => }/lutris_source.py (96%) rename src/importer/{sources => }/retroarch_source.py (97%) rename src/importer/{sources => }/source.py (98%) rename src/importer/{sources => }/steam_source.py (97%) diff --git a/src/importer/sources/bottles_source.py b/src/importer/bottles_source.py similarity index 96% rename from src/importer/sources/bottles_source.py rename to src/importer/bottles_source.py index be33f6a..2c9c618 100644 --- a/src/importer/sources/bottles_source.py +++ b/src/importer/bottles_source.py @@ -25,8 +25,8 @@ import yaml from src import shared from src.game import Game -from src.importer.sources.location import Location, LocationSubPath -from src.importer.sources.source import SourceIterable, URLExecutableSource +from src.importer.location import Location, LocationSubPath +from src.importer.source import SourceIterable, URLExecutableSource class BottlesSourceIterable(SourceIterable): diff --git a/src/importer/sources/desktop_source.py b/src/importer/desktop_source.py similarity index 99% rename from src/importer/sources/desktop_source.py rename to src/importer/desktop_source.py index 99b12c9..11e6099 100644 --- a/src/importer/sources/desktop_source.py +++ b/src/importer/desktop_source.py @@ -27,7 +27,7 @@ from gi.repository import GLib, Gtk from src import shared from src.game import Game -from src.importer.sources.source import Source, SourceIterable +from src.importer.source import Source, SourceIterable class DesktopSourceIterable(SourceIterable): diff --git a/src/importer/sources/flatpak_source.py b/src/importer/flatpak_source.py similarity index 96% rename from src/importer/sources/flatpak_source.py rename to src/importer/flatpak_source.py index de5583d..aea3505 100644 --- a/src/importer/sources/flatpak_source.py +++ b/src/importer/flatpak_source.py @@ -24,8 +24,8 @@ from gi.repository import GLib, Gtk from src import shared from src.game import Game -from src.importer.sources.location import Location, LocationSubPath -from src.importer.sources.source import ExecutableFormatSource, SourceIterable +from src.importer.location import Location, LocationSubPath +from src.importer.source import ExecutableFormatSource, SourceIterable class FlatpakSourceIterable(SourceIterable): diff --git a/src/importer/sources/heroic_source.py b/src/importer/heroic_source.py similarity index 99% rename from src/importer/sources/heroic_source.py rename to src/importer/heroic_source.py index eefa1ea..6792bc8 100644 --- a/src/importer/sources/heroic_source.py +++ b/src/importer/heroic_source.py @@ -29,8 +29,8 @@ from typing import Iterable, NamedTuple, Optional, TypedDict from src import shared from src.game import Game -from src.importer.sources.location import Location, LocationSubPath -from src.importer.sources.source import ( +from src.importer.location import Location, LocationSubPath +from src.importer.source import ( SourceIterable, SourceIterationResult, URLExecutableSource, diff --git a/src/importer/importer.py b/src/importer/importer.py index 8db2d8d..4bb6e63 100644 --- a/src/importer/importer.py +++ b/src/importer/importer.py @@ -28,8 +28,8 @@ from src import shared from src.errors.error_producer import ErrorProducer from src.errors.friendly_error import FriendlyError from src.game import Game -from src.importer.sources.location import UnresolvableLocationError -from src.importer.sources.source import Source +from src.importer.location import UnresolvableLocationError +from src.importer.source import Source from src.store.managers.async_manager import AsyncManager from src.store.pipeline import Pipeline diff --git a/src/importer/sources/itch_source.py b/src/importer/itch_source.py similarity index 95% rename from src/importer/sources/itch_source.py rename to src/importer/itch_source.py index aa59803..d2de56a 100644 --- a/src/importer/sources/itch_source.py +++ b/src/importer/itch_source.py @@ -24,8 +24,8 @@ from typing import NamedTuple from src import shared from src.game import Game -from src.importer.sources.location import Location, LocationSubPath -from src.importer.sources.source import SourceIterable, URLExecutableSource +from src.importer.location import Location, LocationSubPath +from src.importer.source import SourceIterable, URLExecutableSource from src.utils.sqlite import copy_db diff --git a/src/importer/sources/legendary_source.py b/src/importer/legendary_source.py similarity index 97% rename from src/importer/sources/legendary_source.py rename to src/importer/legendary_source.py index 8a6dae0..a4bc222 100644 --- a/src/importer/sources/legendary_source.py +++ b/src/importer/legendary_source.py @@ -24,8 +24,8 @@ from typing import NamedTuple from src import shared from src.game import Game -from src.importer.sources.location import Location, LocationSubPath -from src.importer.sources.source import ( +from src.importer.location import Location, LocationSubPath +from src.importer.source import ( ExecutableFormatSource, SourceIterable, SourceIterationResult, diff --git a/src/importer/sources/location.py b/src/importer/location.py similarity index 100% rename from src/importer/sources/location.py rename to src/importer/location.py diff --git a/src/importer/sources/lutris_source.py b/src/importer/lutris_source.py similarity index 96% rename from src/importer/sources/lutris_source.py rename to src/importer/lutris_source.py index 63d9df5..3197af2 100644 --- a/src/importer/sources/lutris_source.py +++ b/src/importer/lutris_source.py @@ -23,8 +23,8 @@ from typing import NamedTuple from src import shared from src.game import Game -from src.importer.sources.location import Location, LocationSubPath -from src.importer.sources.source import SourceIterable, URLExecutableSource +from src.importer.location import Location, LocationSubPath +from src.importer.source import SourceIterable, URLExecutableSource from src.utils.sqlite import copy_db diff --git a/src/importer/sources/retroarch_source.py b/src/importer/retroarch_source.py similarity index 97% rename from src/importer/sources/retroarch_source.py rename to src/importer/retroarch_source.py index 44d6f56..955a1dc 100644 --- a/src/importer/sources/retroarch_source.py +++ b/src/importer/retroarch_source.py @@ -29,13 +29,9 @@ from typing import NamedTuple from src import shared from src.errors.friendly_error import FriendlyError from src.game import Game -from src.importer.sources.location import ( - Location, - LocationSubPath, - UnresolvableLocationError, -) -from src.importer.sources.source import Source, SourceIterable -from src.importer.sources.steam_source import SteamSource +from src.importer.location import Location, LocationSubPath, UnresolvableLocationError +from src.importer.source import Source, SourceIterable +from src.importer.steam_source import SteamSource class RetroarchSourceIterable(SourceIterable): diff --git a/src/importer/sources/source.py b/src/importer/source.py similarity index 98% rename from src/importer/sources/source.py rename to src/importer/source.py index c1c0522..6f0003d 100644 --- a/src/importer/sources/source.py +++ b/src/importer/source.py @@ -23,7 +23,7 @@ from collections.abc import Iterable from typing import Any, Collection, Generator, Optional from src.game import Game -from src.importer.sources.location import Location +from src.importer.location import Location # Type of the data returned by iterating on a Source SourceIterationResult = Optional[Game | tuple[Game, tuple[Any]]] diff --git a/src/importer/sources/steam_source.py b/src/importer/steam_source.py similarity index 97% rename from src/importer/sources/steam_source.py rename to src/importer/steam_source.py index 6d7dec1..fa53937 100644 --- a/src/importer/sources/steam_source.py +++ b/src/importer/steam_source.py @@ -25,8 +25,8 @@ from typing import Iterable, NamedTuple from src import shared from src.game import Game -from src.importer.sources.location import Location, LocationSubPath -from src.importer.sources.source import SourceIterable, URLExecutableSource +from src.importer.location import Location, LocationSubPath +from src.importer.source import SourceIterable, URLExecutableSource from src.utils.steam import SteamFileHelper, SteamInvalidManifestError diff --git a/src/main.py b/src/main.py index fa3043b..5b379db 100644 --- a/src/main.py +++ b/src/main.py @@ -20,8 +20,6 @@ import json import lzma import os -import shlex -import subprocess import sys from typing import Any, Optional @@ -36,16 +34,16 @@ from gi.repository import Adw, Gio, GLib, Gtk from src import shared from src.details_window import DetailsWindow from src.game import Game +from src.importer.bottles_source import BottlesSource +from src.importer.desktop_source import DesktopSource +from src.importer.flatpak_source import FlatpakSource +from src.importer.heroic_source import HeroicSource from src.importer.importer import Importer -from src.importer.sources.bottles_source import BottlesSource -from src.importer.sources.desktop_source import DesktopSource -from src.importer.sources.flatpak_source import FlatpakSource -from src.importer.sources.heroic_source import HeroicSource -from src.importer.sources.itch_source import ItchSource -from src.importer.sources.legendary_source import LegendarySource -from src.importer.sources.lutris_source import LutrisSource -from src.importer.sources.retroarch_source import RetroarchSource -from src.importer.sources.steam_source import SteamSource +from src.importer.itch_source import ItchSource +from src.importer.legendary_source import LegendarySource +from src.importer.lutris_source import LutrisSource +from src.importer.retroarch_source import RetroarchSource +from src.importer.steam_source import SteamSource from src.logging.setup import log_system_info, setup_logging from src.preferences import PreferencesWindow from src.store.managers.cover_manager import CoverManager diff --git a/src/preferences.py b/src/preferences.py index 73f201b..bc61ec2 100644 --- a/src/preferences.py +++ b/src/preferences.py @@ -28,16 +28,16 @@ from gi.repository import Adw, Gio, GLib, Gtk from src import shared from src.errors.friendly_error import FriendlyError from src.game import Game -from src.importer.sources.bottles_source import BottlesSource -from src.importer.sources.flatpak_source import FlatpakSource -from src.importer.sources.heroic_source import HeroicSource -from src.importer.sources.itch_source import ItchSource -from src.importer.sources.legendary_source import LegendarySource -from src.importer.sources.location import UnresolvableLocationError -from src.importer.sources.lutris_source import LutrisSource -from src.importer.sources.retroarch_source import RetroarchSource -from src.importer.sources.source import Source -from src.importer.sources.steam_source import SteamSource +from src.importer.bottles_source import BottlesSource +from src.importer.flatpak_source import FlatpakSource +from src.importer.heroic_source import HeroicSource +from src.importer.itch_source import ItchSource +from src.importer.legendary_source import LegendarySource +from src.importer.location import UnresolvableLocationError +from src.importer.lutris_source import LutrisSource +from src.importer.retroarch_source import RetroarchSource +from src.importer.source import Source +from src.importer.steam_source import SteamSource from src.store.managers.sgdb_manager import SgdbManager from src.utils.create_dialog import create_dialog