Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package lutris for openSUSE:Factory checked 
in at 2021-10-18 21:59:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lutris (Old)
 and      /work/SRC/openSUSE:Factory/.lutris.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "lutris"

Mon Oct 18 21:59:16 2021 rev:15 rq:925815 version:0.5.9.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/lutris/lutris.changes    2021-10-13 
18:10:09.295657220 +0200
+++ /work/SRC/openSUSE:Factory/.lutris.new.1890/lutris.changes  2021-10-18 
22:02:06.474089914 +0200
@@ -1,0 +2,13 @@
+Sun Oct 17 09:42:42 UTC 2021 - Michael Vetter <[email protected]>
+
+- Update to 0.5.9.1:
+  * Fix possible escaping error for gamescope option
+  * Remove walrus operator to restore compatibility with
+    Python 3.7 / Ubuntu 18.04
+  * Remove log file being written in the home folder
+  * Fix install button for community installer
+  * Fix markup error on gamescope option
+  * Update URL for Ryujinx build
+  * Fix Steam sync creating duplicate games
+
+-------------------------------------------------------------------

Old:
----
  lutris_0.5.9.tar.xz

New:
----
  lutris_0.5.9.1.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ lutris.spec ++++++
--- /var/tmp/diff_new_pack.rpAnmU/_old  2021-10-18 22:02:06.906090226 +0200
+++ /var/tmp/diff_new_pack.rpAnmU/_new  2021-10-18 22:02:06.914090232 +0200
@@ -18,7 +18,7 @@
 
 %global appid net.lutris.Lutris
 Name:           lutris
-Version:        0.5.9
+Version:        0.5.9.1
 Release:        0
 Summary:        Manager for game installation and execution
 License:        GPL-3.0-or-later

++++++ lutris_0.5.9.tar.xz -> lutris_0.5.9.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lutris/debian/changelog new/lutris/debian/changelog
--- old/lutris/debian/changelog 2021-10-11 21:33:39.000000000 +0200
+++ new/lutris/debian/changelog 2021-10-17 03:08:26.000000000 +0200
@@ -1,3 +1,15 @@
+lutris (0.5.9.1) hirsute; urgency=medium
+
+  * Fix possible escaping error for gamescope option
+  * Remove walrus operator to restore compatibility with Python 3.7 / Ubuntu 
18.04
+  * Remove log file being written in the home folder
+  * Fix install button for community installer
+  * Fix markup error on gamescope option
+  * Update URL for Ryujinx build
+  * Fix Steam sync creating duplicate games
+
+ -- Mathieu Comandon <[email protected]>  Sat, 16 Oct 2021 18:08:26 -0700
+
 lutris (0.5.9) hirsute; urgency=medium
 
   * Add initial support for Epic Games Store
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lutris/lutris/__init__.py 
new/lutris/lutris/__init__.py
--- old/lutris/lutris/__init__.py       2021-07-20 04:43:04.000000000 +0200
+++ new/lutris/lutris/__init__.py       2021-10-17 03:08:18.000000000 +0200
@@ -1,3 +1,3 @@
 """Main Lutris package"""
 
-__version__ = "0.5.9"
+__version__ = "0.5.9.1"
Binary files old/lutris/lutris/__pycache__/__init__.cpython-39.pyc and 
new/lutris/lutris/__pycache__/__init__.cpython-39.pyc differ
Binary files old/lutris/lutris/__pycache__/game.cpython-39.pyc and 
new/lutris/lutris/__pycache__/game.cpython-39.pyc differ
Binary files old/lutris/lutris/__pycache__/game_actions.cpython-39.pyc and 
new/lutris/lutris/__pycache__/game_actions.cpython-39.pyc differ
Binary files old/lutris/lutris/__pycache__/runner_interpreter.cpython-39.pyc 
and new/lutris/lutris/__pycache__/runner_interpreter.cpython-39.pyc differ
Binary files old/lutris/lutris/__pycache__/startup.cpython-39.pyc and 
new/lutris/lutris/__pycache__/startup.cpython-39.pyc differ
Binary files old/lutris/lutris/__pycache__/sysoptions.cpython-39.pyc and 
new/lutris/lutris/__pycache__/sysoptions.cpython-39.pyc differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lutris/lutris/game.py new/lutris/lutris/game.py
--- old/lutris/lutris/game.py   2021-09-06 23:01:24.000000000 +0200
+++ new/lutris/lutris/game.py   2021-10-17 01:24:50.000000000 +0200
@@ -212,11 +212,12 @@
                 disable_compositing()
                 self.compositor_disabled = True
 
-    def remove(self, delete_files=False):
+    def remove(self, delete_files=False, no_signal=False):
         """Uninstall a game
 
         Params:
             delete_files (bool): Delete the game files
+            no_signal (bool): Don't emit game-removed signal (if running in a 
thread)
         """
         sql.db_update(settings.PGA_DB, "games", {"installed": 0, "runner": 
""}, {"id": self.id})
         if self.config:
@@ -226,6 +227,8 @@
             self.runner.remove_game_data(game_path=self.directory)
         self.is_installed = False
         self.runner = None
+        if no_signal:
+            return
         self.emit("game-removed")
 
     def delete(self):
Binary files old/lutris/lutris/gui/__pycache__/application.cpython-39.pyc and 
new/lutris/lutris/gui/__pycache__/application.cpython-39.pyc differ
Binary files old/lutris/lutris/gui/__pycache__/installerwindow.cpython-39.pyc 
and new/lutris/lutris/gui/__pycache__/installerwindow.cpython-39.pyc differ
Binary files old/lutris/lutris/gui/__pycache__/lutriswindow.cpython-39.pyc and 
new/lutris/lutris/gui/__pycache__/lutriswindow.cpython-39.pyc differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lutris/lutris/gui/application.py 
new/lutris/lutris/gui/application.py
--- old/lutris/lutris/gui/application.py        2021-09-06 23:11:49.000000000 
+0200
+++ new/lutris/lutris/gui/application.py        2021-10-16 20:35:10.000000000 
+0200
@@ -489,7 +489,7 @@
 
     def on_game_install(self, game):
         """Request installation of a game"""
-        if game.service:
+        if game.service and game.service != "lutris":
             service = get_enabled_services()[game.service]()
             db_game = ServiceGameCollection.get_game(service.id, game.appid)
 
Binary files old/lutris/lutris/gui/config/__pycache__/runner_box.cpython-39.pyc 
and new/lutris/lutris/gui/config/__pycache__/runner_box.cpython-39.pyc differ
Binary files 
old/lutris/lutris/gui/config/__pycache__/services_box.cpython-39.pyc and 
new/lutris/lutris/gui/config/__pycache__/services_box.cpython-39.pyc differ
Binary files 
old/lutris/lutris/gui/dialogs/__pycache__/uninstall_game.cpython-39.pyc and 
new/lutris/lutris/gui/dialogs/__pycache__/uninstall_game.cpython-39.pyc differ
Binary files 
old/lutris/lutris/gui/installer/__pycache__/files_box.cpython-39.pyc and 
new/lutris/lutris/gui/installer/__pycache__/files_box.cpython-39.pyc differ
Binary files old/lutris/lutris/gui/widgets/__pycache__/game_bar.cpython-39.pyc 
and new/lutris/lutris/gui/widgets/__pycache__/game_bar.cpython-39.pyc differ
Binary files old/lutris/lutris/gui/widgets/__pycache__/sidebar.cpython-39.pyc 
and new/lutris/lutris/gui/widgets/__pycache__/sidebar.cpython-39.pyc differ
Binary files old/lutris/lutris/installer/__pycache__/commands.cpython-39.pyc 
and new/lutris/lutris/installer/__pycache__/commands.cpython-39.pyc differ
Binary files old/lutris/lutris/installer/__pycache__/interpreter.cpython-39.pyc 
and new/lutris/lutris/installer/__pycache__/interpreter.cpython-39.pyc differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lutris/lutris/runner_interpreter.py 
new/lutris/lutris/runner_interpreter.py
--- old/lutris/lutris/runner_interpreter.py     2021-08-03 00:17:41.000000000 
+0200
+++ new/lutris/lutris/runner_interpreter.py     2021-10-16 20:16:15.000000000 
+0200
@@ -107,7 +107,8 @@
 
 def get_gamescope_args(launch_arguments, system_config):
     """Insert gamescope at the start of the launch arguments"""
-    launch_arguments.insert(0, "-f --")
+    launch_arguments.insert(0, "--")
+    launch_arguments.insert(0, "-f")
     if system_config.get("gamescope_output_res"):
         output_width, output_height = 
system_config["gamescope_output_res"].lower().split("x")
         launch_arguments.insert(0, output_height)
Binary files old/lutris/lutris/runners/__pycache__/__init__.cpython-39.pyc and 
new/lutris/lutris/runners/__pycache__/__init__.cpython-39.pyc differ
Binary files old/lutris/lutris/runners/__pycache__/atari800.cpython-39.pyc and 
new/lutris/lutris/runners/__pycache__/atari800.cpython-39.pyc differ
Binary files old/lutris/lutris/runners/__pycache__/mame.cpython-39.pyc and 
new/lutris/lutris/runners/__pycache__/mame.cpython-39.pyc differ
Binary files old/lutris/lutris/runners/__pycache__/rpcs3.cpython-39.pyc and 
new/lutris/lutris/runners/__pycache__/rpcs3.cpython-39.pyc differ
Binary files old/lutris/lutris/runners/__pycache__/ryujinx.cpython-39.pyc and 
new/lutris/lutris/runners/__pycache__/ryujinx.cpython-39.pyc differ
Binary files old/lutris/lutris/runners/__pycache__/steam.cpython-39.pyc and 
new/lutris/lutris/runners/__pycache__/steam.cpython-39.pyc differ
Binary files old/lutris/lutris/runners/__pycache__/wine.cpython-39.pyc and 
new/lutris/lutris/runners/__pycache__/wine.cpython-39.pyc differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lutris/lutris/runners/ryujinx.py 
new/lutris/lutris/runners/ryujinx.py
--- old/lutris/lutris/runners/ryujinx.py        2021-09-14 00:48:21.000000000 
+0200
+++ new/lutris/lutris/runners/ryujinx.py        2021-10-16 20:53:50.000000000 
+0200
@@ -16,7 +16,7 @@
     description = _("Nintendo Switch emulator for LDN build visit 
https://ryujinx.org/";)
     runnable_alone = True
     runner_executable = "ryujinx/publish/Ryujinx"
-    download_url = 
"https://ci.appveyor.com/api/buildjobs/o37yny5mfr4dyx6d/artifacts/ryujinx-1.0.7032-linux_x64.tar.gz";
+    download_url = 
"https://lutris.nyc3.digitaloceanspaces.com/runners/ryujinx/ryujinx-1.0.7074-linux_x64.tar.gz";
 
     game_options = [
         {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lutris/lutris/runners/steam.py 
new/lutris/lutris/runners/steam.py
--- old/lutris/lutris/runners/steam.py  2021-08-28 05:18:06.000000000 +0200
+++ new/lutris/lutris/runners/steam.py  2021-10-16 20:16:15.000000000 +0200
@@ -240,7 +240,8 @@
                 i += 1
 
         # New Custom dirs
-        if library_config := self.get_library_config():
+        library_config = self.get_library_config()
+        if library_config:
             paths = []
             for entry in library_config.values():
                 if "mounted" in entry:
Binary files old/lutris/lutris/services/__pycache__/base.cpython-39.pyc and 
new/lutris/lutris/services/__pycache__/base.cpython-39.pyc differ
Binary files old/lutris/lutris/services/__pycache__/egs.cpython-39.pyc and 
new/lutris/lutris/services/__pycache__/egs.cpython-39.pyc differ
Binary files old/lutris/lutris/services/__pycache__/gog.cpython-39.pyc and 
new/lutris/lutris/services/__pycache__/gog.cpython-39.pyc differ
Binary files old/lutris/lutris/services/__pycache__/steam.cpython-39.pyc and 
new/lutris/lutris/services/__pycache__/steam.cpython-39.pyc differ
Binary files old/lutris/lutris/services/__pycache__/steamwindows.cpython-39.pyc 
and new/lutris/lutris/services/__pycache__/steamwindows.cpython-39.pyc differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lutris/lutris/services/base.py 
new/lutris/lutris/services/base.py
--- old/lutris/lutris/services/base.py  2021-10-09 00:56:41.000000000 +0200
+++ new/lutris/lutris/services/base.py  2021-10-17 00:30:59.000000000 +0200
@@ -121,12 +121,11 @@
         """Match a service game to a lutris game referenced by its slug"""
         if not service_game:
             return
-        conditions = {"appid": service_game["appid"], "service": self.id}
         sql.db_update(
             PGA_DB,
             "service_games",
             {"lutris_slug": api_game["slug"]},
-            conditions=conditions
+            conditions={"appid": service_game["appid"], "service": self.id}
         )
         unmatched_lutris_games = get_games(
             searches={"installer_slug": self.matcher},
@@ -147,7 +146,6 @@
         service_games = {
             str(game["appid"]): game for game in 
ServiceGameCollection.get_for_service(self.id)
         }
-        logger.debug("Matching games %s", service_games)
         lutris_games = api.get_api_games(list(service_games.keys()), 
service=self.id)
         for lutris_game in lutris_games:
             for provider_game in lutris_game["provider_games"]:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lutris/lutris/services/steam.py 
new/lutris/lutris/services/steam.py
--- old/lutris/lutris/services/steam.py 2021-08-31 03:36:21.000000000 +0200
+++ new/lutris/lutris/services/steam.py 2021-10-17 02:51:27.000000000 +0200
@@ -1,6 +1,7 @@
 """Steam service"""
 import json
 import os
+from collections import defaultdict
 from gettext import gettext as _
 
 from gi.repository import Gio
@@ -129,7 +130,7 @@
         if not service_game:
             return
         lutris_game_id = "%s-%s" % (self.id, appid)
-        existing_game = get_game_by_field(lutris_game_id, "slug")
+        existing_game = get_game_by_field(lutris_game_id, "installer_slug")
         if existing_game:
             return
         game_config = LutrisConfig().game_level
@@ -153,12 +154,36 @@
         return get_steamapps_paths()
 
     def add_installed_games(self):
-        games = []
+        """Syncs installed Steam games with Lutris"""
+        installed_appids = []
         for steamapps_path in self.steamapps_paths:
             for appmanifest_file in get_appmanifests(steamapps_path):
                 app_manifest_path = os.path.join(steamapps_path, 
appmanifest_file)
-                self.install_from_steam(AppManifest(app_manifest_path))
-        return games
+                app_manifest = AppManifest(app_manifest_path)
+                installed_appids.append(app_manifest.steamid)
+                self.install_from_steam(app_manifest)
+
+        db_games = get_games(filters={"runner": "steam"})
+        for db_game in db_games:
+            steam_game = Game(db_game["id"])
+            appid = steam_game.config.game_level["game"]["appid"]
+            if appid not in installed_appids:
+                steam_game.remove(no_signal=True)
+
+        db_appids = defaultdict(list)
+        db_games = get_games(filters={"service": "steam"})
+        for db_game in db_games:
+            db_appids[db_game["service_id"]].append(db_game["id"])
+
+        for appid in db_appids:
+            game_ids = db_appids[appid]
+            if len(game_ids) == 1:
+                continue
+            for game_id in game_ids:
+                steam_game = Game(game_id)
+                if not steam_game.playtime:
+                    steam_game.remove(no_signal=True)
+                    steam_game.delete()
 
     def generate_installer(self, db_game):
         """Generate a basic Steam installer"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lutris/lutris/sysoptions.py 
new/lutris/lutris/sysoptions.py
--- old/lutris/lutris/sysoptions.py     2021-08-01 03:29:21.000000000 +0200
+++ new/lutris/lutris/sysoptions.py     2021-10-16 20:47:30.000000000 +0200
@@ -131,7 +131,7 @@
         "advanced": True,
         "condition": bool(system.find_executable("gamescope")),
         "help": _("Use gamescope to draw the game window isolated from your 
desktop.\n"
-                  "Use <Ctrl><Super>F to toggle fullscreen"),
+                  "Use Ctrl+Super+F to toggle fullscreen"),
     },
     {
         "option": "gamescope_output_res",
Binary files old/lutris/lutris/util/__pycache__/game_finder.cpython-39.pyc and 
new/lutris/lutris/util/__pycache__/game_finder.cpython-39.pyc differ
Binary files old/lutris/lutris/util/__pycache__/i18n.cpython-39.pyc and 
new/lutris/lutris/util/__pycache__/i18n.cpython-39.pyc differ
Binary files old/lutris/lutris/util/egs/__pycache__/egs_launcher.cpython-39.pyc 
and new/lutris/lutris/util/egs/__pycache__/egs_launcher.cpython-39.pyc differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lutris/lutris/util/i18n.py 
new/lutris/lutris/util/i18n.py
--- old/lutris/lutris/util/i18n.py      2021-10-11 21:26:04.000000000 +0200
+++ new/lutris/lutris/util/i18n.py      2021-10-16 20:23:30.000000000 +0200
@@ -3,6 +3,7 @@
 
 from lutris.util.log import logger
 
+
 def get_user_locale():
     user_locale, _user_encoding = locale.getlocale()
     if not user_locale:
@@ -10,6 +11,7 @@
         return
     return user_locale
 
+
 def get_lang():
     """Return the 2 letter language code used by the system"""
     user_locale = get_user_locale()
Binary files 
old/lutris/lutris/util/steam/__pycache__/appmanifest.cpython-39.pyc and 
new/lutris/lutris/util/steam/__pycache__/appmanifest.cpython-39.pyc differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lutris/lutris/util/steam/appmanifest.py 
new/lutris/lutris/util/steam/appmanifest.py
--- old/lutris/lutris/util/steam/appmanifest.py 2021-02-16 05:46:38.000000000 
+0100
+++ new/lutris/lutris/util/steam/appmanifest.py 2021-10-17 01:28:08.000000000 
+0200
@@ -37,7 +37,6 @@
 
 
 class AppManifest:
-
     """Representation of an AppManifest file from Steam"""
 
     def __init__(self, appmanifest_path):
Binary files old/lutris/lutris/util/wine/__pycache__/d3d_extras.cpython-39.pyc 
and new/lutris/lutris/util/wine/__pycache__/d3d_extras.cpython-39.pyc differ
Binary files old/lutris/lutris/util/wine/__pycache__/dll_manager.cpython-39.pyc 
and new/lutris/lutris/util/wine/__pycache__/dll_manager.cpython-39.pyc differ
Binary files old/lutris/lutris/util/wine/__pycache__/prefix.cpython-39.pyc and 
new/lutris/lutris/util/wine/__pycache__/prefix.cpython-39.pyc differ
Binary files old/lutris/lutris/util/wine/__pycache__/wine.cpython-39.pyc and 
new/lutris/lutris/util/wine/__pycache__/wine.cpython-39.pyc differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lutris/lutris.spec new/lutris/lutris.spec
--- old/lutris/lutris.spec      2021-10-09 00:56:41.000000000 +0200
+++ new/lutris/lutris.spec      2021-10-17 03:07:20.000000000 +0200
@@ -6,7 +6,7 @@
 %global appid net.lutris.Lutris
 
 Name:           lutris
-Version:        0.5.9
+Version:        0.5.9.1
 Release:        7%{?dist}
 Summary:        Video game preservation platform
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lutris/share/lutris/bin/lutris-wrapper 
new/lutris/share/lutris/bin/lutris-wrapper
--- old/lutris/share/lutris/bin/lutris-wrapper  2021-08-31 01:08:44.000000000 
+0200
+++ new/lutris/share/lutris/bin/lutris-wrapper  2021-10-16 20:16:53.000000000 
+0200
@@ -70,8 +70,8 @@
         pass
 
     # File output
-    with open(os.path.expanduser("~/lutris.log"), "a") as logfile:
-        logfile.write(line)
+    # with open(os.path.expanduser("~/lutris.log"), "a") as logfile:
+    #     logfile.write(line)
 
 
 def kill_pid(pid, sigkill=False):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lutris/share/metainfo/net.lutris.Lutris.metainfo.xml 
new/lutris/share/metainfo/net.lutris.Lutris.metainfo.xml
--- old/lutris/share/metainfo/net.lutris.Lutris.metainfo.xml    2021-10-11 
21:33:39.000000000 +0200
+++ new/lutris/share/metainfo/net.lutris.Lutris.metainfo.xml    2021-10-17 
03:07:41.000000000 +0200
@@ -24,7 +24,7 @@
   <url type="bugtracker">https://github.com/lutris/lutris/issues</url>
   <launchable type="desktop-id">net.lutris.Lutris.desktop</launchable>
   <releases>
-    <release date="2021-10-11" version="0.5.9" />
+    <release date="2021-10-16" version="0.5.9.1" />
   </releases>
   <content_rating type="oars-1.1" />
 </component>
Binary files old/lutris/tests/__pycache__/test_wine.cpython-39.pyc and 
new/lutris/tests/__pycache__/test_wine.cpython-39.pyc differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lutris/tests/test_wine.py 
new/lutris/tests/test_wine.py
--- old/lutris/tests/test_wine.py       2021-07-05 20:28:55.000000000 +0200
+++ new/lutris/tests/test_wine.py       2021-10-16 20:42:13.000000000 +0200
@@ -13,7 +13,8 @@
             'd3dcompiler_47': 'native,builtin',
             'dnsapi': ' builtin',
             'dwrite': ' disabled',
+            'winemenubuilder': 'disabled',
             'rasapi32': ' native',
         }
         env_string = wine.get_overrides_env(overrides)
-        self.assertEqual(env_string, 
"d3dcompiler_43,d3dcompiler_47=n,b;dnsapi=b;rasapi32=n;dwrite=")
+        self.assertEqual(env_string, 
"d3dcompiler_43,d3dcompiler_47=n,b;dnsapi=b;rasapi32=n;dwrite,winemenubuilder=")

Reply via email to