diff --git a/.github/workflows/ulwgl-protonfixes.yml b/.github/workflows/umu-protonfixes.yml similarity index 95% rename from .github/workflows/ulwgl-protonfixes.yml rename to .github/workflows/umu-protonfixes.yml index cf3ce52d..e42f4a69 100644 --- a/.github/workflows/ulwgl-protonfixes.yml +++ b/.github/workflows/umu-protonfixes.yml @@ -1,4 +1,4 @@ -name: ULWGL-protonfixes workflow +name: umu-protonfixes workflow on: push: diff --git a/fix.py b/fix.py index e290f964..8df728e5 100755 --- a/fix.py +++ b/fix.py @@ -17,8 +17,8 @@ def game_id(): """ Trys to return the game id from environment variables """ - if 'ULWGL_ID' in os.environ: - return os.environ['ULWGL_ID'] + if 'UMU_ID' in os.environ: + return os.environ['UMU_ID'] if 'SteamAppId' in os.environ: return os.environ['SteamAppId'] if 'SteamGameId' in os.environ: @@ -34,14 +34,14 @@ def game_name(): """ Trys to return the game name from environment variables """ is_online = check_internet() - if 'ULWGL_ID' in os.environ: + if 'UMU_ID' in os.environ: if os.path.isfile(os.environ['WINEPREFIX'] + "/game_title"): with open(os.environ['WINEPREFIX'] + "/game_title", 'r') as file: return file.readline() else: try: if 'STORE' in os.environ and is_online: - url = "https://ulwgl.openwinecomponents.org/ulwgl_api.php?ulwgl_id=" + os.environ['ULWGL_ID'] + "&store=" + os.environ['STORE'] + url = "https://umu.openwinecomponents.org/umu_api.php?umu_id=" + os.environ['UMU_ID'] + "&store=" + os.environ['STORE'] headers = {'User-Agent': 'Mozilla/5.0'} req = urllib.request.Request(url, headers=headers) response = urllib.request.urlopen(req, timeout=5) @@ -52,7 +52,7 @@ def game_name(): file.write(title) file.close() elif 'STORE' not in os.environ and is_online: - url = "https://ulwgl.openwinecomponents.org/ulwgl_api.php?ulwgl_id=" + os.environ['ULWGL_ID'] + "&store=none" + url = "https://umu.openwinecomponents.org/umu_api.php?umu_id=" + os.environ['UMU_ID'] + "&store=none" headers = {'User-Agent': 'Mozilla/5.0'} req = urllib.request.Request(url, headers=headers) response = urllib.request.urlopen(req, timeout=5) @@ -74,7 +74,7 @@ def game_name(): #log.info('UnicodeDecodeError occurred: {}'.format(e)) # used for debugging return 'UNKNOWN' except TimeoutError: - log.info('ulwgl.openwinecomponents.org timed out') + log.info('umu.openwinecomponents.org timed out') return 'UNKNOWN' with open(os.environ['WINEPREFIX'] + "/game_title", 'r') as file: return file.readline() @@ -126,7 +126,7 @@ def run_fix(gameid): game_module = import_module('protonfixes.gamefixes-steam.default') else: log.info('Non-steam game ' + game) - game_module = import_module('protonfixes.gamefixes-ulwgl.default') + game_module = import_module('protonfixes.gamefixes-umu.default') log.info('Using global defaults for ' + game) game_module.main() except ImportError: @@ -177,11 +177,11 @@ def run_fix(gameid): log.info('ZOOM Platform store specified, using ZOOM Platform database') game_module = import_module('protonfixes.gamefixes-zoomplatform.' + gameid) elif os.environ['STORE'].lower() == "none": - log.info('No store specified, using ULWGL database') - game_module = import_module('protonfixes.gamefixes-ulwgl.' + gameid) + log.info('No store specified, using umu database') + game_module = import_module('protonfixes.gamefixes-umu.' + gameid) else: - log.info('No store specified, using ULWGL database') - game_module = import_module('protonfixes.gamefixes-ulwgl.' + gameid) + log.info('No store specified, using umu database') + game_module = import_module('protonfixes.gamefixes-umu.' + gameid) log.info('Using protonfix for ' + game) game_module.main() except ImportError: diff --git a/gamefixes-egs/ulwgl-1151640.py b/gamefixes-egs/umu-1151640.py similarity index 100% rename from gamefixes-egs/ulwgl-1151640.py rename to gamefixes-egs/umu-1151640.py diff --git a/gamefixes-egs/ulwgl-1174180.py b/gamefixes-egs/umu-1174180.py similarity index 100% rename from gamefixes-egs/ulwgl-1174180.py rename to gamefixes-egs/umu-1174180.py diff --git a/gamefixes-egs/ulwgl-1659420.py b/gamefixes-egs/umu-1659420.py similarity index 100% rename from gamefixes-egs/ulwgl-1659420.py rename to gamefixes-egs/umu-1659420.py diff --git a/gamefixes-egs/ulwgl-19900.py b/gamefixes-egs/umu-19900.py similarity index 100% rename from gamefixes-egs/ulwgl-19900.py rename to gamefixes-egs/umu-19900.py diff --git a/gamefixes-egs/ulwgl-220240.py b/gamefixes-egs/umu-220240.py similarity index 100% rename from gamefixes-egs/ulwgl-220240.py rename to gamefixes-egs/umu-220240.py diff --git a/gamefixes-egs/ulwgl-233270.py b/gamefixes-egs/umu-233270.py similarity index 100% rename from gamefixes-egs/ulwgl-233270.py rename to gamefixes-egs/umu-233270.py diff --git a/gamefixes-egs/ulwgl-271590.py b/gamefixes-egs/umu-271590.py similarity index 100% rename from gamefixes-egs/ulwgl-271590.py rename to gamefixes-egs/umu-271590.py diff --git a/gamefixes-egs/ulwgl-298110.py b/gamefixes-egs/umu-298110.py similarity index 100% rename from gamefixes-egs/ulwgl-298110.py rename to gamefixes-egs/umu-298110.py diff --git a/gamefixes-egs/ulwgl-371660.py b/gamefixes-egs/umu-371660.py similarity index 100% rename from gamefixes-egs/ulwgl-371660.py rename to gamefixes-egs/umu-371660.py diff --git a/gamefixes-egs/ulwgl-397540.py b/gamefixes-egs/umu-397540.py similarity index 100% rename from gamefixes-egs/ulwgl-397540.py rename to gamefixes-egs/umu-397540.py diff --git a/gamefixes-gog/ulwgl-1105510.py b/gamefixes-gog/umu-1105510.py similarity index 100% rename from gamefixes-gog/ulwgl-1105510.py rename to gamefixes-gog/umu-1105510.py diff --git a/gamefixes-gog/ulwgl-1151640.py b/gamefixes-gog/umu-1151640.py similarity index 100% rename from gamefixes-gog/ulwgl-1151640.py rename to gamefixes-gog/umu-1151640.py diff --git a/gamefixes-gog/ulwgl-1228964594.py b/gamefixes-gog/umu-1228964594.py similarity index 100% rename from gamefixes-gog/ulwgl-1228964594.py rename to gamefixes-gog/umu-1228964594.py diff --git a/gamefixes-gog/ulwgl-207350.py b/gamefixes-gog/umu-207350.py similarity index 100% rename from gamefixes-gog/ulwgl-207350.py rename to gamefixes-gog/umu-207350.py diff --git a/gamefixes-gog/ulwgl-219990.py b/gamefixes-gog/umu-219990.py similarity index 100% rename from gamefixes-gog/ulwgl-219990.py rename to gamefixes-gog/umu-219990.py diff --git a/gamefixes-gog/ulwgl-22610.py b/gamefixes-gog/umu-22610.py similarity index 100% rename from gamefixes-gog/ulwgl-22610.py rename to gamefixes-gog/umu-22610.py diff --git a/gamefixes-gog/ulwgl-22650.py b/gamefixes-gog/umu-22650.py similarity index 100% rename from gamefixes-gog/ulwgl-22650.py rename to gamefixes-gog/umu-22650.py diff --git a/gamefixes-gog/ulwgl-22670.py b/gamefixes-gog/umu-22670.py similarity index 100% rename from gamefixes-gog/ulwgl-22670.py rename to gamefixes-gog/umu-22670.py diff --git a/gamefixes-gog/ulwgl-237890.py b/gamefixes-gog/umu-237890.py similarity index 100% rename from gamefixes-gog/ulwgl-237890.py rename to gamefixes-gog/umu-237890.py diff --git a/gamefixes-gog/ulwgl-251150.py b/gamefixes-gog/umu-251150.py similarity index 100% rename from gamefixes-gog/ulwgl-251150.py rename to gamefixes-gog/umu-251150.py diff --git a/gamefixes-gog/ulwgl-251290.py b/gamefixes-gog/umu-251290.py similarity index 100% rename from gamefixes-gog/ulwgl-251290.py rename to gamefixes-gog/umu-251290.py diff --git a/gamefixes-gog/ulwgl-260310.py b/gamefixes-gog/umu-260310.py similarity index 100% rename from gamefixes-gog/ulwgl-260310.py rename to gamefixes-gog/umu-260310.py diff --git a/gamefixes-gog/ulwgl-312790.py b/gamefixes-gog/umu-312790.py similarity index 100% rename from gamefixes-gog/ulwgl-312790.py rename to gamefixes-gog/umu-312790.py diff --git a/gamefixes-gog/ulwgl-39510.py b/gamefixes-gog/umu-39510.py similarity index 100% rename from gamefixes-gog/ulwgl-39510.py rename to gamefixes-gog/umu-39510.py diff --git a/gamefixes-gog/ulwgl-436670.py b/gamefixes-gog/umu-436670.py similarity index 100% rename from gamefixes-gog/ulwgl-436670.py rename to gamefixes-gog/umu-436670.py diff --git a/gamefixes-gog/ulwgl-61500.py b/gamefixes-gog/umu-61500.py similarity index 100% rename from gamefixes-gog/ulwgl-61500.py rename to gamefixes-gog/umu-61500.py diff --git a/gamefixes-gog/ulwgl-644930.py b/gamefixes-gog/umu-644930.py similarity index 100% rename from gamefixes-gog/ulwgl-644930.py rename to gamefixes-gog/umu-644930.py diff --git a/gamefixes-gog/ulwgl-65540.py b/gamefixes-gog/umu-65540.py similarity index 100% rename from gamefixes-gog/ulwgl-65540.py rename to gamefixes-gog/umu-65540.py diff --git a/gamefixes-gog/ulwgl-metalgearsolid.py b/gamefixes-gog/umu-metalgearsolid.py similarity index 100% rename from gamefixes-gog/ulwgl-metalgearsolid.py rename to gamefixes-gog/umu-metalgearsolid.py diff --git a/gamefixes-gog/ulwgl-silenthill4.py b/gamefixes-gog/umu-silenthill4.py similarity index 100% rename from gamefixes-gog/ulwgl-silenthill4.py rename to gamefixes-gog/umu-silenthill4.py diff --git a/gamefixes-gog/ulwgl-wheeloftime.py b/gamefixes-gog/umu-wheeloftime.py similarity index 100% rename from gamefixes-gog/ulwgl-wheeloftime.py rename to gamefixes-gog/umu-wheeloftime.py diff --git a/gamefixes-humble/ulwgl-207350.py b/gamefixes-humble/umu-207350.py similarity index 100% rename from gamefixes-humble/ulwgl-207350.py rename to gamefixes-humble/umu-207350.py diff --git a/gamefixes-humble/ulwgl-61500.py b/gamefixes-humble/umu-61500.py similarity index 100% rename from gamefixes-humble/ulwgl-61500.py rename to gamefixes-humble/umu-61500.py diff --git a/gamefixes-ubisoft/ulwgl-19900.py b/gamefixes-ubisoft/umu-19900.py similarity index 100% rename from gamefixes-ubisoft/ulwgl-19900.py rename to gamefixes-ubisoft/umu-19900.py diff --git a/gamefixes-ubisoft/ulwgl-220240.py b/gamefixes-ubisoft/umu-220240.py similarity index 100% rename from gamefixes-ubisoft/ulwgl-220240.py rename to gamefixes-ubisoft/umu-220240.py diff --git a/gamefixes-ubisoft/ulwgl-233270.py b/gamefixes-ubisoft/umu-233270.py similarity index 100% rename from gamefixes-ubisoft/ulwgl-233270.py rename to gamefixes-ubisoft/umu-233270.py diff --git a/gamefixes-ubisoft/ulwgl-298110.py b/gamefixes-ubisoft/umu-298110.py similarity index 100% rename from gamefixes-ubisoft/ulwgl-298110.py rename to gamefixes-ubisoft/umu-298110.py diff --git a/gamefixes-ubisoft/ulwgl-371660.py b/gamefixes-ubisoft/umu-371660.py similarity index 100% rename from gamefixes-ubisoft/ulwgl-371660.py rename to gamefixes-ubisoft/umu-371660.py diff --git a/gamefixes-ulwgl/__init__.py b/gamefixes-umu/__init__.py similarity index 100% rename from gamefixes-ulwgl/__init__.py rename to gamefixes-umu/__init__.py diff --git a/gamefixes-ulwgl/default.py b/gamefixes-umu/default.py similarity index 100% rename from gamefixes-ulwgl/default.py rename to gamefixes-umu/default.py diff --git a/gamefixes-ulwgl/ulwgl-1174180.py b/gamefixes-umu/umu-1174180.py similarity index 100% rename from gamefixes-ulwgl/ulwgl-1174180.py rename to gamefixes-umu/umu-1174180.py diff --git a/gamefixes-ulwgl/ulwgl-2016590.py b/gamefixes-umu/umu-2016590.py similarity index 100% rename from gamefixes-ulwgl/ulwgl-2016590.py rename to gamefixes-umu/umu-2016590.py diff --git a/gamefixes-ulwgl/ulwgl-271590.py b/gamefixes-umu/umu-271590.py similarity index 100% rename from gamefixes-ulwgl/ulwgl-271590.py rename to gamefixes-umu/umu-271590.py diff --git a/gamefixes-ulwgl/ulwgl-582660.py b/gamefixes-umu/umu-582660.py similarity index 100% rename from gamefixes-ulwgl/ulwgl-582660.py rename to gamefixes-umu/umu-582660.py diff --git a/gamefixes-ulwgl/ulwgl-model2.py b/gamefixes-umu/umu-model2.py similarity index 100% rename from gamefixes-ulwgl/ulwgl-model2.py rename to gamefixes-umu/umu-model2.py diff --git a/gamefixes-ulwgl/ulwgl-starcitizen.py b/gamefixes-umu/umu-starcitizen.py similarity index 100% rename from gamefixes-ulwgl/ulwgl-starcitizen.py rename to gamefixes-umu/umu-starcitizen.py diff --git a/gamefixes-ulwgl/winetricks-gui.py b/gamefixes-umu/winetricks-gui.py similarity index 100% rename from gamefixes-ulwgl/winetricks-gui.py rename to gamefixes-umu/winetricks-gui.py diff --git a/gamefixes-zoomplatform/ulwgl-10220.py b/gamefixes-zoomplatform/umu-10220.py similarity index 100% rename from gamefixes-zoomplatform/ulwgl-10220.py rename to gamefixes-zoomplatform/umu-10220.py diff --git a/gamefixes-zoomplatform/ulwgl-1500540.py b/gamefixes-zoomplatform/umu-1500540.py similarity index 100% rename from gamefixes-zoomplatform/ulwgl-1500540.py rename to gamefixes-zoomplatform/umu-1500540.py diff --git a/gamefixes-zoomplatform/ulwgl-240200.py b/gamefixes-zoomplatform/umu-240200.py similarity index 100% rename from gamefixes-zoomplatform/ulwgl-240200.py rename to gamefixes-zoomplatform/umu-240200.py diff --git a/gamefixes-zoomplatform/ulwgl-292410.py b/gamefixes-zoomplatform/umu-292410.py similarity index 100% rename from gamefixes-zoomplatform/ulwgl-292410.py rename to gamefixes-zoomplatform/umu-292410.py diff --git a/gamefixes-zoomplatform/ulwgl-4bff76f4-566a-4714-b481-95d3343afe22.py b/gamefixes-zoomplatform/umu-4bff76f4-566a-4714-b481-95d3343afe22.py similarity index 100% rename from gamefixes-zoomplatform/ulwgl-4bff76f4-566a-4714-b481-95d3343afe22.py rename to gamefixes-zoomplatform/umu-4bff76f4-566a-4714-b481-95d3343afe22.py diff --git a/tools/check-links.sh b/tools/check-links.sh index 455d9cb6..0595cb11 100644 --- a/tools/check-links.sh +++ b/tools/check-links.sh @@ -5,8 +5,8 @@ # # Lint the following gamefix dir: -# gog, amazon, egs, humble, itchio, ubisoft, ulwgl, zoomplatform -for file in ./{gamefixes-amazon,gamefixes-gog,gamefixes-egs,gamefixes-humble,gamefixes-itchio,gamefixes-ubisoft,gamefixes-ulwgl,gamefixes-zoomplatform}/*; do +# gog, amazon, egs, humble, itchio, ubisoft, umu, zoomplatform +for file in ./{gamefixes-amazon,gamefixes-gog,gamefixes-egs,gamefixes-humble,gamefixes-itchio,gamefixes-ubisoft,gamefixes-umu,gamefixes-zoomplatform}/*; do if [[ -L "$file" && ! -e "$file" ]]; then echo "The following file is not a valid link: ${file}" exit 1 diff --git a/tools/lint.sh b/tools/lint.sh index 31b332fd..c4ebcf40 100644 --- a/tools/lint.sh +++ b/tools/lint.sh @@ -5,12 +5,12 @@ # # Lint the following gamefix dir: -# steam, gog, amazon, egs, humble, itchio, ubisoft, ulwgl, zoomplatform -mapfile -d '' files_array < <(find ./{gamefixes-steam,gamefixes-amazon,gamefixes-gog,gamefixes-egs,gamefixes-humble,gamefixes-itchio,gamefixes-ubisoft,gamefixes-ulwgl,gamefixes-zoomplatform} -type f -name "*.py" ! -name "__init__.py" -print0) +# steam, gog, amazon, egs, humble, itchio, ubisoft, umu, zoomplatform +mapfile -d '' files_array < <(find ./{gamefixes-steam,gamefixes-amazon,gamefixes-gog,gamefixes-egs,gamefixes-humble,gamefixes-itchio,gamefixes-ubisoft,gamefixes-umu,gamefixes-zoomplatform} -type f -name "*.py" ! -name "__init__.py" -print0) # Disable these checks: # - Long lines from comments -# - Import errors because ULWGL-protonfixes will be renamed at release +# - Import errors because umu-protonfixes will be renamed at release # - Docstrings for functions and modules # - Invalid identifier names for files pylint --rcfile pyproject.toml --disable C0103,C0116,E0401,C0301,C0114 "${files_array[@]}"