Fixed Cloud Saves

Rare/Components/Tabs/CloudSaves/SyncWidget.py

@@ -66,7 +66,9 @@ class SyncWidget(QWidget):
         if self.res == SaveGameStatus.NO_SAVE:
             self.logger.info('No cloud or local savegame found.')
             return
+
         game_title = QLabel(f"<h2>{igame.title}</h2>")
+
         if self.dt_local:
             local_save_date = QLabel(
                 self.tr("Local Save date: ") + str(self.dt_local.strftime('%Y-%m-%d %H:%M:%S')))
@@ -113,7 +115,7 @@ class SyncWidget(QWidget):
                 self.download_button.setDisabled(True)
             self.logger.info(f'- Local save date: {self.dt_local.strftime("%Y-%m-%d %H:%M:%S")}')
         else:
-            self.logger.error("Error")
+            self.logger.error(self.res)
             return
 
         self.upload_button.clicked.connect(self.upload)

Rare/__main__.py

@@ -6,7 +6,7 @@ from Rare import __version__
 from PyQt5.QtCore import QTranslator, QSettings
 from PyQt5.QtGui import QIcon
 from PyQt5.QtWidgets import QApplication
-from legendary.core import LegendaryCore
+from custom_legendary.core import LegendaryCore
 
 from Rare import style_path, lang_path
 from Rare.Components.Launch.LaunchDialog import LaunchDialog

Rare/utils/utils.py

@@ -6,7 +6,7 @@ from logging import getLogger
 import requests
 from PIL import Image
 from PyQt5.QtCore import pyqtSignal, QLocale, QSettings
-from legendary.core import LegendaryCore
+from custom_legendary.core import LegendaryCore
 
 from Rare import lang_path
 

custom_legendary/api/egs.py

@@ -6,7 +6,7 @@ import logging
 
 from requests.auth import HTTPBasicAuth
 
-from legendary.models.exceptions import InvalidCredentialsError
+from custom_legendary.models.exceptions import InvalidCredentialsError
 
 
 class EPCAPI:

custom_legendary/cli.py

@@ -19,12 +19,12 @@ from logging.handlers import QueueListener
 from multiprocessing import freeze_support, Queue as MPQueue
 from sys import exit, stdout
 
-from legendary import __version__, __codename__
+from custom_legendary import __version__, __codename__
-from legendary.core import LegendaryCore
+from custom_legendary.core import LegendaryCore
-from legendary.models.exceptions import InvalidCredentialsError
+from custom_legendary.models.exceptions import InvalidCredentialsError
-from legendary.models.game import SaveGameStatus, VerifyResult
+from custom_legendary.models.game import SaveGameStatus, VerifyResult
-from legendary.utils.cli import get_boolean_choice, sdl_prompt
+from custom_legendary.utils.cli import get_boolean_choice, sdl_prompt
-from legendary.utils.custom_parser import AliasedSubParsersAction
+from custom_legendary.utils.custom_parser import AliasedSubParsersAction
 
 # todo custom formatter for cli logger (clean info, highlighted error/warning)
 logging.basicConfig(

custom_legendary/core.py

@@ -17,23 +17,23 @@ from requests.exceptions import HTTPError
 from typing import List, Dict, Callable
 from uuid import uuid4
 
-from legendary.api.egs import EPCAPI
+from custom_legendary.api.egs import EPCAPI
-from legendary.downloader.manager import DLManager
+from custom_legendary.downloader.manager import DLManager
-from legendary.lfs.egl import EPCLFS
+from custom_legendary.lfs.egl import EPCLFS
-from legendary.lfs.lgndry import LGDLFS
+from custom_legendary.lfs.lgndry import LGDLFS
-from legendary.utils.lfs import clean_filename, delete_folder, delete_filelist, validate_files
+from custom_legendary.utils.lfs import clean_filename, delete_folder, delete_filelist, validate_files
-from legendary.models.downloading import AnalysisResult, ConditionCheckResult
+from custom_legendary.models.downloading import AnalysisResult, ConditionCheckResult
-from legendary.models.egl import EGLManifest
+from custom_legendary.models.egl import EGLManifest
-from legendary.models.exceptions import InvalidCredentialsError
+from custom_legendary.models.exceptions import InvalidCredentialsError
-from legendary.models.game import GameAsset, Game, InstalledGame, SaveGameFile, SaveGameStatus, VerifyResult
+from custom_legendary.models.game import GameAsset, Game, InstalledGame, SaveGameFile, SaveGameStatus, VerifyResult
-from legendary.models.json_manifest import JSONManifest
+from custom_legendary.models.json_manifest import JSONManifest
-from legendary.models.manifest import Manifest, ManifestMeta
+from custom_legendary.models.manifest import Manifest, ManifestMeta
-from legendary.models.chunk import Chunk
+from custom_legendary.models.chunk import Chunk
-from legendary.utils.game_workarounds import is_opt_enabled
+from custom_legendary.utils.game_workarounds import is_opt_enabled
-from legendary.utils.savegame_helper import SaveGameHelper
+from custom_legendary.utils.savegame_helper import SaveGameHelper
-from legendary.utils.manifests import combine_manifests
+from custom_legendary.utils.manifests import combine_manifests
-from legendary.utils.wine_helpers import read_registry, get_shell_folders
+from custom_legendary.utils.wine_helpers import read_registry, get_shell_folders
-from legendary.utils.selective_dl import get_sdl_appname
+from custom_legendary.utils.selective_dl import get_sdl_appname
 
 
 # ToDo: instead of true/false return values for success/failure actually raise an exception that the CLI/GUI

custom_legendary/downloader/manager.py

@@ -14,9 +14,9 @@ from queue import Empty
 from sys import exit
 from threading import Condition, Thread
 
-from legendary.downloader.workers import DLWorker, FileWorker
+from custom_legendary.downloader.workers import DLWorker, FileWorker
-from legendary.models.downloading import *
+from custom_legendary.models.downloading import *
-from legendary.models.manifest import ManifestComparison, Manifest
+from custom_legendary.models.manifest import ManifestComparison, Manifest
 
 
 class DLManager(Process):

custom_legendary/downloader/workers.py

@@ -10,8 +10,8 @@ from multiprocessing import Process
 from multiprocessing.shared_memory import SharedMemory
 from queue import Empty
 
-from legendary.models.chunk import Chunk
+from custom_legendary.models.chunk import Chunk
-from legendary.models.downloading import DownloaderTaskResult, WriterTaskResult
+from custom_legendary.models.downloading import DownloaderTaskResult, WriterTaskResult
 
 
 class DLWorker(Process):

custom_legendary/lfs/egl.py

@@ -6,7 +6,7 @@ import os
 
 from typing import List
 
-from legendary.models.egl import EGLManifest
+from custom_legendary.models.egl import EGLManifest
 
 
 class EPCLFS:

custom_legendary/lfs/lgndry.py

@@ -7,8 +7,8 @@ import logging
 
 from pathlib import Path
 
-from legendary.models.game import *
+from custom_legendary.models.game import *
-from legendary.utils.lfs import clean_filename
+from custom_legendary.utils.lfs import clean_filename
 
 
 class LGDLFS:

custom_legendary/models/chunk.py

@@ -7,7 +7,7 @@ from hashlib import sha1
 from io import BytesIO
 from uuid import uuid4
 
-from legendary.utils.rolling_hash import get_hash
+from custom_legendary.utils.rolling_hash import get_hash
 
 
 # ToDo do some reworking to make this more memory efficient

custom_legendary/models/egl.py

@@ -1,7 +1,7 @@
 from copy import deepcopy
 from distutils.util import strtobool
 
-from legendary.models.game import InstalledGame, Game
+from custom_legendary.models.game import InstalledGame, Game
 
 
 _template = {

custom_legendary/models/json_manifest.py

@@ -5,7 +5,7 @@ import struct
 
 from copy import deepcopy
 
-from legendary.models.manifest import (
+from custom_legendary.models.manifest import (
     Manifest, ManifestMeta, CDL, ChunkPart, ChunkInfo, FML, FileManifest, CustomFields
 )
 

custom_legendary/utils/cli.py

@@ -1,4 +1,4 @@
-from legendary.utils.selective_dl import games
+from custom_legendary.utils.selective_dl import games
 
 
 def get_boolean_choice(prompt, default=True):

custom_legendary/utils/lfs.py

@@ -7,7 +7,7 @@ import logging
 
 from typing import List, Iterator
 
-from legendary.models.game import VerifyResult
+from custom_legendary.models.game import VerifyResult
 
 logger = logging.getLogger('LFS Utils')
 

custom_legendary/utils/manifests.py

@@ -1,4 +1,4 @@
-from legendary.models.manifest import Manifest
+from custom_legendary.models.manifest import Manifest
 
 
 def combine_manifests(base_manifest: Manifest, delta_manifest: Manifest):

custom_legendary/utils/savegame_helper.py

@@ -7,8 +7,8 @@ from hashlib import sha1
 from io import BytesIO
 from tempfile import TemporaryFile
 
-from legendary.models.chunk import Chunk
+from custom_legendary.models.chunk import Chunk
-from legendary.models.manifest import \
+from custom_legendary.models.manifest import \
     Manifest, ManifestMeta, CDL, FML, CustomFields, FileManifest, ChunkPart, ChunkInfo