From 665083c5b56030804e8be9e7e539eee8947c1526 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Wed, 7 Apr 2021 22:39:23 +0200 Subject: [PATCH] lowercase snake case --- Rare/Components/Tabs/Games/GameInfo/__init__.py | 0 .../Components/Tabs/Games/GameWidgets/__init__.py | 0 Rare/Components/Tabs/__init__.py | 0 Rare/Components/__init__.py | 0 Rare/utils/__init__.py | 0 Rare/Main.py => rare/App.py | 12 ++++++------ {Rare => rare}/__init__.py | 2 +- {Rare => rare}/__main__.py | 4 ++-- {Rare/Components => rare/components}/TabUtils.py | 2 +- .../Dialogs/Login => rare/components}/__init__.py | 0 .../components/dialogs}/__init__.py | 0 .../components/dialogs/install_dialog.py | 2 +- .../components/dialogs/launch_dialog.py | 4 ++-- .../components/dialogs/login/__init__.py | 4 ++-- .../components/dialogs/login/browser_login.py | 0 .../components/dialogs/login/import_widget.py | 0 .../components/dialogs/path_input_dialog.py | 2 +- .../components/dialogs/uninstall_dialog.py | 0 .../components/main_window.py | 2 +- .../TabWidget.py => rare/components/tab_widget.py | 12 ++++++------ .../components/tabs/Account/__init__.py | 0 .../components/tabs}/CloudSaves/__init__.py | 6 +++--- .../components/tabs/CloudSaves/sync_widget.py | 2 +- .../components/tabs/Downloads/__init__.py | 8 ++++---- .../components/tabs/Downloads/dl_queue_widget.py | 0 .../components/tabs/Downloads/download_thread.py | 2 +- .../components/tabs/Games/GameInfo/__init__.py | 14 +++++++------- .../tabs/Games/GameInfo/game_settings.py | 6 +++--- .../tabs/Games/GameWidgets}/__init__.py | 0 .../Games/GameWidgets/base_installed_widget.py | 6 +++--- .../Games/GameWidgets/base_uninstalled_widget.py | 4 ++-- .../Games/GameWidgets/installed_icon_widget.py | 6 +++--- .../Games/GameWidgets/installed_list_widget.py | 2 +- .../Games/GameWidgets/uninstalled_icon_widget.py | 6 +++--- .../Games/GameWidgets/uninstalled_list_widget.py | 2 +- .../components/tabs}/Games/__init__.py | 8 ++++---- .../components/tabs/Games/game_list.py | 14 +++++++------- .../components/tabs/Games/import_widget.py | 8 ++++---- .../components/tabs}/Settings/__init__.py | 10 +++++----- .../components/tabs/Settings/about.py | 4 ++-- .../components/tabs/Settings/dxvk.py | 0 .../components/tabs/Settings/legendary.py | 4 ++-- .../components/tabs/Settings/linux.py | 6 +++--- .../components/tabs/Settings/rare.py | 6 +++--- .../components/tabs/Settings/settings_widget.py | 0 .../Account => rare/components/tabs}/__init__.py | 0 .../TrayIcon.py => rare/components/tray_icon.py | 0 {Rare => rare}/languages/de.qm | Bin {Rare => rare}/languages/de.ts | 0 {Rare => rare}/languages/fr.qm | Bin {Rare => rare}/languages/fr.ts | 0 {Rare/Styles => rare/styles}/Logo.png | Bin {Rare/Styles => rare/styles}/RareStyle.qss | 0 {Rare/Styles => rare/styles}/loader.gif | Bin .../Tabs/Downloads => rare/utils}/__init__.py | 0 .../utils/extra_widgets.py | 2 +- .../utils/legendary_utils.py | 0 Rare/utils/Models.py => rare/utils/models.py | 0 {Rare => rare}/utils/utils.py | 2 +- setup.py | 2 +- 60 files changed, 88 insertions(+), 88 deletions(-) delete mode 100644 Rare/Components/Tabs/Games/GameInfo/__init__.py delete mode 100644 Rare/Components/Tabs/Games/GameWidgets/__init__.py delete mode 100644 Rare/Components/Tabs/__init__.py delete mode 100644 Rare/Components/__init__.py delete mode 100644 Rare/utils/__init__.py rename Rare/Main.py => rare/App.py (91%) rename {Rare => rare}/__init__.py (60%) rename {Rare => rare}/__main__.py (69%) rename {Rare/Components => rare/components}/TabUtils.py (95%) rename {Rare/Components/Dialogs/Login => rare/components}/__init__.py (100%) rename {Rare/Components/Dialogs => rare/components/dialogs}/__init__.py (100%) rename Rare/Components/Dialogs/InstallDialog.py => rare/components/dialogs/install_dialog.py (98%) rename Rare/Components/Launch/LaunchDialog.py => rare/components/dialogs/launch_dialog.py (96%) rename Rare/Components/Dialogs/Login/LoginDialog.py => rare/components/dialogs/login/__init__.py (96%) rename Rare/Components/Dialogs/Login/BrowserLogin.py => rare/components/dialogs/login/browser_login.py (100%) rename Rare/Components/Dialogs/Login/ImportWidget.py => rare/components/dialogs/login/import_widget.py (100%) rename Rare/Components/Dialogs/PathInputDialog.py => rare/components/dialogs/path_input_dialog.py (96%) rename Rare/Components/Dialogs/UninstallDialog.py => rare/components/dialogs/uninstall_dialog.py (100%) rename Rare/Components/MainWindow.py => rare/components/main_window.py (94%) rename Rare/Components/TabWidget.py => rare/components/tab_widget.py (86%) rename Rare/Components/Tabs/Account/AccountWidget.py => rare/components/tabs/Account/__init__.py (100%) rename {Rare/Components/Tabs => rare/components/tabs}/CloudSaves/__init__.py (95%) rename Rare/Components/Tabs/CloudSaves/SyncWidget.py => rare/components/tabs/CloudSaves/sync_widget.py (99%) rename Rare/Components/Tabs/Downloads/DownloadTab.py => rare/components/tabs/Downloads/__init__.py (97%) rename Rare/Components/Tabs/Downloads/DlQueueWidget.py => rare/components/tabs/Downloads/dl_queue_widget.py (100%) rename Rare/Components/Tabs/Downloads/DownloadThread.py => rare/components/tabs/Downloads/download_thread.py (98%) rename Rare/Components/Tabs/Games/GameInfo/GameInfo.py => rare/components/tabs/Games/GameInfo/__init__.py (95%) rename Rare/Components/Tabs/Games/GameInfo/GameSettings.py => rare/components/tabs/Games/GameInfo/game_settings.py (98%) rename {Rare/Components/Launch => rare/components/tabs/Games/GameWidgets}/__init__.py (100%) rename Rare/Components/Tabs/Games/GameWidgets/BaseInstalledWidget.py => rare/components/tabs/Games/GameWidgets/base_installed_widget.py (89%) rename Rare/Components/Tabs/Games/GameWidgets/BaseUninstalledWidget.py => rare/components/tabs/Games/GameWidgets/base_uninstalled_widget.py (88%) rename Rare/Components/Tabs/Games/GameWidgets/InstalledIconWidget.py => rare/components/tabs/Games/GameWidgets/installed_icon_widget.py (95%) rename Rare/Components/Tabs/Games/GameWidgets/InstalledListWidget.py => rare/components/tabs/Games/GameWidgets/installed_list_widget.py (96%) rename Rare/Components/Tabs/Games/GameWidgets/UninstalledIconWidget.py => rare/components/tabs/Games/GameWidgets/uninstalled_icon_widget.py (89%) rename Rare/Components/Tabs/Games/GameWidgets/UninstalledListWidget.py => rare/components/tabs/Games/GameWidgets/uninstalled_list_widget.py (93%) rename {Rare/Components/Tabs => rare/components/tabs}/Games/__init__.py (94%) rename Rare/Components/Tabs/Games/GameList.py => rare/components/tabs/Games/game_list.py (93%) rename Rare/Components/Tabs/Games/ImportWidget.py => rare/components/tabs/Games/import_widget.py (96%) rename {Rare/Components/Tabs => rare/components/tabs}/Settings/__init__.py (66%) rename Rare/Components/Tabs/Settings/About.py => rare/components/tabs/Settings/about.py (96%) rename Rare/Components/Tabs/Settings/Dxvk.py => rare/components/tabs/Settings/dxvk.py (100%) rename Rare/Components/Tabs/Settings/Legendary.py => rare/components/tabs/Settings/legendary.py (97%) rename Rare/Components/Tabs/Settings/Linux.py => rare/components/tabs/Settings/linux.py (94%) rename Rare/Components/Tabs/Settings/Rare.py => rare/components/tabs/Settings/rare.py (95%) rename Rare/Components/Tabs/Settings/SettingsWidget.py => rare/components/tabs/Settings/settings_widget.py (100%) rename {Rare/Components/Tabs/Account => rare/components/tabs}/__init__.py (100%) rename Rare/Components/TrayIcon.py => rare/components/tray_icon.py (100%) rename {Rare => rare}/languages/de.qm (100%) rename {Rare => rare}/languages/de.ts (100%) rename {Rare => rare}/languages/fr.qm (100%) rename {Rare => rare}/languages/fr.ts (100%) rename {Rare/Styles => rare/styles}/Logo.png (100%) rename {Rare/Styles => rare/styles}/RareStyle.qss (100%) rename {Rare/Styles => rare/styles}/loader.gif (100%) rename {Rare/Components/Tabs/Downloads => rare/utils}/__init__.py (100%) rename Rare/utils/QtExtensions.py => rare/utils/extra_widgets.py (99%) rename Rare/utils/LegendaryApi.py => rare/utils/legendary_utils.py (100%) rename Rare/utils/Models.py => rare/utils/models.py (100%) rename {Rare => rare}/utils/utils.py (99%) diff --git a/Rare/Components/Tabs/Games/GameInfo/__init__.py b/Rare/Components/Tabs/Games/GameInfo/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/Rare/Components/Tabs/Games/GameWidgets/__init__.py b/Rare/Components/Tabs/Games/GameWidgets/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/Rare/Components/Tabs/__init__.py b/Rare/Components/Tabs/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/Rare/Components/__init__.py b/Rare/Components/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/Rare/utils/__init__.py b/Rare/utils/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/Rare/Main.py b/rare/App.py similarity index 91% rename from Rare/Main.py rename to rare/App.py index a4283de4..98d9e389 100644 --- a/Rare/Main.py +++ b/rare/App.py @@ -8,11 +8,11 @@ from PyQt5.QtCore import QSettings, QTranslator from PyQt5.QtGui import QIcon from PyQt5.QtWidgets import QApplication, QSystemTrayIcon -from Rare import lang_path, style_path -from Rare.Components.Launch.LaunchDialog import LaunchDialog -from Rare.Components.MainWindow import MainWindow -from Rare.Components.TrayIcon import TrayIcon -from Rare.utils.utils import get_lang +from rare import lang_path, style_path +from rare.components.dialogs.launch_dialog import LaunchDialog +from rare.components.main_window import MainWindow +from rare.components.tray_icon import TrayIcon +from rare.utils.utils import get_lang from custom_legendary.core import LegendaryCore start_time = time.strftime('%y-%m-%d--%H:%M') # year-month-day-hour-minute @@ -44,7 +44,7 @@ class App(QApplication): with open(os.path.join(path, "config.ini"), "w") as config_file: config_file.write("[Legendary]") self.core = LegendaryCore() - if not "Legendary" in self.core.lgd.config.sections(): + if "Legendary" not in self.core.lgd.config.sections(): self.core.lgd.config.add_section("Legendary") self.core.lgd.save_config() diff --git a/Rare/__init__.py b/rare/__init__.py similarity index 60% rename from Rare/__init__.py rename to rare/__init__.py index 4b051139..a54b4960 100644 --- a/Rare/__init__.py +++ b/rare/__init__.py @@ -1,5 +1,5 @@ import os __version__ = "0.9.9" -style_path = os.path.join(os.path.dirname(__file__), "Styles/") +style_path = os.path.join(os.path.dirname(__file__), "styles/") lang_path = os.path.join(os.path.dirname(__file__), "languages/") diff --git a/Rare/__main__.py b/rare/__main__.py similarity index 69% rename from Rare/__main__.py rename to rare/__main__.py index 209f7c10..ece40fba 100644 --- a/Rare/__main__.py +++ b/rare/__main__.py @@ -3,12 +3,12 @@ import sys def main(): if "--version" in sys.argv: - from Rare import __version__ + from rare import __version__ print(__version__) exit(0) - from Rare.Main import start + from rare.App import start start() diff --git a/Rare/Components/TabUtils.py b/rare/components/TabUtils.py similarity index 95% rename from Rare/Components/TabUtils.py rename to rare/components/TabUtils.py index ad15aeb1..03ef7d41 100644 --- a/Rare/Components/TabUtils.py +++ b/rare/components/TabUtils.py @@ -3,7 +3,7 @@ from PyQt5.QtGui import QFont from PyQt5.QtWidgets import QTabBar, QToolButton, QMenu, QWidgetAction from qtawesome import icon -from Rare.Components.Tabs.Account.AccountWidget import MiniWidget +from rare.components.tabs.Account import MiniWidget class TabBar(QTabBar): diff --git a/Rare/Components/Dialogs/Login/__init__.py b/rare/components/__init__.py similarity index 100% rename from Rare/Components/Dialogs/Login/__init__.py rename to rare/components/__init__.py diff --git a/Rare/Components/Dialogs/__init__.py b/rare/components/dialogs/__init__.py similarity index 100% rename from Rare/Components/Dialogs/__init__.py rename to rare/components/dialogs/__init__.py diff --git a/Rare/Components/Dialogs/InstallDialog.py b/rare/components/dialogs/install_dialog.py similarity index 98% rename from Rare/Components/Dialogs/InstallDialog.py rename to rare/components/dialogs/install_dialog.py index e0705dcb..bb9c4e0d 100644 --- a/Rare/Components/Dialogs/InstallDialog.py +++ b/rare/components/dialogs/install_dialog.py @@ -3,7 +3,7 @@ import os from PyQt5.QtWidgets import QDialog, QFormLayout, QVBoxLayout, QSpinBox, QFileDialog, QLabel, QPushButton, QHBoxLayout, \ QCheckBox -from Rare.utils.QtExtensions import PathEdit +from rare.utils.extra_widgets import PathEdit from custom_legendary.core import LegendaryCore diff --git a/Rare/Components/Launch/LaunchDialog.py b/rare/components/dialogs/launch_dialog.py similarity index 96% rename from Rare/Components/Launch/LaunchDialog.py rename to rare/components/dialogs/launch_dialog.py index 502db0d4..3ecf2d51 100644 --- a/Rare/Components/Launch/LaunchDialog.py +++ b/rare/components/dialogs/launch_dialog.py @@ -3,8 +3,8 @@ from logging import getLogger from PyQt5.QtCore import QThread, pyqtSignal from PyQt5.QtWidgets import QDialog, QLabel, QProgressBar, QVBoxLayout -from Rare.Components.Dialogs.Login.LoginDialog import LoginDialog -from Rare.utils.utils import download_images +from rare.components.dialogs.login import LoginDialog +from rare.utils.utils import download_images from custom_legendary.core import LegendaryCore logger = getLogger("Login") diff --git a/Rare/Components/Dialogs/Login/LoginDialog.py b/rare/components/dialogs/login/__init__.py similarity index 96% rename from Rare/Components/Dialogs/Login/LoginDialog.py rename to rare/components/dialogs/login/__init__.py index 0ce302f3..9951aad1 100644 --- a/Rare/Components/Dialogs/Login/LoginDialog.py +++ b/rare/components/dialogs/login/__init__.py @@ -1,8 +1,8 @@ from PyQt5.QtWidgets import QDialog, QVBoxLayout, QLabel, QStackedLayout, QWidget, QPushButton # Login Opportunities: Browser, Import -from Rare.Components.Dialogs.Login.BrowserLogin import BrowserLogin -from Rare.Components.Dialogs.Login.ImportWidget import ImportWidget +from rare.components.dialogs.login.browser_login import BrowserLogin +from rare.components.dialogs.login.import_widget import ImportWidget from custom_legendary.core import LegendaryCore diff --git a/Rare/Components/Dialogs/Login/BrowserLogin.py b/rare/components/dialogs/login/browser_login.py similarity index 100% rename from Rare/Components/Dialogs/Login/BrowserLogin.py rename to rare/components/dialogs/login/browser_login.py diff --git a/Rare/Components/Dialogs/Login/ImportWidget.py b/rare/components/dialogs/login/import_widget.py similarity index 100% rename from Rare/Components/Dialogs/Login/ImportWidget.py rename to rare/components/dialogs/login/import_widget.py diff --git a/Rare/Components/Dialogs/PathInputDialog.py b/rare/components/dialogs/path_input_dialog.py similarity index 96% rename from Rare/Components/Dialogs/PathInputDialog.py rename to rare/components/dialogs/path_input_dialog.py index 8f925110..44ba05fa 100644 --- a/Rare/Components/Dialogs/PathInputDialog.py +++ b/rare/components/dialogs/path_input_dialog.py @@ -1,6 +1,6 @@ from PyQt5.QtWidgets import QHBoxLayout, QPushButton, QVBoxLayout, QLabel, QDialog, QFileDialog -from Rare.utils.QtExtensions import PathEdit +from rare.utils.extra_widgets import PathEdit class PathInputDialog(QDialog): diff --git a/Rare/Components/Dialogs/UninstallDialog.py b/rare/components/dialogs/uninstall_dialog.py similarity index 100% rename from Rare/Components/Dialogs/UninstallDialog.py rename to rare/components/dialogs/uninstall_dialog.py diff --git a/Rare/Components/MainWindow.py b/rare/components/main_window.py similarity index 94% rename from Rare/Components/MainWindow.py rename to rare/components/main_window.py index d22c9ea9..c1585f97 100644 --- a/Rare/Components/MainWindow.py +++ b/rare/components/main_window.py @@ -2,7 +2,7 @@ from PyQt5.QtCore import QSettings from PyQt5.QtGui import QCloseEvent from PyQt5.QtWidgets import QMainWindow, QMessageBox -from Rare.Components.TabWidget import TabWidget +from rare.components.tab_widget import TabWidget class MainWindow(QMainWindow): diff --git a/Rare/Components/TabWidget.py b/rare/components/tab_widget.py similarity index 86% rename from Rare/Components/TabWidget.py rename to rare/components/tab_widget.py index 26b5adab..4e28f623 100644 --- a/Rare/Components/TabWidget.py +++ b/rare/components/tab_widget.py @@ -2,12 +2,12 @@ from PyQt5.QtCore import QSize from PyQt5.QtWidgets import QTabWidget, QWidget from qtawesome import icon -from Rare.Components.TabUtils import TabBar, TabButtonWidget -from Rare.Components.Tabs.CloudSaves import SyncSaves -from Rare.Components.Tabs.Downloads.DownloadTab import DownloadTab -from Rare.Components.Tabs.Games import GameTab -from Rare.Components.Tabs.Settings import SettingsTab -from Rare.utils.Models import InstallOptions +from rare.components.TabUtils import TabBar, TabButtonWidget +from rare.components.tabs.CloudSaves import SyncSaves +from rare.components.tabs.Downloads.__init__ import DownloadTab +from rare.components.tabs.Games import GameTab +from rare.components.tabs.Settings import SettingsTab +from rare.utils.models import InstallOptions from custom_legendary.core import LegendaryCore diff --git a/Rare/Components/Tabs/Account/AccountWidget.py b/rare/components/tabs/Account/__init__.py similarity index 100% rename from Rare/Components/Tabs/Account/AccountWidget.py rename to rare/components/tabs/Account/__init__.py diff --git a/Rare/Components/Tabs/CloudSaves/__init__.py b/rare/components/tabs/CloudSaves/__init__.py similarity index 95% rename from Rare/Components/Tabs/CloudSaves/__init__.py rename to rare/components/tabs/CloudSaves/__init__.py index 9dc45abb..76d96b60 100644 --- a/Rare/Components/Tabs/CloudSaves/__init__.py +++ b/rare/components/tabs/CloudSaves/__init__.py @@ -3,9 +3,9 @@ from logging import getLogger from PyQt5.QtCore import QThread, pyqtSignal, Qt from PyQt5.QtWidgets import * -from Rare.Components.Dialogs.PathInputDialog import PathInputDialog -from Rare.Components.Tabs.CloudSaves.SyncWidget import SyncWidget -from Rare.utils.QtExtensions import WaitingSpinner +from rare.components.dialogs.path_input_dialog import PathInputDialog +from rare.components.tabs.CloudSaves.sync_widget import SyncWidget +from rare.utils.extra_widgets import WaitingSpinner from custom_legendary.core import LegendaryCore from custom_legendary.models.game import SaveGameStatus diff --git a/Rare/Components/Tabs/CloudSaves/SyncWidget.py b/rare/components/tabs/CloudSaves/sync_widget.py similarity index 99% rename from Rare/Components/Tabs/CloudSaves/SyncWidget.py rename to rare/components/tabs/CloudSaves/sync_widget.py index 1f24795c..23978586 100644 --- a/Rare/Components/Tabs/CloudSaves/SyncWidget.py +++ b/rare/components/tabs/CloudSaves/sync_widget.py @@ -4,7 +4,7 @@ from logging import getLogger from PyQt5.QtCore import QThread, pyqtSignal, Qt from PyQt5.QtWidgets import QVBoxLayout, QPushButton, QHBoxLayout, QLabel, QGroupBox -from Rare.Components.Dialogs.PathInputDialog import PathInputDialog +from rare.components.dialogs.path_input_dialog import PathInputDialog from custom_legendary.core import LegendaryCore from custom_legendary.models.game import InstalledGame, SaveGameStatus diff --git a/Rare/Components/Tabs/Downloads/DownloadTab.py b/rare/components/tabs/Downloads/__init__.py similarity index 97% rename from Rare/Components/Tabs/Downloads/DownloadTab.py rename to rare/components/tabs/Downloads/__init__.py index 5da62057..4615dc7b 100644 --- a/Rare/Components/Tabs/Downloads/DownloadTab.py +++ b/rare/components/tabs/Downloads/__init__.py @@ -6,10 +6,10 @@ from PyQt5.QtCore import QThread, pyqtSignal, Qt from PyQt5.QtWidgets import QWidget, QMessageBox, QVBoxLayout, QLabel, QGridLayout, QProgressBar, QPushButton, QDialog, \ QListWidget, QHBoxLayout, QGroupBox -from Rare.Components.Dialogs.InstallDialog import InstallInfoDialog, InstallDialog -from Rare.Components.Tabs.Downloads.DlQueueWidget import DlQueueWidget -from Rare.Components.Tabs.Downloads.DownloadThread import DownloadThread -from Rare.utils.Models import InstallOptions +from rare.components.dialogs.install_dialog import InstallInfoDialog, InstallDialog +from rare.components.tabs.Downloads.dl_queue_widget import DlQueueWidget +from rare.components.tabs.Downloads.download_thread import DownloadThread +from rare.utils.models import InstallOptions from custom_legendary.core import LegendaryCore from custom_legendary.models.downloading import UIUpdate from custom_legendary.models.game import Game, InstalledGame diff --git a/Rare/Components/Tabs/Downloads/DlQueueWidget.py b/rare/components/tabs/Downloads/dl_queue_widget.py similarity index 100% rename from Rare/Components/Tabs/Downloads/DlQueueWidget.py rename to rare/components/tabs/Downloads/dl_queue_widget.py diff --git a/Rare/Components/Tabs/Downloads/DownloadThread.py b/rare/components/tabs/Downloads/download_thread.py similarity index 98% rename from Rare/Components/Tabs/Downloads/DownloadThread.py rename to rare/components/tabs/Downloads/download_thread.py index 3fce81ad..026dbbd4 100644 --- a/Rare/Components/Tabs/Downloads/DownloadThread.py +++ b/rare/components/tabs/Downloads/download_thread.py @@ -8,7 +8,7 @@ from multiprocessing import Queue as MPQueue from PyQt5.QtCore import QThread, pyqtSignal from PyQt5.QtWidgets import QMessageBox -from Rare.utils.Models import KillDownloadException +from rare.utils.models import KillDownloadException from custom_legendary.core import LegendaryCore from custom_legendary.downloader.manager import DLManager diff --git a/Rare/Components/Tabs/Games/GameInfo/GameInfo.py b/rare/components/tabs/Games/GameInfo/__init__.py similarity index 95% rename from Rare/Components/Tabs/Games/GameInfo/GameInfo.py rename to rare/components/tabs/Games/GameInfo/__init__.py index b67c64e8..d04fe17e 100644 --- a/Rare/Components/Tabs/Games/GameInfo/GameInfo.py +++ b/rare/components/tabs/Games/GameInfo/__init__.py @@ -6,12 +6,12 @@ from PyQt5.QtWidgets import QWidget, QPushButton, QVBoxLayout, QLabel, QHBoxLayo QProgressBar, QStackedWidget, QGroupBox from qtawesome import icon -from Rare.Components.Dialogs.UninstallDialog import UninstallDialog -from Rare.Components.Tabs.Games.GameInfo.GameSettings import GameSettings -from Rare.utils import LegendaryApi -from Rare.utils.LegendaryApi import VerifyThread -from Rare.utils.QtExtensions import SideTabBar -from Rare.utils.utils import IMAGE_DIR +from rare.components.dialogs.uninstall_dialog import UninstallDialog +from rare.components.tabs.Games.GameInfo.game_settings import GameSettings +from rare.utils import legendary_utils +from rare.utils.legendary_utils import VerifyThread +from rare.utils.extra_widgets import SideTabBar +from rare.utils.utils import IMAGE_DIR from custom_legendary.core import LegendaryCore from custom_legendary.models.game import InstalledGame, Game @@ -104,7 +104,7 @@ class GameInfo(QWidget): print("Cancel Uninstall") return - LegendaryApi.uninstall(self.game.app_name, self.core, infos) + legendary_utils.uninstall(self.game.app_name, self.core, infos) self.update_list.emit() def repair(self): diff --git a/Rare/Components/Tabs/Games/GameInfo/GameSettings.py b/rare/components/tabs/Games/GameInfo/game_settings.py similarity index 98% rename from Rare/Components/Tabs/Games/GameInfo/GameSettings.py rename to rare/components/tabs/Games/GameInfo/game_settings.py index 4f9cbb0f..6cc02832 100644 --- a/Rare/Components/Tabs/Games/GameInfo/GameSettings.py +++ b/rare/components/tabs/Games/GameInfo/game_settings.py @@ -2,9 +2,9 @@ import os from PyQt5.QtWidgets import QWidget, QLabel, QVBoxLayout, QComboBox, QFileDialog, QPushButton, QMessageBox, QLineEdit -from Rare.Components.Tabs.Settings.Linux import LinuxSettings -from Rare.Components.Tabs.Settings.SettingsWidget import SettingsWidget -from Rare.utils.QtExtensions import PathEdit +from rare.components.tabs.Settings.linux import LinuxSettings +from rare.components.tabs.Settings.settings_widget import SettingsWidget +from rare.utils.extra_widgets import PathEdit from custom_legendary.core import LegendaryCore from custom_legendary.models.game import InstalledGame, Game diff --git a/Rare/Components/Launch/__init__.py b/rare/components/tabs/Games/GameWidgets/__init__.py similarity index 100% rename from Rare/Components/Launch/__init__.py rename to rare/components/tabs/Games/GameWidgets/__init__.py diff --git a/Rare/Components/Tabs/Games/GameWidgets/BaseInstalledWidget.py b/rare/components/tabs/Games/GameWidgets/base_installed_widget.py similarity index 89% rename from Rare/Components/Tabs/Games/GameWidgets/BaseInstalledWidget.py rename to rare/components/tabs/Games/GameWidgets/base_installed_widget.py index 3a654610..cd27deaa 100644 --- a/Rare/Components/Tabs/Games/GameWidgets/BaseInstalledWidget.py +++ b/rare/components/tabs/Games/GameWidgets/base_installed_widget.py @@ -3,7 +3,7 @@ from logging import getLogger from PyQt5.QtCore import pyqtSignal, QProcess, QSettings from PyQt5.QtWidgets import QGroupBox, QMessageBox -from Rare.utils import LegendaryApi +from rare.utils import legendary_utils from custom_legendary.core import LegendaryCore from custom_legendary.models.game import InstalledGame @@ -38,8 +38,8 @@ class BaseInstalledWidget(QGroupBox): logger.info("Cancel Startup") return 1 logger.info("Launching " + self.igame.title) - self.proc, params = LegendaryApi.launch_game(self.core, self.igame.app_name, offline, - skip_version_check=skip_version_check) + self.proc, params = legendary_utils.launch_game(self.core, self.igame.app_name, offline, + skip_version_check=skip_version_check) if not self.proc: logger.error("Could not start process") return 1 diff --git a/Rare/Components/Tabs/Games/GameWidgets/BaseUninstalledWidget.py b/rare/components/tabs/Games/GameWidgets/base_uninstalled_widget.py similarity index 88% rename from Rare/Components/Tabs/Games/GameWidgets/BaseUninstalledWidget.py rename to rare/components/tabs/Games/GameWidgets/base_uninstalled_widget.py index 74804e51..919b2267 100644 --- a/Rare/Components/Tabs/Games/GameWidgets/BaseUninstalledWidget.py +++ b/rare/components/tabs/Games/GameWidgets/base_uninstalled_widget.py @@ -3,8 +3,8 @@ from logging import getLogger from PyQt5.QtCore import pyqtSignal from PyQt5.QtWidgets import QWidget, QGroupBox -from Rare.Components.Dialogs.InstallDialog import InstallDialog -from Rare.utils.Models import InstallOptions +from rare.components.dialogs.install_dialog import InstallDialog +from rare.utils.models import InstallOptions logger = getLogger("Uninstalled") diff --git a/Rare/Components/Tabs/Games/GameWidgets/InstalledIconWidget.py b/rare/components/tabs/Games/GameWidgets/installed_icon_widget.py similarity index 95% rename from Rare/Components/Tabs/Games/GameWidgets/InstalledIconWidget.py rename to rare/components/tabs/Games/GameWidgets/installed_icon_widget.py index 85f511fe..b99e467b 100644 --- a/Rare/Components/Tabs/Games/GameWidgets/InstalledIconWidget.py +++ b/rare/components/tabs/Games/GameWidgets/installed_icon_widget.py @@ -6,9 +6,9 @@ from PyQt5.QtGui import QMouseEvent from PyQt5.QtWidgets import * from qtawesome import icon -from Rare.Components.Tabs.Games.GameWidgets.BaseInstalledWidget import BaseInstalledWidget -from Rare.utils import LegendaryApi -from Rare.utils.QtExtensions import ClickableLabel +from rare.components.tabs.Games.GameWidgets.base_installed_widget import BaseInstalledWidget +from rare.utils import legendary_utils +from rare.utils.extra_widgets import ClickableLabel from custom_legendary.core import LegendaryCore from custom_legendary.models.game import InstalledGame diff --git a/Rare/Components/Tabs/Games/GameWidgets/InstalledListWidget.py b/rare/components/tabs/Games/GameWidgets/installed_list_widget.py similarity index 96% rename from Rare/Components/Tabs/Games/GameWidgets/InstalledListWidget.py rename to rare/components/tabs/Games/GameWidgets/installed_list_widget.py index c25b634f..47a46905 100644 --- a/Rare/Components/Tabs/Games/GameWidgets/InstalledListWidget.py +++ b/rare/components/tabs/Games/GameWidgets/installed_list_widget.py @@ -5,7 +5,7 @@ from PyQt5.QtCore import QProcess, pyqtSignal, Qt from PyQt5.QtWidgets import QHBoxLayout, QLabel, QPushButton, QStyle, QVBoxLayout from qtawesome import icon -from Rare.Components.Tabs.Games.GameWidgets.BaseInstalledWidget import BaseInstalledWidget +from rare.components.tabs.Games.GameWidgets.base_installed_widget import BaseInstalledWidget from custom_legendary.core import LegendaryCore from custom_legendary.models.game import InstalledGame diff --git a/Rare/Components/Tabs/Games/GameWidgets/UninstalledIconWidget.py b/rare/components/tabs/Games/GameWidgets/uninstalled_icon_widget.py similarity index 89% rename from Rare/Components/Tabs/Games/GameWidgets/UninstalledIconWidget.py rename to rare/components/tabs/Games/GameWidgets/uninstalled_icon_widget.py index 32131581..fa7a907f 100644 --- a/Rare/Components/Tabs/Games/GameWidgets/UninstalledIconWidget.py +++ b/rare/components/tabs/Games/GameWidgets/uninstalled_icon_widget.py @@ -3,9 +3,9 @@ from logging import getLogger from PyQt5.QtCore import pyqtSignal from PyQt5.QtWidgets import QVBoxLayout, QLabel -from Rare.Components.Tabs.Games.GameWidgets.BaseUninstalledWidget import BaseUninstalledWidget -from Rare.utils.Models import InstallOptions -from Rare.utils.QtExtensions import ClickableLabel +from rare.components.tabs.Games.GameWidgets.base_uninstalled_widget import BaseUninstalledWidget +from rare.utils.models import InstallOptions +from rare.utils.extra_widgets import ClickableLabel from custom_legendary.core import LegendaryCore from custom_legendary.models.game import Game diff --git a/Rare/Components/Tabs/Games/GameWidgets/UninstalledListWidget.py b/rare/components/tabs/Games/GameWidgets/uninstalled_list_widget.py similarity index 93% rename from Rare/Components/Tabs/Games/GameWidgets/UninstalledListWidget.py rename to rare/components/tabs/Games/GameWidgets/uninstalled_list_widget.py index 130f39be..f01df0c0 100644 --- a/Rare/Components/Tabs/Games/GameWidgets/UninstalledListWidget.py +++ b/rare/components/tabs/Games/GameWidgets/uninstalled_list_widget.py @@ -2,7 +2,7 @@ from logging import getLogger from PyQt5.QtWidgets import QLabel, QHBoxLayout, QVBoxLayout, QPushButton -from Rare.Components.Tabs.Games.GameWidgets.BaseUninstalledWidget import BaseUninstalledWidget +from rare.components.tabs.Games.GameWidgets.base_uninstalled_widget import BaseUninstalledWidget from custom_legendary.core import LegendaryCore logger = getLogger("Game") diff --git a/Rare/Components/Tabs/Games/__init__.py b/rare/components/tabs/Games/__init__.py similarity index 94% rename from Rare/Components/Tabs/Games/__init__.py rename to rare/components/tabs/Games/__init__.py index 08ab89cf..20e8da51 100644 --- a/Rare/Components/Tabs/Games/__init__.py +++ b/rare/components/tabs/Games/__init__.py @@ -2,10 +2,10 @@ from PyQt5.QtCore import QSettings, QSize from PyQt5.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QCheckBox, QLineEdit, QPushButton, QStackedLayout, QLabel from qtawesome import icon -from Rare.Components.Tabs.Games.GameInfo.GameInfo import InfoTabs -from Rare.Components.Tabs.Games.GameList import GameList -from Rare.Components.Tabs.Games.ImportWidget import ImportWidget -from Rare.utils.QtExtensions import SelectViewWidget +from rare.components.tabs.Games.GameInfo import InfoTabs +from rare.components.tabs.Games.game_list import GameList +from rare.components.tabs.Games.import_widget import ImportWidget +from rare.utils.extra_widgets import SelectViewWidget class GameTab(QWidget): diff --git a/Rare/Components/Tabs/Games/GameList.py b/rare/components/tabs/Games/game_list.py similarity index 93% rename from Rare/Components/Tabs/Games/GameList.py rename to rare/components/tabs/Games/game_list.py index 884e3788..d2b697c4 100644 --- a/Rare/Components/Tabs/Games/GameList.py +++ b/rare/components/tabs/Games/game_list.py @@ -5,13 +5,13 @@ from PyQt5.QtCore import Qt, pyqtSignal, QSettings from PyQt5.QtGui import QPixmap from PyQt5.QtWidgets import * -from Rare.Components.Tabs.Games.GameWidgets.InstalledIconWidget import GameWidgetInstalled -from Rare.Components.Tabs.Games.GameWidgets.InstalledListWidget import InstalledListWidget -from Rare.Components.Tabs.Games.GameWidgets.UninstalledIconWidget import IconWidgetUninstalled -from Rare.Components.Tabs.Games.GameWidgets.UninstalledListWidget import ListWidgetUninstalled -from Rare.utils.Models import InstallOptions -from Rare.utils.QtExtensions import FlowLayout -from Rare.utils.utils import download_image +from rare.components.tabs.Games.GameWidgets.installed_icon_widget import GameWidgetInstalled +from rare.components.tabs.Games.GameWidgets.installed_list_widget import InstalledListWidget +from rare.components.tabs.Games.GameWidgets.uninstalled_icon_widget import IconWidgetUninstalled +from rare.components.tabs.Games.GameWidgets.uninstalled_list_widget import ListWidgetUninstalled +from rare.utils.models import InstallOptions +from rare.utils.extra_widgets import FlowLayout +from rare.utils.utils import download_image from custom_legendary.core import LegendaryCore logger = getLogger("Game list") diff --git a/Rare/Components/Tabs/Games/ImportWidget.py b/rare/components/tabs/Games/import_widget.py similarity index 96% rename from Rare/Components/Tabs/Games/ImportWidget.py rename to rare/components/tabs/Games/import_widget.py index a4c149a6..73409066 100644 --- a/Rare/Components/Tabs/Games/ImportWidget.py +++ b/rare/components/tabs/Games/import_widget.py @@ -8,8 +8,8 @@ from PyQt5.QtWidgets import QWidget, QLabel, QHBoxLayout, QPushButton, QVBoxLayo QGroupBox from qtawesome import icon -from Rare.utils import LegendaryApi -from Rare.utils.QtExtensions import PathEdit +from rare.utils import legendary_utils +from rare.utils.extra_widgets import PathEdit from custom_legendary.core import LegendaryCore logger = getLogger("Import") @@ -118,7 +118,7 @@ class ImportWidget(QWidget): self.info_label.setText(self.tr("Could not find app name")) return - if LegendaryApi.import_game(self.core, app_name=app_name, path=path): + if legendary_utils.import_game(self.core, app_name=app_name, path=path): self.info_label.setText(self.tr("Successfully imported {}. Reload library").format(self.core.get_installed_game(app_name).title)) self.app_name_input.setText("") @@ -145,7 +145,7 @@ class ImportWidget(QWidget): logger.warning("Could not find app name at " + game_path) continue - if LegendaryApi.import_game(self.core, app_name, game_path + path): + if legendary_utils.import_game(self.core, app_name, game_path + path): imported += 1 return imported diff --git a/Rare/Components/Tabs/Settings/__init__.py b/rare/components/tabs/Settings/__init__.py similarity index 66% rename from Rare/Components/Tabs/Settings/__init__.py rename to rare/components/tabs/Settings/__init__.py index 6674fb52..adb15fda 100644 --- a/Rare/Components/Tabs/Settings/__init__.py +++ b/rare/components/tabs/Settings/__init__.py @@ -2,11 +2,11 @@ import os from PyQt5.QtWidgets import QTabWidget -from Rare.Components.Tabs.Settings.About import About -from Rare.Components.Tabs.Settings.Legendary import LegendarySettings -from Rare.Components.Tabs.Settings.Linux import LinuxSettings -from Rare.Components.Tabs.Settings.Rare import RareSettings -from Rare.utils.QtExtensions import SideTabBar +from rare.components.tabs.Settings.about import About +from rare.components.tabs.Settings.legendary import LegendarySettings +from rare.components.tabs.Settings.linux import LinuxSettings +from rare.components.tabs.Settings.rare import RareSettings +from rare.utils.extra_widgets import SideTabBar class SettingsTab(QTabWidget): diff --git a/Rare/Components/Tabs/Settings/About.py b/rare/components/tabs/Settings/about.py similarity index 96% rename from Rare/Components/Tabs/Settings/About.py rename to rare/components/tabs/Settings/about.py index 4e9592da..15b9793c 100644 --- a/Rare/Components/Tabs/Settings/About.py +++ b/rare/components/tabs/Settings/about.py @@ -2,8 +2,8 @@ import webbrowser from PyQt5.QtWidgets import QWidget, QVBoxLayout, QLabel, QPushButton -from Rare import __version__ -from Rare.utils.utils import get_latest_version +from rare import __version__ +from rare.utils.utils import get_latest_version class About(QWidget): diff --git a/Rare/Components/Tabs/Settings/Dxvk.py b/rare/components/tabs/Settings/dxvk.py similarity index 100% rename from Rare/Components/Tabs/Settings/Dxvk.py rename to rare/components/tabs/Settings/dxvk.py diff --git a/Rare/Components/Tabs/Settings/Legendary.py b/rare/components/tabs/Settings/legendary.py similarity index 97% rename from Rare/Components/Tabs/Settings/Legendary.py rename to rare/components/tabs/Settings/legendary.py index 6046e677..b7463c01 100644 --- a/Rare/Components/Tabs/Settings/Legendary.py +++ b/rare/components/tabs/Settings/legendary.py @@ -3,8 +3,8 @@ from logging import getLogger from PyQt5.QtGui import QIntValidator from PyQt5.QtWidgets import QWidget, QVBoxLayout, QLabel, QFileDialog, QPushButton, QLineEdit, QGroupBox, QMessageBox -from Rare.Components.Tabs.Settings.SettingsWidget import SettingsWidget -from Rare.utils.QtExtensions import PathEdit +from rare.components.tabs.Settings.settings_widget import SettingsWidget +from rare.utils.extra_widgets import PathEdit from custom_legendary.core import LegendaryCore logger = getLogger("LegendarySettings") diff --git a/Rare/Components/Tabs/Settings/Linux.py b/rare/components/tabs/Settings/linux.py similarity index 94% rename from Rare/Components/Tabs/Settings/Linux.py rename to rare/components/tabs/Settings/linux.py index fa8286a5..2cddbe66 100644 --- a/Rare/Components/Tabs/Settings/Linux.py +++ b/rare/components/tabs/Settings/linux.py @@ -2,9 +2,9 @@ from logging import getLogger from PyQt5.QtWidgets import QWidget, QVBoxLayout, QLabel, QPushButton, QFileDialog, QLineEdit, QGroupBox -from Rare.Components.Tabs.Settings.Dxvk import DxvkWidget -from Rare.Components.Tabs.Settings.SettingsWidget import SettingsWidget -from Rare.utils.QtExtensions import PathEdit +from rare.components.tabs.Settings.dxvk import DxvkWidget +from rare.components.tabs.Settings.settings_widget import SettingsWidget +from rare.utils.extra_widgets import PathEdit from custom_legendary.core import LegendaryCore logger = getLogger("LinuxSettings") diff --git a/Rare/Components/Tabs/Settings/Rare.py b/rare/components/tabs/Settings/rare.py similarity index 95% rename from Rare/Components/Tabs/Settings/Rare.py rename to rare/components/tabs/Settings/rare.py index b586f531..6f0f9ecf 100644 --- a/Rare/Components/Tabs/Settings/Rare.py +++ b/rare/components/tabs/Settings/rare.py @@ -5,9 +5,9 @@ from logging import getLogger from PyQt5.QtCore import QSettings from PyQt5.QtWidgets import QVBoxLayout, QFileDialog, QComboBox, QPushButton, QCheckBox, QGroupBox -from Rare.Components.Tabs.Settings.SettingsWidget import SettingsWidget -from Rare.utils.QtExtensions import PathEdit -from Rare.utils.utils import get_lang, get_possible_langs +from rare.components.tabs.Settings.settings_widget import SettingsWidget +from rare.utils.extra_widgets import PathEdit +from rare.utils.utils import get_lang, get_possible_langs logger = getLogger("RareSettings") diff --git a/Rare/Components/Tabs/Settings/SettingsWidget.py b/rare/components/tabs/Settings/settings_widget.py similarity index 100% rename from Rare/Components/Tabs/Settings/SettingsWidget.py rename to rare/components/tabs/Settings/settings_widget.py diff --git a/Rare/Components/Tabs/Account/__init__.py b/rare/components/tabs/__init__.py similarity index 100% rename from Rare/Components/Tabs/Account/__init__.py rename to rare/components/tabs/__init__.py diff --git a/Rare/Components/TrayIcon.py b/rare/components/tray_icon.py similarity index 100% rename from Rare/Components/TrayIcon.py rename to rare/components/tray_icon.py diff --git a/Rare/languages/de.qm b/rare/languages/de.qm similarity index 100% rename from Rare/languages/de.qm rename to rare/languages/de.qm diff --git a/Rare/languages/de.ts b/rare/languages/de.ts similarity index 100% rename from Rare/languages/de.ts rename to rare/languages/de.ts diff --git a/Rare/languages/fr.qm b/rare/languages/fr.qm similarity index 100% rename from Rare/languages/fr.qm rename to rare/languages/fr.qm diff --git a/Rare/languages/fr.ts b/rare/languages/fr.ts similarity index 100% rename from Rare/languages/fr.ts rename to rare/languages/fr.ts diff --git a/Rare/Styles/Logo.png b/rare/styles/Logo.png similarity index 100% rename from Rare/Styles/Logo.png rename to rare/styles/Logo.png diff --git a/Rare/Styles/RareStyle.qss b/rare/styles/RareStyle.qss similarity index 100% rename from Rare/Styles/RareStyle.qss rename to rare/styles/RareStyle.qss diff --git a/Rare/Styles/loader.gif b/rare/styles/loader.gif similarity index 100% rename from Rare/Styles/loader.gif rename to rare/styles/loader.gif diff --git a/Rare/Components/Tabs/Downloads/__init__.py b/rare/utils/__init__.py similarity index 100% rename from Rare/Components/Tabs/Downloads/__init__.py rename to rare/utils/__init__.py diff --git a/Rare/utils/QtExtensions.py b/rare/utils/extra_widgets.py similarity index 99% rename from Rare/utils/QtExtensions.py rename to rare/utils/extra_widgets.py index e3ef073a..eb8d70ba 100644 --- a/Rare/utils/QtExtensions.py +++ b/rare/utils/extra_widgets.py @@ -6,7 +6,7 @@ from PyQt5.QtWidgets import QLayout, QStyle, QSizePolicy, QLabel, QFileDialog, Q QPushButton, QStyleOptionTab, QStylePainter, QTabBar from qtawesome import icon -from Rare import style_path +from rare import style_path class FlowLayout(QLayout): diff --git a/Rare/utils/LegendaryApi.py b/rare/utils/legendary_utils.py similarity index 100% rename from Rare/utils/LegendaryApi.py rename to rare/utils/legendary_utils.py diff --git a/Rare/utils/Models.py b/rare/utils/models.py similarity index 100% rename from Rare/utils/Models.py rename to rare/utils/models.py diff --git a/Rare/utils/utils.py b/rare/utils/utils.py similarity index 99% rename from Rare/utils/utils.py rename to rare/utils/utils.py index 517e8796..39fce266 100644 --- a/Rare/utils/utils.py +++ b/rare/utils/utils.py @@ -7,7 +7,7 @@ import requests from PIL import Image, UnidentifiedImageError from PyQt5.QtCore import pyqtSignal, QLocale, QSettings -from Rare import lang_path, __version__ +from rare import lang_path, __version__ from custom_legendary.core import LegendaryCore logger = getLogger("Utils") diff --git a/setup.py b/setup.py index 56a92b3d..615e572c 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ import setuptools -from Rare import __version__ as version +from rare import __version__ as version with open("README.md", "r") as fh: long_description = fh.read()