From 48ca1d938f70992dee5de28e0c740e3784a3a767 Mon Sep 17 00:00:00 2001 From: GeoffreyCoulaud Date: Mon, 8 May 2023 13:48:51 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fixed=20some=20imports?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/importer/sources/lutris_source.py | 8 ++++---- src/meson.build | 6 ++++++ src/{importer => utils}/decorators.py | 0 3 files changed, 10 insertions(+), 4 deletions(-) rename src/{importer => utils}/decorators.py (100%) diff --git a/src/importer/sources/lutris_source.py b/src/importer/sources/lutris_source.py index c656573..89423a9 100644 --- a/src/importer/sources/lutris_source.py +++ b/src/importer/sources/lutris_source.py @@ -2,10 +2,10 @@ from functools import cached_property, cache from sqlite3 import connect from time import time -from src.game import Game -from src.utils.save_cover import resize_cover, save_cover -from src.importer.source import Source, SourceIterator -from src.importer.decorators import replaced_by_schema_key, replaced_by_path +from .game import Game +from .save_cover import resize_cover, save_cover +from .source import Source, SourceIterator +from .decorators import replaced_by_schema_key, replaced_by_path class LutrisSourceIterator(SourceIterator): diff --git a/src/meson.build b/src/meson.build index 45c0a4d..53e6e5d 100644 --- a/src/meson.build +++ b/src/meson.build @@ -16,6 +16,8 @@ configure_file( install_dir: get_option('bindir') ) +# TODO move to absolute imports = keep real structure, do not flatten + cartridges_sources = [ '__init__.py', 'main.py', @@ -29,9 +31,13 @@ cartridges_sources = [ 'utils/save_cover.py', 'utils/create_dialog.py', + # Added 'importer/sources/lutris_source.py', 'importer/importer.py', + 'importer/source.py', + 'utils/decorators.py', + # TODO remove before merge 'importers/bottles_importer.py', 'importers/heroic_importer.py', 'importers/itch_importer.py', diff --git a/src/importer/decorators.py b/src/utils/decorators.py similarity index 100% rename from src/importer/decorators.py rename to src/utils/decorators.py