Utils: Rename utils.py to misc.py to not confuse PyCharm checker

rare/__main__.py

@@ -70,20 +70,18 @@ def main():
 
     args = parser.parse_args()
 
-    if args.desktop_shortcut:
-        from rare.utils import utils
+    if args.desktop_shortcut or args.startmenu_shortcut:
+        from rare.utils.misc import create_desktop_link
+
+        if args.desktop_shortcut:
+            create_desktop_link(type_of_link="desktop", for_rare=True)
+
+        if args.startmenu_shortcut:
+            create_desktop_link(type_of_link="start_menu", for_rare=True)
 
-        utils.create_desktop_link(type_of_link="desktop", for_rare=True)
         print("Link created")
         return
 
-    if args.startmenu_shortcut:
-        from rare.utils import utils
-
-        utils.create_desktop_link(type_of_link="start_menu", for_rare=True)
-        print("link created")
-        return
-
     if args.version:
         from rare import __version__, code_name
 

rare/components/dialogs/install_dialog.py

@@ -18,7 +18,7 @@ from rare.shared import LegendaryCLISingleton, LegendaryCoreSingleton, ApiResult
 from rare.ui.components.dialogs.install_dialog import Ui_InstallDialog
 from rare.utils.extra_widgets import PathEdit
 from rare.models.install import InstallDownloadModel, InstallQueueItemModel
-from rare.utils.utils import get_size
+from rare.utils.misc import get_size
 
 
 class InstallDialog(QDialog, Ui_InstallDialog):

rare/components/dialogs/launch_dialog.py

@@ -10,7 +10,7 @@ from rare.models.apiresults import ApiResults
 from rare.shared import LegendaryCoreSingleton, ArgumentsSingleton, ApiResultsSingleton
 from rare.shared.image_manager import ImageManagerSingleton
 from rare.ui.components.dialogs.launch_dialog import Ui_LaunchDialog
-from rare.utils.utils import CloudWorker
+from rare.utils.misc import CloudWorker
 
 logger = getLogger("Login")
 

rare/components/dialogs/login/browser_login.py

@@ -10,7 +10,7 @@ from legendary.utils import webview_login
 
 from rare.ui.components.dialogs.login.browser_login import Ui_BrowserLogin
 from rare.utils.extra_widgets import IndicatorLineEdit
-from rare.utils.utils import icon
+from rare.utils.misc import icon
 
 logger = getLogger("BrowserLogin")
 

rare/components/dialogs/uninstall_dialog.py

@@ -11,7 +11,7 @@ from PyQt5.QtWidgets import (
 )
 
 from legendary.models.game import Game
-from rare.utils.utils import icon
+from rare.utils.misc import icon
 
 
 class UninstallDialog(QDialog):

rare/components/tabs/__init__.py

@@ -9,7 +9,7 @@ from rare.components.tabs.settings import SettingsTab
 from rare.components.tabs.settings.debug import DebugSettings
 from rare.components.tabs.shop import Shop
 from rare.components.tabs.tab_utils import MainTabBar, TabButtonWidget
-from rare.utils.utils import icon
+from rare.utils.misc import icon
 
 
 class TabWidget(QTabWidget):

rare/components/tabs/account/__init__.py

@@ -3,7 +3,7 @@ import webbrowser
 from PyQt5.QtWidgets import QWidget, QVBoxLayout, QMessageBox, QLabel, QPushButton
 
 from rare.shared import LegendaryCoreSingleton, GlobalSignalsSingleton
-from rare.utils.utils import icon
+from rare.utils.misc import icon
 
 
 class MiniWidget(QWidget):

rare/components/tabs/downloads/__init__.py

@@ -21,7 +21,7 @@ from rare.components.tabs.downloads.dl_queue_widget import DlQueueWidget, DlWidg
 from rare.components.tabs.downloads.download_thread import DownloadThread
 from rare.ui.components.tabs.downloads.downloads_tab import Ui_DownloadsTab
 from rare.models.install import InstallOptionsModel, InstallQueueItemModel
-from rare.utils.utils import get_size
+from rare.utils.misc import get_size
 
 logger = getLogger("Download")
 

rare/components/tabs/downloads/dl_queue_widget.py

@@ -11,7 +11,7 @@ from PyQt5.QtWidgets import (
 )
 
 from rare.models.install import InstallQueueItemModel
-from rare.utils.utils import icon
+from rare.utils.misc import icon
 
 logger = getLogger("QueueWidget")
 

rare/components/tabs/downloads/download_thread.py

@@ -13,7 +13,7 @@ from legendary.models.downloading import WriterTask
 
 from rare.shared import GlobalSignalsSingleton
 from rare.models.install import InstallQueueItemModel
-from rare.utils.utils import create_desktop_link
+from rare.utils.misc import create_desktop_link
 from rare.lgndr.downloading import UIUpdate
 
 logger = getLogger("DownloadThread")

rare/components/tabs/games/cloud_save_utils.py

@@ -11,7 +11,7 @@ from legendary.core import LegendaryCore
 from legendary.models.game import SaveGameStatus, InstalledGame, SaveGameFile
 from rare.shared import LegendaryCoreSingleton, ArgumentsSingleton, ApiResultsSingleton
 from rare.ui.components.dialogs.sync_save_dialog import Ui_SyncSaveDialog
-from rare.utils.utils import icon
+from rare.utils.misc import icon
 
 logger = getLogger("Cloud Saves")
 

rare/components/tabs/games/game_info/game_info.py

@@ -39,7 +39,7 @@ from rare.utils.extra_widgets import PathEdit
 from rare.utils.legendary_utils import VerifyWorker
 from rare.models.install import InstallOptionsModel
 from rare.utils.steam_grades import SteamWorker
-from rare.utils.utils import get_size
+from rare.utils.misc import get_size
 from rare.widgets.image_widget import ImageWidget
 
 logger = getLogger("GameInfo")

rare/components/tabs/games/game_info/game_settings.py

@@ -10,7 +10,7 @@ from rare.components.tabs.settings import DefaultGameSettings
 from rare.components.tabs.settings.widgets.pre_launch import PreLaunchSettings
 from rare.utils import config_helper
 from rare.utils.extra_widgets import PathEdit
-from rare.utils.utils import icon, WineResolver, get_raw_save_path
+from rare.utils.misc import icon, WineResolver, get_raw_save_path
 
 logger = getLogger("GameSettings")
 

rare/components/tabs/games/game_utils.py

@@ -13,7 +13,7 @@ from rare.components.tabs.games import CloudSaveUtils
 from rare.game_launch_helper import message_models
 from rare.shared import LegendaryCoreSingleton, GlobalSignalsSingleton, ArgumentsSingleton
 from rare.utils import legendary_utils
-from rare.utils import utils
+from rare.utils import misc
 from rare.utils.meta import RareGameMeta
 
 logger = getLogger("GameUtils")

rare/components/tabs/games/game_widgets/base_installed_widget.py

@@ -9,7 +9,7 @@ from PyQt5.QtWidgets import QFrame, QMessageBox, QAction
 from rare.components.tabs.games.game_utils import GameUtils
 from rare.shared import LegendaryCoreSingleton, GlobalSignalsSingleton, ArgumentsSingleton
 from rare.shared.image_manager import ImageManagerSingleton, ImageSize
-from rare.utils.utils import create_desktop_link
+from rare.utils.misc import create_desktop_link
 from rare.widgets.image_widget import ImageWidget
 
 logger = getLogger("Game")

rare/components/tabs/games/game_widgets/installed_icon_widget.py

@@ -9,7 +9,7 @@ from rare.components.tabs.games.game_widgets.base_installed_widget import (
 )
 from rare.shared import LegendaryCoreSingleton
 from rare.shared.image_manager import ImageSize
-from rare.utils.utils import icon
+from rare.utils.misc import icon
 from rare.widgets.elide_label import ElideLabel
 
 logger = getLogger("GameWidgetInstalled")

rare/components/tabs/games/game_widgets/installed_list_widget.py

@@ -6,8 +6,7 @@ from PyQt5.QtWidgets import QHBoxLayout, QLabel, QPushButton, QVBoxLayout
 from rare.components.tabs.games.game_widgets.base_installed_widget import (
     BaseInstalledWidget,
 )
-from rare.utils.utils import get_size
-from rare.utils.utils import icon
+from rare.utils.misc import icon, get_size
 
 logger = getLogger("GameWidget")
 

rare/components/tabs/games/head_bar.py

@@ -10,7 +10,7 @@ from qtawesome import IconWidget
 
 from rare.shared import ApiResultsSingleton
 from rare.utils.extra_widgets import SelectViewWidget, ButtonLineEdit
-from rare.utils.utils import icon
+from rare.utils.misc import icon
 
 
 class GameListHeadBar(QWidget):

rare/components/tabs/games/import_sync/egl_sync_group.py

@@ -14,7 +14,7 @@ from rare.ui.components.tabs.games.import_sync.egl_sync_list_group import (
 )
 from rare.utils.extra_widgets import PathEdit
 from rare.utils.models import PathSpec
-from rare.utils.utils import WineResolver
+from rare.utils.misc import WineResolver
 
 logger = getLogger("EGLSync")
 

rare/components/tabs/settings/__init__.py

@@ -1,11 +1,9 @@
-import platform
-
+from rare.components.tabs.settings.widgets.linux import LinuxSettings
 from rare.utils.extra_widgets import SideTabWidget
 from .about import About
-from .legendary import LegendarySettings
-from rare.components.tabs.settings.widgets.linux import LinuxSettings
-from .rare import RareSettings
 from .default_game_settings import DefaultGameSettings
+from .legendary import LegendarySettings
+from .rare import RareSettings
 
 
 class SettingsTab(SideTabWidget):

rare/components/tabs/settings/legendary.py

@@ -11,7 +11,7 @@ from rare.components.tabs.settings.widgets.ubisoft_activation import UbiActivati
 from rare.shared import LegendaryCoreSingleton
 from rare.ui.components.tabs.settings.legendary import Ui_LegendarySettings
 from rare.utils.extra_widgets import PathEdit, IndicatorLineEdit
-from rare.utils.utils import get_size
+from rare.utils.misc import get_size
 
 logger = getLogger("LegendarySettings")
 

rare/components/tabs/settings/rare.py

@@ -10,14 +10,14 @@ from PyQt5.QtWidgets import QWidget, QMessageBox
 from rare.shared import LegendaryCoreSingleton
 from rare.components.tabs.settings.widgets.rpc import RPCSettings
 from rare.ui.components.tabs.settings.rare import Ui_RareSettings
-from rare.utils import utils
 from rare.utils.paths import cache_dir
-from rare.utils.utils import (
+from rare.utils.misc import (
     get_translations,
     get_color_schemes,
     set_color_pallete,
     get_style_sheets,
     set_style_sheet,
+    get_size,
 )
 
 logger = getLogger("RareSettings")
@@ -148,7 +148,7 @@ class RareSettings(QWidget, Ui_RareSettings):
         for i in os.listdir(logdir):
             size += os.path.getsize(os.path.join(logdir, i))
 
-        self.log_dir_size_label.setText(utils.get_size(size))
+        self.log_dir_size_label.setText(get_size(size))
         # self.log_dir_clean_button.setVisible(False)
         # self.log_dir_size_label.setVisible(False)
 

rare/components/tabs/settings/widgets/env_vars.py

@@ -6,7 +6,7 @@ from PyQt5.QtWidgets import QGroupBox, QTableWidgetItem, QMessageBox, QPushButto
 from rare.shared import LegendaryCoreSingleton
 from rare.ui.components.tabs.settings.widgets.env_vars import Ui_EnvVars
 from rare.utils import config_helper
-from rare.utils.utils import icon
+from rare.utils.misc import icon
 
 logger = getLogger("EnvVars")
 

rare/components/tabs/settings/widgets/ubisoft_activation.py

@@ -7,7 +7,7 @@ from PyQt5.QtWidgets import QWidget, QLabel, QHBoxLayout, QSizePolicy, QPushButt
 
 from legendary.models.game import Game
 from rare.shared import LegendaryCoreSingleton, ArgumentsSingleton
-from rare.utils.utils import icon
+from rare.utils.misc import icon
 
 logger = getLogger("Ubisoft")
 

rare/components/tabs/settings/widgets/wrapper.py

@@ -11,7 +11,7 @@ from PyQt5.QtWidgets import QHBoxLayout, QLabel, QPushButton, QInputDialog, QFra
 from rare import shared
 from rare.ui.components.tabs.settings.widgets.wrapper import Ui_WrapperSettings
 from rare.utils import config_helper
-from rare.utils.utils import icon
+from rare.utils.misc import icon
 
 logger = getLogger("Wrapper Settings")
 

rare/components/tabs/shop/game_info.py

@@ -17,7 +17,7 @@ from rare.shared import LegendaryCoreSingleton
 from rare.components.tabs.shop.shop_models import ShopGame
 from rare.ui.components.tabs.store.shop_game_info import Ui_shop_info
 from rare.utils.extra_widgets import WaitingSpinner, ImageLabel
-from rare.utils.utils import icon
+from rare.utils.misc import icon
 
 logger = logging.getLogger("ShopInfo")
 

rare/components/tabs/shop/game_widgets.py

@@ -9,7 +9,7 @@ from PyQt5.QtWidgets import QWidget, QVBoxLayout, QLabel, QHBoxLayout
 from rare.components.tabs.shop.shop_models import ImageUrlModel
 from rare.ui.components.tabs.store.wishlist_widget import Ui_WishlistWidget
 from rare.utils.extra_widgets import ImageLabel
-from rare.utils.utils import icon
+from rare.utils.misc import icon
 
 logger = logging.getLogger("GameWidgets")
 

rare/components/tabs/shop/wishlist.py

@@ -5,7 +5,7 @@ from rare.components.tabs.shop import ShopApiCore
 from rare.components.tabs.shop.game_widgets import WishlistWidget
 from rare.ui.components.tabs.store.wishlist import Ui_Wishlist
 from rare.utils.extra_widgets import WaitingSpinner
-from rare.utils.utils import icon
+from rare.utils.misc import icon
 
 
 class Wishlist(QStackedWidget, Ui_Wishlist):

rare/components/tabs/tab_utils.py

@@ -1,7 +1,7 @@
 from PyQt5.QtCore import QSize
 from PyQt5.QtWidgets import QTabBar, QToolButton
 
-from rare.utils.utils import icon
+from rare.utils.misc import icon
 
 
 class MainTabBar(QTabBar):

rare/utils/extra_widgets.py

@@ -36,7 +36,7 @@ from PyQt5.QtWidgets import (
 
 from rare.utils.paths import tmp_dir
 from rare.utils.qt_requests import QtRequestManager
-from rare.utils.utils import icon as qta_icon
+from rare.utils.misc import icon as qta_icon
 
 logger = getLogger("ExtraWidgets")
 

rare/widgets/rare_app.py

@@ -11,7 +11,7 @@ from legendary.core import LegendaryCore
 
 import rare.resources.resources
 from rare.utils.paths import resources_path
-from rare.utils.utils import set_color_pallete, set_style_sheet
+from rare.utils.misc import set_color_pallete, set_style_sheet
 
 
 class RareApp(QApplication):