Cleanups
This commit is contained in:
@@ -25,8 +25,8 @@ import yaml
|
|||||||
|
|
||||||
from src import shared
|
from src import shared
|
||||||
from src.game import Game
|
from src.game import Game
|
||||||
from src.importer.sources.location import Location, LocationSubPath
|
from src.importer.location import Location, LocationSubPath
|
||||||
from src.importer.sources.source import SourceIterable, URLExecutableSource
|
from src.importer.source import SourceIterable, URLExecutableSource
|
||||||
|
|
||||||
|
|
||||||
class BottlesSourceIterable(SourceIterable):
|
class BottlesSourceIterable(SourceIterable):
|
||||||
@@ -27,7 +27,7 @@ from gi.repository import GLib, Gtk
|
|||||||
|
|
||||||
from src import shared
|
from src import shared
|
||||||
from src.game import Game
|
from src.game import Game
|
||||||
from src.importer.sources.source import Source, SourceIterable
|
from src.importer.source import Source, SourceIterable
|
||||||
|
|
||||||
|
|
||||||
class DesktopSourceIterable(SourceIterable):
|
class DesktopSourceIterable(SourceIterable):
|
||||||
@@ -24,8 +24,8 @@ from gi.repository import GLib, Gtk
|
|||||||
|
|
||||||
from src import shared
|
from src import shared
|
||||||
from src.game import Game
|
from src.game import Game
|
||||||
from src.importer.sources.location import Location, LocationSubPath
|
from src.importer.location import Location, LocationSubPath
|
||||||
from src.importer.sources.source import ExecutableFormatSource, SourceIterable
|
from src.importer.source import ExecutableFormatSource, SourceIterable
|
||||||
|
|
||||||
|
|
||||||
class FlatpakSourceIterable(SourceIterable):
|
class FlatpakSourceIterable(SourceIterable):
|
||||||
@@ -29,8 +29,8 @@ from typing import Iterable, NamedTuple, Optional, TypedDict
|
|||||||
|
|
||||||
from src import shared
|
from src import shared
|
||||||
from src.game import Game
|
from src.game import Game
|
||||||
from src.importer.sources.location import Location, LocationSubPath
|
from src.importer.location import Location, LocationSubPath
|
||||||
from src.importer.sources.source import (
|
from src.importer.source import (
|
||||||
SourceIterable,
|
SourceIterable,
|
||||||
SourceIterationResult,
|
SourceIterationResult,
|
||||||
URLExecutableSource,
|
URLExecutableSource,
|
||||||
@@ -28,8 +28,8 @@ from src import shared
|
|||||||
from src.errors.error_producer import ErrorProducer
|
from src.errors.error_producer import ErrorProducer
|
||||||
from src.errors.friendly_error import FriendlyError
|
from src.errors.friendly_error import FriendlyError
|
||||||
from src.game import Game
|
from src.game import Game
|
||||||
from src.importer.sources.location import UnresolvableLocationError
|
from src.importer.location import UnresolvableLocationError
|
||||||
from src.importer.sources.source import Source
|
from src.importer.source import Source
|
||||||
from src.store.managers.async_manager import AsyncManager
|
from src.store.managers.async_manager import AsyncManager
|
||||||
from src.store.pipeline import Pipeline
|
from src.store.pipeline import Pipeline
|
||||||
|
|
||||||
|
|||||||
@@ -24,8 +24,8 @@ from typing import NamedTuple
|
|||||||
|
|
||||||
from src import shared
|
from src import shared
|
||||||
from src.game import Game
|
from src.game import Game
|
||||||
from src.importer.sources.location import Location, LocationSubPath
|
from src.importer.location import Location, LocationSubPath
|
||||||
from src.importer.sources.source import SourceIterable, URLExecutableSource
|
from src.importer.source import SourceIterable, URLExecutableSource
|
||||||
from src.utils.sqlite import copy_db
|
from src.utils.sqlite import copy_db
|
||||||
|
|
||||||
|
|
||||||
@@ -24,8 +24,8 @@ from typing import NamedTuple
|
|||||||
|
|
||||||
from src import shared
|
from src import shared
|
||||||
from src.game import Game
|
from src.game import Game
|
||||||
from src.importer.sources.location import Location, LocationSubPath
|
from src.importer.location import Location, LocationSubPath
|
||||||
from src.importer.sources.source import (
|
from src.importer.source import (
|
||||||
ExecutableFormatSource,
|
ExecutableFormatSource,
|
||||||
SourceIterable,
|
SourceIterable,
|
||||||
SourceIterationResult,
|
SourceIterationResult,
|
||||||
@@ -23,8 +23,8 @@ from typing import NamedTuple
|
|||||||
|
|
||||||
from src import shared
|
from src import shared
|
||||||
from src.game import Game
|
from src.game import Game
|
||||||
from src.importer.sources.location import Location, LocationSubPath
|
from src.importer.location import Location, LocationSubPath
|
||||||
from src.importer.sources.source import SourceIterable, URLExecutableSource
|
from src.importer.source import SourceIterable, URLExecutableSource
|
||||||
from src.utils.sqlite import copy_db
|
from src.utils.sqlite import copy_db
|
||||||
|
|
||||||
|
|
||||||
@@ -29,13 +29,9 @@ from typing import NamedTuple
|
|||||||
from src import shared
|
from src import shared
|
||||||
from src.errors.friendly_error import FriendlyError
|
from src.errors.friendly_error import FriendlyError
|
||||||
from src.game import Game
|
from src.game import Game
|
||||||
from src.importer.sources.location import (
|
from src.importer.location import Location, LocationSubPath, UnresolvableLocationError
|
||||||
Location,
|
from src.importer.source import Source, SourceIterable
|
||||||
LocationSubPath,
|
from src.importer.steam_source import SteamSource
|
||||||
UnresolvableLocationError,
|
|
||||||
)
|
|
||||||
from src.importer.sources.source import Source, SourceIterable
|
|
||||||
from src.importer.sources.steam_source import SteamSource
|
|
||||||
|
|
||||||
|
|
||||||
class RetroarchSourceIterable(SourceIterable):
|
class RetroarchSourceIterable(SourceIterable):
|
||||||
@@ -23,7 +23,7 @@ from collections.abc import Iterable
|
|||||||
from typing import Any, Collection, Generator, Optional
|
from typing import Any, Collection, Generator, Optional
|
||||||
|
|
||||||
from src.game import Game
|
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
|
# Type of the data returned by iterating on a Source
|
||||||
SourceIterationResult = Optional[Game | tuple[Game, tuple[Any]]]
|
SourceIterationResult = Optional[Game | tuple[Game, tuple[Any]]]
|
||||||
@@ -25,8 +25,8 @@ from typing import Iterable, NamedTuple
|
|||||||
|
|
||||||
from src import shared
|
from src import shared
|
||||||
from src.game import Game
|
from src.game import Game
|
||||||
from src.importer.sources.location import Location, LocationSubPath
|
from src.importer.location import Location, LocationSubPath
|
||||||
from src.importer.sources.source import SourceIterable, URLExecutableSource
|
from src.importer.source import SourceIterable, URLExecutableSource
|
||||||
from src.utils.steam import SteamFileHelper, SteamInvalidManifestError
|
from src.utils.steam import SteamFileHelper, SteamInvalidManifestError
|
||||||
|
|
||||||
|
|
||||||
20
src/main.py
20
src/main.py
@@ -20,8 +20,6 @@
|
|||||||
import json
|
import json
|
||||||
import lzma
|
import lzma
|
||||||
import os
|
import os
|
||||||
import shlex
|
|
||||||
import subprocess
|
|
||||||
import sys
|
import sys
|
||||||
from typing import Any, Optional
|
from typing import Any, Optional
|
||||||
|
|
||||||
@@ -36,16 +34,16 @@ from gi.repository import Adw, Gio, GLib, Gtk
|
|||||||
from src import shared
|
from src import shared
|
||||||
from src.details_window import DetailsWindow
|
from src.details_window import DetailsWindow
|
||||||
from src.game import Game
|
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.importer import Importer
|
||||||
from src.importer.sources.bottles_source import BottlesSource
|
from src.importer.itch_source import ItchSource
|
||||||
from src.importer.sources.desktop_source import DesktopSource
|
from src.importer.legendary_source import LegendarySource
|
||||||
from src.importer.sources.flatpak_source import FlatpakSource
|
from src.importer.lutris_source import LutrisSource
|
||||||
from src.importer.sources.heroic_source import HeroicSource
|
from src.importer.retroarch_source import RetroarchSource
|
||||||
from src.importer.sources.itch_source import ItchSource
|
from src.importer.steam_source import SteamSource
|
||||||
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.logging.setup import log_system_info, setup_logging
|
from src.logging.setup import log_system_info, setup_logging
|
||||||
from src.preferences import PreferencesWindow
|
from src.preferences import PreferencesWindow
|
||||||
from src.store.managers.cover_manager import CoverManager
|
from src.store.managers.cover_manager import CoverManager
|
||||||
|
|||||||
@@ -28,16 +28,16 @@ from gi.repository import Adw, Gio, GLib, Gtk
|
|||||||
from src import shared
|
from src import shared
|
||||||
from src.errors.friendly_error import FriendlyError
|
from src.errors.friendly_error import FriendlyError
|
||||||
from src.game import Game
|
from src.game import Game
|
||||||
from src.importer.sources.bottles_source import BottlesSource
|
from src.importer.bottles_source import BottlesSource
|
||||||
from src.importer.sources.flatpak_source import FlatpakSource
|
from src.importer.flatpak_source import FlatpakSource
|
||||||
from src.importer.sources.heroic_source import HeroicSource
|
from src.importer.heroic_source import HeroicSource
|
||||||
from src.importer.sources.itch_source import ItchSource
|
from src.importer.itch_source import ItchSource
|
||||||
from src.importer.sources.legendary_source import LegendarySource
|
from src.importer.legendary_source import LegendarySource
|
||||||
from src.importer.sources.location import UnresolvableLocationError
|
from src.importer.location import UnresolvableLocationError
|
||||||
from src.importer.sources.lutris_source import LutrisSource
|
from src.importer.lutris_source import LutrisSource
|
||||||
from src.importer.sources.retroarch_source import RetroarchSource
|
from src.importer.retroarch_source import RetroarchSource
|
||||||
from src.importer.sources.source import Source
|
from src.importer.source import Source
|
||||||
from src.importer.sources.steam_source import SteamSource
|
from src.importer.steam_source import SteamSource
|
||||||
from src.store.managers.sgdb_manager import SgdbManager
|
from src.store.managers.sgdb_manager import SgdbManager
|
||||||
from src.utils.create_dialog import create_dialog
|
from src.utils.create_dialog import create_dialog
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user