Merge pull request #577 from loathingKernel/develop

Various chores

Author: loathingKernel

README.md

@@ -56,6 +56,18 @@ If you don't have a GitHub account or you just want to chat, you also can contac
 https://discord.gg/YvmABK9YSk
 
 
+## Common issues
+* If you are using multiple accounts, there is a chance that at some point you will not be able to log in into your account and see something like the following.
+  > Login failed. Decryption of EPIC launcher user information failed.
+
+  In that case navigate to one of the following directorories depending on your operating system and delete `user.json`
+
+  | OS      | Path                               |
+  |---------|------------------------------------|
+  | Windows | `%USERPROFILE%\.config\legendary\` |
+  | Linux   | `$HOME/.config/legendary/`         |
+  | macOS   | `$HOME/.config/legendary/`         |
+
 
 ## Installation
 

rare/commands/subreaper.py

@@ -1,14 +1,17 @@
+#!/usr/bin/env python3
+
 import logging
 import os
 import sys
 from argparse import Namespace
-from ctypes import CDLL, c_int, c_ulong
+from ctypes import CDLL, c_int, c_ulong, create_string_buffer, byref
 from ctypes.util import find_library
 from logging import getLogger
 from typing import List
 
 # Constant defined in prctl.h
 # See prctl(2) for more details
+PR_SET_NAME = 15
 PR_SET_CHILD_SUBREAPER = 36
 
 
@@ -25,22 +28,32 @@ def subreaper(args: Namespace, other: List[str]) -> int:
         stream=sys.stderr,
     )
 
+    logger.debug("command: %s", args)
+    logger.debug("arguments: %s", other)
+
     command: List[str] = [args.command, *other]
     workdir: str = args.workdir
-    wait_status: int = 0
+    child_status: int = 0
 
     libc: str = get_libc()
     prctl = CDLL(libc).prctl
     prctl.restype = c_int
     prctl.argtypes = [
         c_int,
-        c_ulong,
-        c_ulong,
-        c_ulong,
-        c_ulong,
+        # c_ulong,
+        # c_ulong,
+        # c_ulong,
+        # c_ulong,
     ]
+
+    proc_name = b"reaper"
+    buff = create_string_buffer(len(proc_name)+1)
+    buff.value = proc_name
+    prctl_ret = prctl(PR_SET_NAME, byref(buff), 0, 0, 0)
+    logger.debug("prctl PR_SET_NAME exited with status: %s", prctl_ret)
+
     prctl_ret = prctl(PR_SET_CHILD_SUBREAPER, 1, 0, 0, 0, 0)
-    logger.debug("prctl exited with status: %s", prctl_ret)
+    logger.debug("prctl PR_SET_CHILD_SUBREAPER exited with status: %s", prctl_ret)
 
     pid = os.fork()  # pylint: disable=E1101
     if pid == -1:
@@ -54,13 +67,20 @@ def subreaper(args: Namespace, other: List[str]) -> int:
 
     while True:
         try:
-            wait_pid, wait_status = os.wait()  # pylint: disable=E1101
-            logger.info("Child %s exited with wait status: %s", wait_pid, wait_status)
+            child_pid, child_status = os.wait()  # pylint: disable=E1101
+            logger.info("Child %s exited with wait status: %s", child_pid, child_status)
         except ChildProcessError as e:
             logger.info(e)
             break
 
-    return wait_status
+    return child_status
+
+
+if __name__ == "__main__":
+    sep = sys.argv.index("--")
+    argv = sys.argv[sep+1:]
+    args = Namespace(command=argv.pop(0), workdir=os.getcwd(), debug=True)
+    subreaper(args, argv)
 
 
-__all__ = ["subreaper"]
+__all__ = ["subreaper"]

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

@@ -113,7 +113,8 @@ def __on_proton_changed(self, index):
         self.tool_prefix.setEnabled(steam_tool is not None)
         if steam_tool:
             if not (compatdata_path := config.get_proton_compatdata(self.app_name, fallback="")):
-                compatdata_path = proton_compat_dir(RareCore.instance().get_game(self.app_name).folder_name)
+                folder_name = self.app_name if self.app_name == "default" else RareCore.instance().get_game(self.app_name).folder_name
+                compatdata_path = proton_compat_dir(folder_name)
                 config.adjust_proton_compatdata(self.app_name, str(compatdata_path))
             self.tool_prefix.setText(str(compatdata_path))
         else:

rare/components/tabs/store/store_api.py

@@ -18,7 +18,7 @@
 )
 
 logger = getLogger("StoreAPI")
-graphql_url = "https://graphql.epicgames.com/graphql"
+graphql_url = "https://store.epicgames.com/graphql"
 
 
 def DEBUG() -> bool: