diff --git a/src/details_window.py b/src/details_window.py index 362f97b..6d4adf6 100644 --- a/src/details_window.py +++ b/src/details_window.py @@ -26,11 +26,11 @@ from PIL import Image # TODO use SGDBHelper from . import shared -from cartridges.game import Game -from cartridges.game_cover import GameCover -from cartridges.utils.create_dialog import create_dialog -from cartridges.utils.save_cover import resize_cover, save_cover -from cartridges.utils.steamgriddb import SGDBSave +from src.game import Game +from src.game_cover import GameCover +from src.utils.create_dialog import create_dialog +from src.utils.save_cover import resize_cover, save_cover +from src.utils.steamgriddb import SGDBSave @Gtk.Template(resource_path="/hu/kramo/Cartridges/gtk/details_window.ui") diff --git a/src/game.py b/src/game.py index 218843e..5bab56e 100644 --- a/src/game.py +++ b/src/game.py @@ -27,7 +27,7 @@ from time import time from gi.repository import Adw, Gio, Gtk from . import shared -from cartridges.game_cover import GameCover +from src.game_cover import GameCover @Gtk.Template(resource_path="/hu/kramo/Cartridges/gtk/game.ui") diff --git a/src/importer/importer.py b/src/importer/importer.py index c6cfb4f..ca95a91 100644 --- a/src/importer/importer.py +++ b/src/importer/importer.py @@ -3,9 +3,9 @@ import logging from gi.repository import Adw, Gio, Gtk from requests import HTTPError -from cartridges.utils.create_dialog import create_dialog -from cartridges.utils.steamgriddb import SGDBAuthError, SGDBError, SGDBHelper -from cartridges.utils.task import Task +from src.utils.create_dialog import create_dialog +from src.utils.steamgriddb import SGDBAuthError, SGDBError, SGDBHelper +from src.utils.task import Task class Importer: diff --git a/src/importer/sources/lutris_source.py b/src/importer/sources/lutris_source.py index 16e9603..25fe8aa 100644 --- a/src/importer/sources/lutris_source.py +++ b/src/importer/sources/lutris_source.py @@ -2,10 +2,10 @@ from functools import cache from sqlite3 import connect from time import time -from cartridges.game import Game -from cartridges.importer.source import Source, SourceIterator -from cartridges.utils.decorators import replaced_by_path, replaced_by_schema_key -from cartridges.utils.save_cover import resize_cover, save_cover +from src.game import Game +from src.importer.source import Source, SourceIterator +from src.utils.decorators import replaced_by_path, replaced_by_schema_key +from src.utils.save_cover import resize_cover, save_cover class LutrisSourceIterator(SourceIterator): diff --git a/src/importers/bottles_importer.py b/src/importers/bottles_importer.py index bd48047..38b8d87 100644 --- a/src/importers/bottles_importer.py +++ b/src/importers/bottles_importer.py @@ -23,7 +23,7 @@ from time import time import yaml from . import shared -from cartridges.utils.check_install import check_install +from src.utils.check_install import check_install def bottles_installed(path=None): diff --git a/src/importers/heroic_importer.py b/src/importers/heroic_importer.py index 8ebdf6f..5282cc1 100644 --- a/src/importers/heroic_importer.py +++ b/src/importers/heroic_importer.py @@ -24,7 +24,7 @@ from pathlib import Path from time import time from . import shared -from cartridges.utils.check_install import check_install +from src.utils.check_install import check_install def heroic_installed(path=None): diff --git a/src/importers/itch_importer.py b/src/importers/itch_importer.py index 121ae3f..af0b926 100644 --- a/src/importers/itch_importer.py +++ b/src/importers/itch_importer.py @@ -27,8 +27,8 @@ import requests from gi.repository import GdkPixbuf, Gio from . import shared -from cartridges.utils.check_install import check_install -from cartridges.utils.save_cover import resize_cover +from src.utils.check_install import check_install +from src.utils.save_cover import resize_cover def get_game(task, current_time, row): diff --git a/src/importers/lutris_importer.py b/src/importers/lutris_importer.py index a0bda89..04b92f7 100644 --- a/src/importers/lutris_importer.py +++ b/src/importers/lutris_importer.py @@ -23,7 +23,7 @@ from sqlite3 import connect from time import time from . import shared -from cartridges.utils.check_install import check_install +from src.utils.check_install import check_install def lutris_installed(path=None): diff --git a/src/importers/steam_importer.py b/src/importers/steam_importer.py index 7824235..37ea2b6 100644 --- a/src/importers/steam_importer.py +++ b/src/importers/steam_importer.py @@ -26,7 +26,7 @@ import requests from gi.repository import Gio from . import shared -from cartridges.utils.check_install import check_install +from src.utils.check_install import check_install def update_values_from_data(content, values): diff --git a/src/main.py b/src/main.py index fe98dd6..37ffe9a 100644 --- a/src/main.py +++ b/src/main.py @@ -30,14 +30,14 @@ gi.require_version("Adw", "1") from gi.repository import Adw, Gio, GLib, Gtk from . import shared -from cartridges.details_window import DetailsWindow -from cartridges.importer.importer import Importer -from cartridges.importer.sources.lutris_source import ( +from src.details_window import DetailsWindow +from src.importer.importer import Importer +from src.importer.sources.lutris_source import ( LutrisFlatpakSource, LutrisNativeSource, ) -from cartridges.preferences import PreferencesWindow -from cartridges.window import CartridgesWindow +from src.preferences import PreferencesWindow +from src.window import CartridgesWindow class CartridgesApplication(Adw.Application): diff --git a/src/meson.build b/src/meson.build index 8cf79f6..4a48b31 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,4 +1,4 @@ -moduledir = join_paths(pkgdatadir, 'cartridges') +moduledir = join_paths(pkgdatadir, 'src') python = import('python') diff --git a/src/preferences.py b/src/preferences.py index 4349560..204a02d 100644 --- a/src/preferences.py +++ b/src/preferences.py @@ -26,12 +26,12 @@ from gi.repository import Adw, Gio, GLib, Gtk # pylint: disable=unused-import from . import shared # TODO use the new sources -from cartridges.importers.bottles_importer import bottles_installed -from cartridges.importers.heroic_importer import heroic_installed -from cartridges.importers.itch_importer import itch_installed -from cartridges.importers.lutris_importer import lutris_cache_exists, lutris_installed -from cartridges.importers.steam_importer import steam_installed -from cartridges.utils.create_dialog import create_dialog +from src.importers.bottles_importer import bottles_installed +from src.importers.heroic_importer import heroic_installed +from src.importers.itch_importer import itch_installed +from src.importers.lutris_importer import lutris_cache_exists, lutris_installed +from src.importers.steam_importer import steam_installed +from src.utils.create_dialog import create_dialog @Gtk.Template(resource_path="/hu/kramo/Cartridges/gtk/preferences.ui") diff --git a/src/utils/steamgriddb.py b/src/utils/steamgriddb.py index 15777b1..e223dcd 100644 --- a/src/utils/steamgriddb.py +++ b/src/utils/steamgriddb.py @@ -6,8 +6,8 @@ from gi.repository import Gio from requests import HTTPError from . import shared -from cartridges.utils.create_dialog import create_dialog -from cartridges.utils.save_cover import resize_cover, save_cover +from src.utils.create_dialog import create_dialog +from src.utils.save_cover import resize_cover, save_cover class SGDBError(Exception): diff --git a/src/window.py b/src/window.py index 67766ba..69a4418 100644 --- a/src/window.py +++ b/src/window.py @@ -23,7 +23,7 @@ from datetime import datetime from gi.repository import Adw, Gio, GLib, Gtk from . import shared -from cartridges.game import Game +from src.game import Game @Gtk.Template(resource_path="/hu/kramo/Cartridges/gtk/window.ui")