From f7dc0cf090b2e832d7cfe4d8749a84b5cbfdcc29 Mon Sep 17 00:00:00 2001 From: Dummerle Date: Tue, 16 Mar 2021 11:03:55 +0100 Subject: [PATCH] Added Cloud Saves --- Rare/Components/TabWidget.py | 7 ++++--- Rare/Components/Tabs/CloudSaves/CloudSaves.py | 9 +++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Rare/Components/TabWidget.py b/Rare/Components/TabWidget.py index 1c2ea5f1..32782fcb 100644 --- a/Rare/Components/TabWidget.py +++ b/Rare/Components/TabWidget.py @@ -1,6 +1,7 @@ from PyQt5.QtCore import QSize from PyQt5.QtGui import QFont from PyQt5.QtWidgets import QTabWidget, QTabBar, QWidget, QToolButton, QWidgetAction, QMenu +from Rare.Components.Tabs.CloudSaves.CloudSaves import SyncSaves from legendary.core import LegendaryCore from qtawesome import icon @@ -15,7 +16,7 @@ from Rare.utils.Models import InstallOptions class TabWidget(QTabWidget): def __init__(self, core: LegendaryCore): super(TabWidget, self).__init__() - disabled_tab = 2 + disabled_tab = 3 self.setTabBar(TabBar(disabled_tab)) self.settings = SettingsTab(core) self.game_list = GameTab(core) @@ -33,8 +34,8 @@ class TabWidget(QTabWidget): self.tabBarClicked.connect(lambda x: self.game_list.layout.setCurrentIndex(0) if x == 0 else None) # Commented, because it is not finished - # self.cloud_saves = SyncSaves(core) - # self.addTab(self.cloud_saves, "Cloud Saves") + self.cloud_saves = SyncSaves(core) + self.addTab(self.cloud_saves, "Cloud Saves") # Space Tab self.addTab(QWidget(), "") diff --git a/Rare/Components/Tabs/CloudSaves/CloudSaves.py b/Rare/Components/Tabs/CloudSaves/CloudSaves.py index b795a906..45a36f08 100644 --- a/Rare/Components/Tabs/CloudSaves/CloudSaves.py +++ b/Rare/Components/Tabs/CloudSaves/CloudSaves.py @@ -1,6 +1,6 @@ from logging import getLogger -from PyQt5.QtCore import QThread, pyqtSignal, QObjectCleanupHandler, Qt +from PyQt5.QtCore import QThread, pyqtSignal, Qt from PyQt5.QtWidgets import * from legendary.core import LegendaryCore from legendary.models.game import SaveGameStatus @@ -55,11 +55,12 @@ class SyncSaves(QScrollArea): self.main_layout.addWidget(self.sync_all_button) latest_save = {} - for i in saves: + for i in sorted(saves, key=lambda a: a.datetime): latest_save[i.app_name] = i + logger.info(f'Got {len(latest_save)} remote save game(s)') if len(latest_save) == 0: - QMessageBox.information(self.tr("No Games Found"), self.tr("Your games don't support cloud save")) + # QMessageBox.information(self.tr("No Games Found"), self.tr("Your games don't support cloud save")) self.widget = QLabel("No Games found, supporting cloud saves") self.setWidget(self.widget) return @@ -97,4 +98,4 @@ class SyncSaves(QScrollArea): if w.res == SaveGameStatus.REMOTE_NEWER: w.download() elif w.res == SaveGameStatus.LOCAL_NEWER: - w.upload() \ No newline at end of file + w.upload()