🚑 More rebase conflicts resolved

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
+import src.shared as shared
 from src.game import Game
 from src.game_cover import GameCover
 from src.utils.create_dialog import create_dialog

src/game.py

@@ -26,7 +26,7 @@ from time import time
 
 from gi.repository import Adw, Gio, Gtk
 
-import src.shared
+import src.shared as shared
 from src.game_cover import GameCover
 
 
@@ -60,7 +60,7 @@ class Game(Gtk.Box):
     blacklisted = None
     game_cover = None
 
-    def __init__(self, win, data, allow_side_effects=True, **kwargs):
+    def __init__(self, data, allow_side_effects=True, **kwargs):
         super().__init__(**kwargs)
 
         self.win = shared.win

src/importers/bottles_importer.py

@@ -22,7 +22,7 @@ from time import time
 
 import yaml
 
-import src.shared
+import src.shared as shared
 from src.utils.check_install import check_install
 
 

src/importers/heroic_importer.py

@@ -23,7 +23,7 @@ from hashlib import sha256
 from pathlib import Path
 from time import time
 
-import src.shared
+import src.shared as shared
 from src.utils.check_install import check_install
 
 

src/importers/itch_importer.py

@@ -26,7 +26,7 @@ from time import time
 import requests
 from gi.repository import GdkPixbuf, Gio
 
-import src.shared
+import src.shared as shared
 from src.utils.check_install import check_install
 from src.utils.save_cover import resize_cover
 

src/importers/lutris_importer.py

@@ -22,7 +22,7 @@ from shutil import copyfile
 from sqlite3 import connect
 from time import time
 
-import src.shared
+import src.shared as shared
 from src.utils.check_install import check_install
 
 

src/importers/steam_importer.py

@@ -25,7 +25,7 @@ from time import time
 import requests
 from gi.repository import Gio
 
-import src.shared
+import src.shared as shared
 from src.utils.check_install import check_install
 
 

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
+import src.shared as shared
 from src.details_window import DetailsWindow
 from src.importer.importer import Importer
 from src.importer.sources.lutris_source import (

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
+import src.shared as shared
 
 # TODO use the new sources
 from src.importers.bottles_importer import bottles_installed

src/utils/importer.py

@@ -19,7 +19,7 @@
 
 from gi.repository import Adw, GLib, Gtk
 
-import src.shared
+import src.shared as shared
 from .create_dialog import create_dialog
 from .game import Game
 from .save_cover import resize_cover, save_cover

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
+import src.shared as shared
 
 
 def resize_cover(cover_path=None, pixbuf=None):

src/utils/steamgriddb.py

@@ -5,7 +5,7 @@ import requests
 from gi.repository import Gio
 from requests import HTTPError
 
-import src.shared
+import src.shared as shared
 from src.utils.create_dialog import create_dialog
 from src.utils.save_cover import resize_cover, save_cover
 

src/window.py

@@ -22,7 +22,7 @@ from datetime import datetime
 
 from gi.repository import Adw, Gio, GLib, Gtk
 
-import src.shared
+import src.shared as shared
 from src.game import Game