Lgndr: Restructure module to follow legendary's file hierarchy

Move overloaded class files into the folders following
legendary's structure. Move Rare's integration classes into
their own subfolder.

rare/components/dialogs/install_dialog.py

@@ -10,11 +10,11 @@ from legendary.models.downloading import ConditionCheckResult
 from legendary.models.game import Game
 from legendary.utils.selective_dl import get_sdl_appname
 
-from rare.lgndr.api_arguments import LgndrInstallGameArgs
-from rare.lgndr.api_exception import LgndrException
-from rare.lgndr.api_monkeys import LgndrIndirectStatus
 from rare.lgndr.cli import LegendaryCLI
 from rare.lgndr.core import LegendaryCore
+from rare.lgndr.glue.arguments import LgndrInstallGameArgs
+from rare.lgndr.glue.exception import LgndrException
+from rare.lgndr.glue.monkeys import LgndrIndirectStatus
 from rare.models.install import InstallDownloadModel, InstallQueueItemModel
 from rare.shared import LegendaryCoreSingleton, ApiResultsSingleton, ArgumentsSingleton
 from rare.ui.components.dialogs.install_dialog import Ui_InstallDialog

rare/components/tabs/downloads/__init__.py

@@ -17,7 +17,7 @@ from legendary.models.game import Game, InstalledGame
 from rare.components.dialogs.install_dialog import InstallDialog
 from rare.components.tabs.downloads.dl_queue_widget import DlQueueWidget, DlWidget
 from rare.components.tabs.downloads.download_thread import DownloadThread
-from rare.lgndr.downloading import UIUpdate
+from rare.lgndr.models.downloading import UIUpdate
 from rare.models.install import InstallOptionsModel, InstallQueueItemModel
 from rare.shared import LegendaryCoreSingleton, GlobalSignalsSingleton
 from rare.ui.components.tabs.downloads.downloads_tab import Ui_DownloadsTab

rare/components/tabs/downloads/download_thread.py

@@ -10,9 +10,9 @@ from typing import List, Optional, Dict
 from PyQt5.QtCore import QThread, pyqtSignal, QProcess
 from legendary.core import LegendaryCore
 
-from rare.lgndr.api_monkeys import DLManagerSignals
 from rare.lgndr.cli import LegendaryCLI
-from rare.lgndr.downloading import UIUpdate
+from rare.lgndr.glue.monkeys import DLManagerSignals
+from rare.lgndr.models.downloading import UIUpdate
 from rare.models.install import InstallQueueItemModel
 from rare.shared import GlobalSignalsSingleton, ArgumentsSingleton
 

rare/components/tabs/games/game_info/__init__.py

@@ -1,12 +1,12 @@
 from PyQt5.QtCore import Qt
 from PyQt5.QtGui import QKeyEvent
 
+from rare.components.tabs.games.game_utils import GameUtils
 from rare.shared import LegendaryCoreSingleton, GlobalSignalsSingleton
 from rare.utils.extra_widgets import SideTabWidget
 from .game_dlc import GameDlc
 from .game_info import GameInfo
 from .game_settings import GameSettings
-from ..game_utils import GameUtils
 
 
 class GameInfoTabs(SideTabWidget):

rare/components/tabs/games/import_sync/egl_sync_group.py

@@ -6,15 +6,15 @@ from typing import Tuple, Iterable, List
 from PyQt5.QtCore import Qt, QThreadPool, QRunnable, pyqtSlot, pyqtSignal
 from PyQt5.QtWidgets import QGroupBox, QListWidgetItem, QFileDialog, QMessageBox, QFrame
 
-from rare.lgndr.api_exception import LgndrException
+from rare.lgndr.glue.exception import LgndrException
 from rare.shared import LegendaryCoreSingleton, GlobalSignalsSingleton
 from rare.ui.components.tabs.games.import_sync.egl_sync_group import Ui_EGLSyncGroup
 from rare.ui.components.tabs.games.import_sync.egl_sync_list_group import (
     Ui_EGLSyncListGroup,
 )
 from rare.utils.extra_widgets import PathEdit
-from rare.utils.models import PathSpec
 from rare.utils.misc import WineResolver
+from rare.utils.models import PathSpec
 
 logger = getLogger("EGLSync")
 

rare/components/tabs/games/import_sync/import_group.py

@@ -10,9 +10,9 @@ from PyQt5.QtCore import Qt, QModelIndex, pyqtSignal, QRunnable, QObject, QThrea
 from PyQt5.QtGui import QStandardItemModel
 from PyQt5.QtWidgets import QFileDialog, QGroupBox, QCompleter, QTreeView, QHeaderView, QMessageBox
 
-from rare.lgndr.api_arguments import LgndrImportGameArgs
-from rare.lgndr.api_monkeys import LgndrIndirectStatus
 from rare.lgndr.cli import LegendaryCLI
+from rare.lgndr.glue.arguments import LgndrImportGameArgs
+from rare.lgndr.glue.monkeys import LgndrIndirectStatus
 from rare.shared import LegendaryCoreSingleton, GlobalSignalsSingleton, ApiResultsSingleton
 from rare.ui.components.tabs.games.import_sync.import_group import Ui_ImportGroup
 from rare.utils.extra_widgets import IndicatorLineEdit, PathEdit

rare/lgndr/cli.py

@@ -11,7 +11,9 @@ from legendary.models.game import Game, InstalledGame, VerifyResult
 from legendary.lfs.utils import validate_files
 from legendary.utils.selective_dl import get_sdl_appname
 
-from .api_arguments import (
+from rare.lgndr.core import LegendaryCore
+from rare.lgndr.downloader.mp.manager import DLManager
+from rare.lgndr.glue.arguments import (
     LgndrInstallGameArgs,
     LgndrImportGameArgs,
     LgndrVerifyGameArgs,
@@ -19,9 +21,7 @@ from .api_arguments import (
     LgndrInstallGameRealArgs,
     LgndrInstallGameRealRet,
 )
-from .api_monkeys import LgndrIndirectStatus, LgndrIndirectLogger
-from .core import LegendaryCore
-from .manager import DLManager
+from rare.lgndr.glue.monkeys import LgndrIndirectStatus, LgndrIndirectLogger
 
 
 # fmt: off

rare/lgndr/core.py

@@ -1,4 +1,3 @@
-from hashlib import sha1
 from multiprocessing import Queue
 
 # On Windows the monkeypatching of `run_real` below doesn't work like on Linux
@@ -10,8 +9,8 @@ from legendary.models.downloading import AnalysisResult
 from legendary.models.game import Game, InstalledGame
 from legendary.models.manifest import ManifestMeta
 
-from .api_exception import LgndrException, LgndrCoreLogHandler
-from .manager import DLManager
+from rare.lgndr.downloader.mp.manager import DLManager
+from rare.lgndr.glue.exception import LgndrException, LgndrCoreLogHandler
 
 legendary.core.DLManager = DLManager
 

rare/lgndr/downloader/mp/manager.py

@@ -11,8 +11,8 @@ from legendary.downloader.mp.manager import DLManager as DLManagerReal
 from legendary.downloader.mp.workers import DLWorker, FileWorker
 from legendary.models.downloading import ChunkTask, SharedMemorySegment, TerminateWorkerTask
 
-from .downloading import UIUpdate
-from .api_monkeys import DLManagerSignals
+from rare.lgndr.glue.monkeys import DLManagerSignals
+from rare.lgndr.models.downloading import UIUpdate
 
 
 # fmt: off

rare/lgndr/glue/arguments.py

@@ -2,14 +2,14 @@ from dataclasses import dataclass
 from enum import IntEnum
 from typing import Callable, List, Optional, Dict
 
-from .api_monkeys import (
+from rare.lgndr.glue.monkeys import (
     LgndrIndirectStatus,
     GetBooleanChoiceProtocol,
     get_boolean_choice,
     verify_stdout,
     DLManagerSignals
 )
-from .downloading import UIUpdate
+from rare.lgndr.models.downloading import UIUpdate
 
 """
 @dataclass(kw_only=True)

rare/lgndr/glue/exception.py

@@ -1,5 +1,5 @@
 import logging
-import warnings
+# import warnings
 
 
 class LgndrException(RuntimeError):

rare/models/install.py

@@ -6,7 +6,7 @@ from typing import List, Optional, Callable, Dict
 from legendary.models.downloading import AnalysisResult, ConditionCheckResult
 from legendary.models.game import Game, InstalledGame
 
-from rare.lgndr.manager import DLManager
+from rare.lgndr.downloader.mp.manager import DLManager
 
 
 @dataclass

rare/utils/legendary_utils.py

@@ -5,9 +5,9 @@ from logging import getLogger
 from PyQt5.QtCore import pyqtSignal, QObject, QRunnable, QStandardPaths
 from legendary.core import LegendaryCore
 
-from rare.lgndr.api_arguments import LgndrVerifyGameArgs, LgndrUninstallGameArgs
-from rare.lgndr.api_monkeys import LgndrIndirectStatus
 from rare.lgndr.cli import LegendaryCLI
+from rare.lgndr.glue.arguments import LgndrVerifyGameArgs, LgndrUninstallGameArgs
+from rare.lgndr.glue.monkeys import LgndrIndirectStatus
 from rare.shared import LegendaryCoreSingleton, ArgumentsSingleton
 from rare.utils import config_helper