1
0
Fork 0
mirror of synced 2024-06-26 18:20:50 +12:00

RareCore: Remove Win32Worker and MacOSWorker

They weren't required as the asset information are already fetched in
`GamesWorker`. They were a remnants of `ApiResults`.
This commit is contained in:
loathingKernel 2023-03-07 17:10:40 +02:00
parent 5748d0e6ee
commit 91a7247573
No known key found for this signature in database
GPG key ID: CE0C72D0B53821FD
4 changed files with 4 additions and 55 deletions

View file

@ -107,7 +107,7 @@ class GameListHeadBar(QWidget):
self.refresh_list = QPushButton()
self.refresh_list.setIcon(icon("fa.refresh")) # Reload icon
self.refresh_list.clicked.connect(self.rcore.fetch)
self.refresh_list.clicked.connect(self.refresh_clicked)
layout = QHBoxLayout()
layout.setContentsMargins(0, 5, 0, 5)

View file

@ -1,6 +1,5 @@
import configparser
import os
import platform
import time
from argparse import Namespace
from itertools import chain
@ -19,13 +18,11 @@ from .workers import (
QueueWorker,
VerifyWorker,
MoveWorker,
SavesWorker,
FetchWorker,
GamesWorker,
NonAssetWorker,
SavesWorker,
EntitlementsWorker,
Win32Worker,
MacOSWorker,
FetchWorker,
)
from .workers.uninstall import uninstall_game
from .workers.worker import QueueWorkerInfo, QueueWorkerState
@ -51,8 +48,6 @@ class RareCore(QObject):
self.__games_fetched: bool = False
self.__non_asset_fetched: bool = False
self.__win32_fetched: bool = False
self.__macos_fetched: bool = False
self.__saves_fetched: bool = False
self.__entitlements_fetched: bool = False
@ -281,12 +276,6 @@ class RareCore(QObject):
self.__add_games_and_dlcs(games, dlc_dict)
self.__non_asset_fetched = True
status = "Loaded games without assets"
if res_type == FetchWorker.Result.WIN32:
self.__win32_fetched = True
status = "Loaded games for Windows (32bit)"
if res_type == FetchWorker.Result.MACOS:
self.__macos_fetched = True
status = "Loaded games for MacOS"
if res_type == FetchWorker.Result.SAVES:
saves, _ = result
for save in saves:
@ -302,8 +291,6 @@ class RareCore(QObject):
fetched = [
self.__games_fetched,
self.__non_asset_fetched,
self.__win32_fetched,
self.__macos_fetched,
self.__saves_fetched,
self.__entitlements_fetched,
]
@ -320,8 +307,6 @@ class RareCore(QObject):
def fetch(self):
self.__games_fetched: bool = False
self.__non_asset_fetched: bool = False
self.__win32_fetched: bool = False
self.__macos_fetched: bool = False
self.__saves_fetched: bool = False
self.__entitlements_fetched: bool = False
@ -349,20 +334,6 @@ class RareCore(QObject):
entitlements_worker.signals.result.connect(self.handle_result)
QThreadPool.globalInstance().start(entitlements_worker)
if self.settings.value("win32_meta", False, bool) and not self.__win32_fetched:
win32_worker = Win32Worker(self.__core, self.__args)
win32_worker.signals.result.connect(self.handle_result)
QThreadPool.globalInstance().start(win32_worker)
else:
self.__win32_fetched = True
if self.settings.value("mac_meta", platform.system() == "Darwin", bool) and not self.__macos_fetched:
macos_worker = MacOSWorker(self.__core, self.__args)
macos_worker.signals.result.connect(self.handle_result)
QThreadPool.globalInstance().start(macos_worker)
else:
self.__macos_fetched = True
def load_pixmaps(self) -> None:
"""
Load pixmaps for all games

View file

@ -1,4 +1,4 @@
from .fetch import FetchWorker, GamesWorker, NonAssetWorker, EntitlementsWorker, Win32Worker, MacOSWorker, SavesWorker
from .fetch import FetchWorker, GamesWorker, NonAssetWorker, SavesWorker, EntitlementsWorker
from .install_info import InstallInfoWorker
from .move import MoveWorker
from .uninstall import UninstallWorker

View file

@ -16,8 +16,6 @@ class FetchWorker(Worker):
class Result(IntEnum):
GAMES = 1
NON_ASSET = 2
WIN32 = 3
MACOS = 4
SAVES = 5
ENTITLEMENTS = 6
@ -70,26 +68,6 @@ class EntitlementsWorker(FetchWorker):
self.signals.finished.emit()
class Win32Worker(FetchWorker):
def run_real(self):
start_time = time.time()
result = self.core.get_game_and_dlc_list(update_assets=False, platform="Win32")
self.signals.result.emit(([], {}), FetchWorker.Result.WIN32)
logger.debug(f"Win32: {len(result[0])}, DLCs {len(result[1])}")
logger.debug(f"Request Win32: {time.time() - start_time} seconds")
self.signals.finished.emit()
class MacOSWorker(FetchWorker):
def run_real(self):
start_time = time.time()
result = self.core.get_game_and_dlc_list(update_assets=False, platform="Mac")
self.signals.result.emit(([], {}), FetchWorker.Result.MACOS)
logger.debug(f"MacOS: {len(result[0])}, DLCs {len(result[1])}")
logger.debug(f"Request MacOS: {time.time() - start_time} seconds")
self.signals.finished.emit()
class SavesWorker(FetchWorker):
def run_real(self):
start_time = time.time()