Create util.wine package

lutris/gui/lutriswindow.py

@@ -20,12 +20,13 @@ from lutris.util.system import open_uri, path_exists
 
 from lutris.util import http
 from lutris.util import datapath
+from lutris.util import xdgshortcuts
 from lutris.util.steam.watcher import SteamWatcher
-from lutris.util.dxvk import init_dxvk_versions
+from lutris.util.wine.dxvk import init_dxvk_versions
 
 from lutris.thread import LutrisThread
 
-from lutris.services import get_services_synced_at_startup, steam, xdg
+from lutris.services import get_services_synced_at_startup, steam
 
 from lutris.gui import dialogs
 from lutris.gui.sidebar import (
@@ -483,7 +484,7 @@ class LutrisWindow(Gtk.ApplicationWindow):
                 added_games = chain.from_iterable(
                     [
                         pga.get_games_where(
-                            id__in=list(added_ids)[page * size : page * size + size]
+                            id__in=list(added_ids)[page * size: page * size + size]
                         )
                         for page in range(math.ceil(len(added_ids) / size))
                     ]
@@ -1010,22 +1011,22 @@ class LutrisWindow(Gtk.ApplicationWindow):
     def create_menu_shortcut(self, *_args):
         """Add the selected game to the system's Games menu."""
         game = Game(self.view.selected_game)
-        xdg.create_launcher(game.slug, game.id, game.name, menu=True)
+        xdgshortcuts.create_launcher(game.slug, game.id, game.name, menu=True)
 
     def create_desktop_shortcut(self, *_args):
         """Create a desktop launcher for the selected game."""
         game = Game(self.view.selected_game)
-        xdg.create_launcher(game.slug, game.id, game.name, desktop=True)
+        xdgshortcuts.create_launcher(game.slug, game.id, game.name, desktop=True)
 
     def remove_menu_shortcut(self, *_args):
         """Remove an XDG menu shortcut"""
         game = Game(self.view.selected_game)
-        xdg.remove_launcher(game.slug, game.id, menu=True)
+        xdgshortcuts.remove_launcher(game.slug, game.id, menu=True)
 
     def remove_desktop_shortcut(self, *_args):
         """Remove a .desktop shortcut"""
         game = Game(self.view.selected_game)
-        xdg.remove_launcher(game.slug, game.id, desktop=True)
+        xdgshortcuts.remove_launcher(game.slug, game.id, desktop=True)
 
     def on_sidebar_state_change(self, action, value):
         """Callback to handle siderbar toggle"""

lutris/installer/commands.py

@@ -14,7 +14,7 @@ from lutris import runtime
 from lutris.util import extract, disks, system
 from lutris.util.fileio import EvilConfigParser, MultiOrderedDict
 from lutris.util.log import logger
-from lutris.util.wine import get_wine_version_exe
+from lutris.util.wine.wine import get_wine_version_exe
 from lutris.util import selective_merge
 
 from lutris.runners import wine, import_task

lutris/installer/interpreter.py

@@ -18,7 +18,7 @@ from lutris.util.jobs import AsyncCall
 from lutris.util.log import logger
 from lutris.util.steam.log import get_app_state_log
 from lutris.util.http import Request
-from lutris.util.wine import get_wine_version_exe, get_system_wine_version
+from lutris.util.wine.wine import get_wine_version_exe, get_system_wine_version
 
 from lutris.config import LutrisConfig, make_game_config_id
 

lutris/runners/commands/wine.py

@@ -10,7 +10,7 @@ from lutris.runners import import_runner
 from lutris.thread import LutrisThread
 from lutris.util import datapath, system
 from lutris.util.log import logger
-from lutris.util.wine import (
+from lutris.util.wine.wine import (
     WINE_DIR,
     detect_arch,
     detect_prefix_arch,
@@ -18,7 +18,7 @@ from lutris.util.wine import (
     get_real_executable,
     use_lutris_runtime,
 )
-from lutris.util.wineprefix import WinePrefixManager
+from lutris.util.wine.prefix import WinePrefixManager
 
 
 def set_regedit(

lutris/runners/wine.py

@@ -7,13 +7,14 @@ import shutil
 from lutris import runtime
 from lutris.gui.dialogs import FileDialog
 from lutris.runners.runner import Runner
-from lutris.util import datapath, display, dxvk, system
+from lutris.util import datapath, display, system
 from lutris.util.log import logger
 from lutris.util.strings import parse_version
 from lutris.util.vkquery import is_vulkan_supported
-from lutris.util.wineprefix import WinePrefixManager
-from lutris.util.x360ce import X360ce
-from lutris.util.wine import (
+from lutris.util.wine.prefix import WinePrefixManager
+from lutris.util.wine.x360ce import X360ce
+from lutris.util.wine import dxvk
+from lutris.util.wine.wine import (
     PROTON_PATH,
     WINE_DIR,
     WINE_PATHS,

lutris/runners/winesteam.py

@@ -14,7 +14,7 @@ from lutris.util.log import logger
 from lutris.util.steam.log import get_app_state_log
 from lutris.util.steam.config import read_config
 from lutris.services.steam import get_path_from_appmanifest
-from lutris.util.wineregistry import WineRegistry
+from lutris.util.wine.registry import WineRegistry
 from lutris.runners.commands.wine import (  # pylint: disable=unused-import
     set_regedit,
     set_regedit_file,

lutris/util/wine/prefix.py

@@ -1,5 +1,5 @@
 import os
-from lutris.util.wineregistry import WineRegistry
+from lutris.util.wine.registry import WineRegistry
 from lutris.util.log import logger
 from lutris.util import joypad, system
 

tests/test_registry.py

@@ -1,6 +1,6 @@
 import os
 from unittest import TestCase
-from lutris.util.wineregistry import WineRegistry, WineRegistryKey
+from lutris.util.wine.registry import WineRegistry, WineRegistryKey
 
 FIXTURES_PATH = os.path.join(os.path.dirname(__file__), 'fixtures')