Rename shared.legendary_core to core
This commit is contained in:
parent
4f25fd8a20
commit
a5f26c8a23
23 changed files with 31 additions and 28 deletions
|
@ -32,7 +32,7 @@ def excepthook(exc_type, exc_value, exc_tb):
|
|||
print("Error")
|
||||
if exc_tb == HTTPError:
|
||||
try:
|
||||
if shared.legendary_core.login():
|
||||
if shared.core.login():
|
||||
return
|
||||
else:
|
||||
raise ValueError
|
||||
|
|
|
@ -60,7 +60,7 @@ class LaunchDialog(QDialog, Ui_LaunchDialog):
|
|||
super(LaunchDialog, self).__init__(parent=parent)
|
||||
self.setupUi(self)
|
||||
self.setAttribute(Qt.WA_DeleteOnClose, True)
|
||||
self.core = shared.legendary_core
|
||||
self.core = shared.core
|
||||
self.offline = shared.args.offline
|
||||
self.thread_pool = QThreadPool()
|
||||
self.thread_pool.setMaxThreadCount(2)
|
||||
|
|
|
@ -18,7 +18,7 @@ class MainWindow(QMainWindow):
|
|||
super(MainWindow, self).__init__()
|
||||
self.setAttribute(Qt.WA_DeleteOnClose)
|
||||
self.settings = QSettings()
|
||||
self.core = shared.legendary_core
|
||||
self.core = shared.core
|
||||
|
||||
self.signals = shared.signals
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@ class MiniWidget(QWidget):
|
|||
def __init__(self):
|
||||
super(MiniWidget, self).__init__()
|
||||
self.layout = QVBoxLayout()
|
||||
self.core = shared.legendary_core
|
||||
self.core = shared.core
|
||||
self.signals = shared.signals
|
||||
self.layout.addWidget(QLabel("Account"))
|
||||
username = self.core.lgd.userdata.get("display_name")
|
||||
|
|
|
@ -30,7 +30,7 @@ class SyncSaves(QScrollArea):
|
|||
|
||||
def __init__(self):
|
||||
super(SyncSaves, self).__init__()
|
||||
self.core = shared.legendary_core
|
||||
self.core = shared.core
|
||||
self.signals = shared.signals
|
||||
self.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded)
|
||||
self.load_saves()
|
||||
|
|
|
@ -25,7 +25,7 @@ class DownloadTab(QWidget):
|
|||
|
||||
def __init__(self, updates: list):
|
||||
super(DownloadTab, self).__init__()
|
||||
self.core = shared.legendary_core
|
||||
self.core = shared.core
|
||||
self.layout = QVBoxLayout()
|
||||
self.active_game: Game = None
|
||||
self.analysis = None
|
||||
|
|
|
@ -33,7 +33,7 @@ class GamesTab(QStackedWidget, Ui_GamesTab):
|
|||
def __init__(self):
|
||||
super(GamesTab, self).__init__()
|
||||
self.setupUi(self)
|
||||
self.core = shared.legendary_core
|
||||
self.core = shared.core
|
||||
self.signals = shared.signals
|
||||
self.settings = QSettings()
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ from .game_settings import GameSettings
|
|||
class GameInfoTabs(SideTabWidget):
|
||||
def __init__(self, dlcs: list, parent=None):
|
||||
super(GameInfoTabs, self).__init__(show_back=True, parent=parent)
|
||||
self.core = shared.legendary_core
|
||||
self.core = shared.core
|
||||
self.signals = shared.signals
|
||||
|
||||
self.info = GameInfo(self)
|
||||
|
|
|
@ -22,7 +22,7 @@ class GameDlc(QWidget, Ui_GameDlc):
|
|||
self.available_dlc_scroll.setObjectName("noborder")
|
||||
self.installed_dlc_scroll.setObjectName("noborder")
|
||||
self.signals = shared.signals
|
||||
self.core = shared.legendary_core
|
||||
self.core = shared.core
|
||||
|
||||
self.dlcs = dlcs
|
||||
self.installed_dlc_widgets = list()
|
||||
|
|
|
@ -22,7 +22,7 @@ class GameInfo(QWidget, Ui_GameInfo):
|
|||
def __init__(self, parent):
|
||||
super(GameInfo, self).__init__(parent=parent)
|
||||
self.setupUi(self)
|
||||
self.core = shared.legendary_core
|
||||
self.core = shared.core
|
||||
self.signals = shared.signals
|
||||
|
||||
if platform.system() == "Windows":
|
||||
|
|
|
@ -17,7 +17,7 @@ from rare.utils.utils import get_pixmap
|
|||
class UninstalledInfoTabs(SideTabWidget):
|
||||
def __init__(self, parent=None):
|
||||
super(UninstalledInfoTabs, self).__init__(show_back=True, parent=parent)
|
||||
self.core = shared.legendary_core
|
||||
self.core = shared.core
|
||||
self.signals = shared.signals
|
||||
|
||||
self.info = UninstalledInfo()
|
||||
|
@ -55,7 +55,7 @@ class UninstalledInfo(QWidget, Ui_GameInfo):
|
|||
def __init__(self, parent=None):
|
||||
super(UninstalledInfo, self).__init__(parent=parent)
|
||||
self.setupUi(self)
|
||||
self.core = shared.legendary_core
|
||||
self.core = shared.core
|
||||
self.signals = shared.signals
|
||||
self.install_button.clicked.connect(self.install_game)
|
||||
if platform.system() != "Windows":
|
||||
|
|
|
@ -28,7 +28,7 @@ class BaseInstalledWidget(QGroupBox):
|
|||
super(BaseInstalledWidget, self).__init__()
|
||||
self.igame = igame
|
||||
self.is_origin = is_origin
|
||||
self.core = shared.legendary_core
|
||||
self.core = shared.core
|
||||
if not game:
|
||||
self.game = self.core.get_game(self.igame.app_name)
|
||||
else:
|
||||
|
|
|
@ -23,7 +23,7 @@ class InstalledIconWidget(BaseInstalledWidget):
|
|||
|
||||
self.setContextMenuPolicy(Qt.ActionsContextMenu)
|
||||
self.layout = QVBoxLayout()
|
||||
self.core = shared.legendary_core
|
||||
self.core = shared.core
|
||||
self.running = False
|
||||
self.info_text = ""
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@ class ImportWidget(QWidget):
|
|||
|
||||
def __init__(self):
|
||||
super(ImportWidget, self).__init__()
|
||||
self.core = shared.legendary_core
|
||||
self.core = shared.core
|
||||
self.game_list = [i.app_name for i in self.core.get_game_list()]
|
||||
|
||||
self.main_layout = QHBoxLayout()
|
||||
|
|
|
@ -18,7 +18,7 @@ class DxvkSettings(QGroupBox, Ui_DxvkSettings):
|
|||
self.setupUi(self)
|
||||
|
||||
self.name = name if name is not None else "default"
|
||||
self.core = shared.legendary_core
|
||||
self.core = shared.core
|
||||
|
||||
self.dxvk_options_map = {
|
||||
"devinfo": self.devinfo,
|
||||
|
@ -99,7 +99,7 @@ class DxvkWidget(QGroupBox):
|
|||
|
||||
def __init__(self, name=None):
|
||||
super(DxvkWidget, self).__init__()
|
||||
self.core = shared.legendary_core
|
||||
self.core = shared.core
|
||||
self.setObjectName("settings_widget")
|
||||
self.dxvk_settings = {
|
||||
"fps": [False, "Fps"],
|
||||
|
|
|
@ -17,7 +17,7 @@ class LegendarySettings(QWidget, Ui_LegendarySettings):
|
|||
super(LegendarySettings, self).__init__(parent=parent)
|
||||
self.setupUi(self)
|
||||
|
||||
self.core = shared.legendary_core
|
||||
self.core = shared.core
|
||||
|
||||
# Default installation directory
|
||||
self.install_dir = PathEdit(self.core.get_default_install_dir(),
|
||||
|
|
|
@ -16,7 +16,7 @@ class LinuxSettings(QWidget, Ui_LinuxSettings):
|
|||
self.setupUi(self)
|
||||
|
||||
self.name = name if name is not None else "default"
|
||||
self.core = shared.legendary_core
|
||||
self.core = shared.core
|
||||
|
||||
# Wine prefix
|
||||
self.wine_prefix = PathEdit(self.core.lgd.config.get(self.name, "wine_prefix", fallback=""),
|
||||
|
|
|
@ -26,7 +26,7 @@ class RareSettings(QWidget, Ui_RareSettings):
|
|||
def __init__(self):
|
||||
super(RareSettings, self).__init__()
|
||||
self.setupUi(self)
|
||||
self.core = shared.legendary_core
|
||||
self.core = shared.core
|
||||
# (widget_name, option_name, default)
|
||||
self.checkboxes = [
|
||||
(self.sys_tray, "sys_tray", True),
|
||||
|
|
|
@ -213,7 +213,7 @@ class ShopGameInfo(QWidget, Ui_shop_info):
|
|||
self.wishlist.append(game["offer"]["title"])
|
||||
|
||||
def button_clicked(self):
|
||||
webbrowser.open(f"https://www.epicgames.com/store/{shared.legendary_core.language_code}/p/" + self.slug)
|
||||
webbrowser.open(f"https://www.epicgames.com/store/{shared.core.language_code}/p/" + self.slug)
|
||||
|
||||
|
||||
class SocialButton(QPushButton):
|
||||
|
|
|
@ -47,7 +47,10 @@ class ShopApiCore(QObject):
|
|||
}, lambda data: self._handle_wishlist(data, handle_func))
|
||||
|
||||
def _handle_wishlist(self, data, handle_func):
|
||||
handle_func(data["data"]["Wishlist"]["wishlistItems"]["elements"])
|
||||
try:
|
||||
handle_func(data["data"]["Wishlist"]["wishlistItems"]["elements"])
|
||||
except KeyError:
|
||||
handle_func(None)
|
||||
|
||||
def search_game(self, name, handle_func):
|
||||
payload = {
|
||||
|
|
|
@ -20,7 +20,7 @@ class TabWidget(QTabWidget):
|
|||
def __init__(self, parent):
|
||||
super(TabWidget, self).__init__(parent=parent)
|
||||
disabled_tab = 4 if not shared.args.offline else 1
|
||||
self.core = shared.legendary_core
|
||||
self.core = shared.core
|
||||
self.signals = shared.signals
|
||||
self.setTabBar(TabBar(disabled_tab))
|
||||
# Generate Tabs
|
||||
|
|
|
@ -3,16 +3,16 @@ from argparse import Namespace
|
|||
from legendary.core import LegendaryCore
|
||||
from rare.utils.models import ApiResults, Signals
|
||||
|
||||
legendary_core: LegendaryCore = None
|
||||
core: LegendaryCore = None
|
||||
signals: Signals = None
|
||||
args: Namespace = None
|
||||
api_results: ApiResults = None
|
||||
|
||||
|
||||
def init_legendary():
|
||||
global legendary_core
|
||||
legendary_core = LegendaryCore()
|
||||
return legendary_core
|
||||
global core
|
||||
core = LegendaryCore()
|
||||
return core
|
||||
|
||||
|
||||
def init_signals():
|
||||
|
|
|
@ -17,7 +17,7 @@ class DiscordRPC(QObject):
|
|||
super(DiscordRPC, self).__init__()
|
||||
self.RPC = None
|
||||
self.state = 1 # 0: game, 1: always active, 2: off
|
||||
self.core = shared.legendary_core
|
||||
self.core = shared.core
|
||||
self.signals = shared.signals
|
||||
|
||||
self.settings = QSettings()
|
||||
|
|
Loading…
Reference in a new issue