From 36b6bc17bd2daace7fc1d141c0a40c5d90ae1f42 Mon Sep 17 00:00:00 2001 From: kramo <93832451+kra-mo@users.noreply.github.com> Date: Wed, 24 May 2023 14:09:16 +0200 Subject: [PATCH] Cleanups --- src/details_window.py | 2 +- src/game.py | 2 +- src/importer/importer.py | 2 +- src/importer/sources/lutris_source.py | 2 +- src/importers/bottles_importer.py | 2 +- src/importers/heroic_importer.py | 2 +- src/importers/itch_importer.py | 2 +- src/importers/lutris_importer.py | 2 +- src/importers/steam_importer.py | 2 +- src/main.py | 2 +- src/preferences.py | 4 ++-- src/store/managers/display_manager.py | 2 +- src/store/managers/manager.py | 2 +- src/store/store.py | 2 +- src/utils/decorators.py | 2 +- src/utils/importer.py | 2 +- src/utils/save_cover.py | 2 +- src/utils/steamgriddb.py | 2 +- src/window.py | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/details_window.py b/src/details_window.py index bfa89fc..d0cd7a3 100644 --- a/src/details_window.py +++ b/src/details_window.py @@ -25,7 +25,7 @@ from gi.repository import Adw, Gio, GLib, Gtk from PIL import Image # TODO use SGDBHelper -import src.shared as shared +from src import shared from src.game import Game from src.game_cover import GameCover from src.utils.create_dialog import create_dialog diff --git a/src/game.py b/src/game.py index d46dd05..2ca2f7d 100644 --- a/src/game.py +++ b/src/game.py @@ -26,7 +26,7 @@ from time import time from gi.repository import Adw, Gio, Gtk -import src.shared as shared +from src import shared from src.game_cover import GameCover diff --git a/src/importer/importer.py b/src/importer/importer.py index 8a6edda..811df36 100644 --- a/src/importer/importer.py +++ b/src/importer/importer.py @@ -3,7 +3,7 @@ import logging from gi.repository import Adw, Gio, Gtk from requests import HTTPError -import src.shared as shared +from src import shared from src.utils.create_dialog import create_dialog from src.utils.steamgriddb import SGDBAuthError, SGDBError, SGDBHelper from src.utils.task import Task diff --git a/src/importer/sources/lutris_source.py b/src/importer/sources/lutris_source.py index be483db..e245b95 100644 --- a/src/importer/sources/lutris_source.py +++ b/src/importer/sources/lutris_source.py @@ -4,7 +4,7 @@ from pathlib import Path from sqlite3 import connect from time import time -import src.shared as shared +from src import shared from src.game import Game from src.importer.sources.source import Source, SourceIterator from src.utils.decorators import replaced_by_path, replaced_by_schema_key diff --git a/src/importers/bottles_importer.py b/src/importers/bottles_importer.py index 260543a..04a9fe0 100644 --- a/src/importers/bottles_importer.py +++ b/src/importers/bottles_importer.py @@ -22,7 +22,7 @@ from time import time import yaml -import src.shared as shared +from src import shared from src.utils.check_install import check_install diff --git a/src/importers/heroic_importer.py b/src/importers/heroic_importer.py index a2c9412..85e84d9 100644 --- a/src/importers/heroic_importer.py +++ b/src/importers/heroic_importer.py @@ -23,7 +23,7 @@ from hashlib import sha256 from pathlib import Path from time import time -import src.shared as shared +from src import shared from src.utils.check_install import check_install diff --git a/src/importers/itch_importer.py b/src/importers/itch_importer.py index ee68384..2eb14c0 100644 --- a/src/importers/itch_importer.py +++ b/src/importers/itch_importer.py @@ -26,7 +26,7 @@ from time import time import requests from gi.repository import GdkPixbuf, Gio -import src.shared as shared +from src import shared from src.utils.check_install import check_install from src.utils.save_cover import resize_cover diff --git a/src/importers/lutris_importer.py b/src/importers/lutris_importer.py index 62d352a..d8a10b5 100644 --- a/src/importers/lutris_importer.py +++ b/src/importers/lutris_importer.py @@ -22,7 +22,7 @@ from shutil import copyfile from sqlite3 import connect from time import time -import src.shared as shared +from src import shared from src.utils.check_install import check_install diff --git a/src/importers/steam_importer.py b/src/importers/steam_importer.py index 4a6bc34..7ecaa83 100644 --- a/src/importers/steam_importer.py +++ b/src/importers/steam_importer.py @@ -25,7 +25,7 @@ from time import time import requests from gi.repository import Gio -import src.shared as shared +from src import shared from src.utils.check_install import check_install diff --git a/src/main.py b/src/main.py index c127fea..1c85754 100644 --- a/src/main.py +++ b/src/main.py @@ -29,7 +29,7 @@ gi.require_version("Adw", "1") # pylint: disable=wrong-import-position from gi.repository import Adw, Gio, GLib, Gtk -import src.shared as shared +from src import shared from src.details_window import DetailsWindow from src.importer.importer import Importer from src.importer.sources.lutris_source import LutrisFlatpakSource, LutrisNativeSource diff --git a/src/preferences.py b/src/preferences.py index 9df90b5..2bb2129 100644 --- a/src/preferences.py +++ b/src/preferences.py @@ -24,7 +24,7 @@ from pathlib import Path from gi.repository import Adw, Gio, GLib, Gtk # pylint: disable=unused-import -import src.shared as shared +from src import shared # TODO use the new sources from src.importers.bottles_importer import bottles_installed @@ -128,7 +128,7 @@ class PreferencesWindow(Adw.PreferencesWindow): if response == "choose_folder": self.choose_folder(widget, set_cache_dir) - if lutris_cache_exists(self.win, path): + if lutris_cache_exists(path): self.import_changed = True self.set_subtitle(self, "lutris-cache") diff --git a/src/store/managers/display_manager.py b/src/store/managers/display_manager.py index 235ae62..2fdfda9 100644 --- a/src/store/managers/display_manager.py +++ b/src/store/managers/display_manager.py @@ -1,4 +1,4 @@ -import src.shared as shared +from src import shared from src.game import Game from src.store.managers.manager import Manager from src.store.managers.sgdb_manager import SGDBManager diff --git a/src/store/managers/manager.py b/src/store/managers/manager.py index 361f63a..1e4660e 100644 --- a/src/store/managers/manager.py +++ b/src/store/managers/manager.py @@ -20,7 +20,7 @@ class Manager: def __init__(self) -> None: super().__init__() self.cancellable = Gio.Cancellable() - self.errors = list() + self.errors = [] def cancel_tasks(self): """Cancel all tasks for this manager""" diff --git a/src/store/store.py b/src/store/store.py index b3ff3a9..b75d569 100644 --- a/src/store/store.py +++ b/src/store/store.py @@ -2,7 +2,7 @@ from typing import Iterable from gi.repository import GObject -import src.shared as shared +from src import shared from src.game import Game from src.store.managers.manager import Manager from src.utils.task import Task diff --git a/src/utils/decorators.py b/src/utils/decorators.py index d9a8433..cce9a09 100644 --- a/src/utils/decorators.py +++ b/src/utils/decorators.py @@ -17,7 +17,7 @@ from pathlib import Path from os import PathLike, environ from functools import wraps -import src.shared as shared +from src import shared def replaced_by_path(override: PathLike): # Decorator builder diff --git a/src/utils/importer.py b/src/utils/importer.py index 9929757..2d651ac 100644 --- a/src/utils/importer.py +++ b/src/utils/importer.py @@ -19,7 +19,7 @@ from gi.repository import Adw, GLib, Gtk -import src.shared as shared +from src import shared from .create_dialog import create_dialog from .game import Game from .save_cover import resize_cover, save_cover diff --git a/src/utils/save_cover.py b/src/utils/save_cover.py index 5a2cef5..a3e6c67 100644 --- a/src/utils/save_cover.py +++ b/src/utils/save_cover.py @@ -24,7 +24,7 @@ from shutil import copyfile from gi.repository import Gio from PIL import Image, ImageSequence -import src.shared as shared +from src import shared def resize_cover(cover_path=None, pixbuf=None): diff --git a/src/utils/steamgriddb.py b/src/utils/steamgriddb.py index b685918..ea3ecd9 100644 --- a/src/utils/steamgriddb.py +++ b/src/utils/steamgriddb.py @@ -5,7 +5,7 @@ import requests from gi.repository import Gio from requests import HTTPError -import src.shared as shared +from src import shared from src.utils.create_dialog import create_dialog from src.utils.save_cover import resize_cover, save_cover diff --git a/src/window.py b/src/window.py index a577e52..086055c 100644 --- a/src/window.py +++ b/src/window.py @@ -22,7 +22,7 @@ from datetime import datetime from gi.repository import Adw, Gio, GLib, Gtk -import src.shared as shared +from src import shared from src.game import Game