From e79b928fdbb59980a546158f9665cabd335d89c3 Mon Sep 17 00:00:00 2001
From: Dummerle <44114474+Dummerle@users.noreply.github.com>
Date: Sat, 8 Jan 2022 23:01:51 +0100
Subject: [PATCH] Remove AssetWorker. They are fetched, with games and dlcs in
 ImageWorker

---
 rare/components/dialogs/launch_dialog.py | 39 +-----------------------
 1 file changed, 1 insertion(+), 38 deletions(-)

diff --git a/rare/components/dialogs/launch_dialog.py b/rare/components/dialogs/launch_dialog.py
index a9929952..355e1b81 100644
--- a/rare/components/dialogs/launch_dialog.py
+++ b/rare/components/dialogs/launch_dialog.py
@@ -7,7 +7,6 @@ from PyQt5.QtWidgets import QDialog, QApplication
 from requests.exceptions import ConnectionError, HTTPError
 
 from legendary.core import LegendaryCore
-from legendary.models.game import GameAsset
 from rare import image_dir, shared
 from rare.components.dialogs.login import LoginDialog
 from rare.ui.components.dialogs.launch_dialog import Ui_LaunchDialog
@@ -56,34 +55,6 @@ class ApiRequestWorker(QRunnable):
         self.signals.result.emit(result, "32bit")
 
 
-class AssetWorker(QRunnable):
-    def __init__(self):
-        super(AssetWorker, self).__init__()
-        self.signals = ApiSignals()
-        self.setAutoDelete(True)
-        self.assets = dict()
-
-    def run(self) -> None:
-        platforms = shared.core.get_installed_platforms()
-        platforms.add("Windows")
-        if platform.system() == "Darwin":
-            platforms.add("Mac")
-        for p in platforms:
-            self.assets.update({p: self.get_asset(p)})
-        self.signals.result.emit(self.assets, "assets")
-
-    @staticmethod
-    def get_asset(p):
-        if not shared.core.egs.user:
-            return []
-        assets = [
-            GameAsset.from_egs_json(a)
-            for a in shared.core.egs.get_game_assets(platform=p)
-        ]
-
-        return assets
-
-
 class LaunchDialog(QDialog, Ui_LaunchDialog):
     quit_app = pyqtSignal(int)
     start_app = pyqtSignal()
@@ -141,10 +112,6 @@ class LaunchDialog(QDialog, Ui_LaunchDialog):
             worker.signals.result.connect(self.handle_api_worker_result)
             self.thread_pool.start(worker)
 
-            asset_worker = AssetWorker()
-            asset_worker.signals.result.connect(self.handle_api_worker_result)
-            self.thread_pool.start(asset_worker)
-
             # cloud save from another worker, because it is used in cloud_save_utils too
             cloud_worker = CloudWorker()
             cloud_worker.signals.result_ready.connect(
@@ -195,10 +162,6 @@ class LaunchDialog(QDialog, Ui_LaunchDialog):
 
         elif text == "saves":
             self.api_results.saves = result
-        elif text == "assets":
-            self.core.lgd.assets = result
-            self.finish()
-            return
 
         if self.api_results:
             self.finish()
@@ -209,7 +172,7 @@ class LaunchDialog(QDialog, Ui_LaunchDialog):
             self.finish()
 
     def finish(self):
-        if self.finished == 2:
+        if self.finished == 1:
             logger.info("App starting")
             self.image_info.setText(self.tr("Starting..."))
             shared.args.offline = self.offline