From 4401378ce36189419a2f646f62bc6e72e6bf332a Mon Sep 17 00:00:00 2001
From: kramo <93832451+kra-mo@users.noreply.github.com>
Date: Fri, 24 Mar 2023 21:07:08 +0100
Subject: [PATCH] Use fstrings consistently

---
 src/utils/bottles_parser.py |  4 ++--
 src/utils/heroic_parser.py  |  2 +-
 src/utils/steam_parser.py   | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/utils/bottles_parser.py b/src/utils/bottles_parser.py
index a29b33b..85fd3c1 100644
--- a/src/utils/bottles_parser.py
+++ b/src/utils/bottles_parser.py
@@ -103,7 +103,7 @@ def bottles_parser(parent_widget, action):
         game = library[game]
         values = {}
 
-        values["game_id"] = "bottles_" + game["id"]
+        values["game_id"] = f'bottles_{game["id"]}'
 
         if (
             values["game_id"] in parent_widget.games
@@ -113,7 +113,7 @@ def bottles_parser(parent_widget, action):
 
         values["name"] = game["name"]
         values["executable"] = "xdg-open " + shlex.quote(
-            "bottles:run/" + game["bottle"]["name"] + "/" + game["name"]
+            f'bottles:run/{game["bottle"]["name"]}/{game["name"]}'
         )
         values["hidden"] = False
         values["source"] = "bottles"
diff --git a/src/utils/heroic_parser.py b/src/utils/heroic_parser.py
index 78aa852..95ed1f1 100644
--- a/src/utils/heroic_parser.py
+++ b/src/utils/heroic_parser.py
@@ -142,7 +142,7 @@ def heroic_parser(parent_widget, action):
                     heroic_dir,
                     "images-cache",
                     hashlib.sha256(
-                        (game["art_square"] + "?h=400&resize=1&w=300").encode()
+                        (f'{game["art_square"]} ?h=400&resize=1&w=300').encode()
                     ).hexdigest(),
                 )
                 if os.path.exists(image_path):
diff --git a/src/utils/steam_parser.py b/src/utils/steam_parser.py
index eb9f7a5..bfcc1ef 100644
--- a/src/utils/steam_parser.py
+++ b/src/utils/steam_parser.py
@@ -51,10 +51,10 @@ def get_game(task, datatypes, current_time, parent_widget, appmanifest, steam_di
         data = open_file.read()
         open_file.close()
     for datatype in datatypes:
-        value = re.findall('"' + datatype + '"\t\t"(.*)"\n', data)
+        value = re.findall(f'"{datatype}"\t\t"(.*)"\n', data)
         values[datatype] = value[0]
 
-    values["game_id"] = "steam_" + values["appid"]
+    values["game_id"] = f'steam_{values["appid"]}'
 
     if (
         values["game_id"] in parent_widget.games
@@ -64,16 +64,16 @@ def get_game(task, datatypes, current_time, parent_widget, appmanifest, steam_di
         return
 
     values["executable"] = (
-        "start steam://rungameid/" + values["appid"]
+        f'start steam://rungameid/{values["appid"]}'
         if os.name == "nt"
-        else "xdg-open steam://rungameid/" + values["appid"]
+        else f'xdg-open steam://rungameid/{values["appid"]}'
     )
     values["hidden"] = False
     values["source"] = "steam"
     values["added"] = current_time
     values["last_played"] = 0
 
-    url = "https://store.steampowered.com/api/appdetails?appids=" + values["appid"]
+    url = f'https://store.steampowered.com/api/appdetails?appids={values["appid"]}'
 
     # On Linux the request is made through gvfs so the app can run without network permissions
     if os.name == "nt":
@@ -97,7 +97,7 @@ def get_game(task, datatypes, current_time, parent_widget, appmanifest, steam_di
             steam_dir,
             "appcache",
             "librarycache",
-            values["appid"] + "_library_600x900.jpg",
+            f'{values["appid"]}_library_600x900.jpg',
         )
     ):
         save_cover(
@@ -107,7 +107,7 @@ def get_game(task, datatypes, current_time, parent_widget, appmanifest, steam_di
                 steam_dir,
                 "appcache",
                 "librarycache",
-                values["appid"] + "_library_600x900.jpg",
+                f'{values["appid"]}_library_600x900.jpg',
             ),
         )