From dd37fda07bef3a0b3f44254ba62880373e49d225 Mon Sep 17 00:00:00 2001
From: GeoffreyCoulaud <geoffrey.coulaud@gmail.com>
Date: Sun, 21 May 2023 14:54:33 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Better=20Steam=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/importer/sources/steam_source.py | 37 ++++++++++++++--------------
 src/utils/steam.py                   | 10 ++++++--
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/importer/sources/steam_source.py b/src/importer/sources/steam_source.py
index baeacac..238c714 100644
--- a/src/importer/sources/steam_source.py
+++ b/src/importer/sources/steam_source.py
@@ -1,3 +1,4 @@
+import re
 from abc import abstractmethod
 from pathlib import Path
 from time import time
@@ -34,25 +35,25 @@ class SteamSourceIterator(SourceIterator):
         self.manifests = set()
 
         # Get dirs that contain steam app manifests
-        manifests_dirs = set()
         libraryfolders_path = self.source.location / "steamapps" / "libraryfolders.vdf"
         with open(libraryfolders_path, "r") as file:
-            for line in file.readlines():
-                line = line.strip()
-                prefix = '"path"'
-                if not line.startswith(prefix):
-                    continue
-                library_folder = Path(line[len(prefix) :].strip()[1:-1])
-                manifests_dir = library_folder / "steamapps"
-                if not (manifests_dir).is_dir():
-                    continue
-                manifests_dirs.add(manifests_dir)
+            contents = file.read()
+        steamapps_dirs = [
+            Path(path) / "steamapps"
+            for path in re.findall('"path"\s+"(.*)"\n', contents, re.IGNORECASE)
+        ]
 
         # Get app manifests
-        for manifests_dir in manifests_dirs:
-            for child in manifests_dir.iterdir():
-                if child.is_file() and "appmanifest" in child.name:
-                    self.manifests.add(child)
+        for steamapps_dir in steamapps_dirs:
+            if not steamapps_dir.is_dir():
+                continue
+            self.manifests.update(
+                [
+                    manifest
+                    for manifest in steamapps_dir.glob("appmanifest_*.acf")
+                    if manifest.is_file()
+                ]
+            )
 
         self.manifests_iterator = iter(self.manifests)
 
@@ -71,7 +72,7 @@ class SteamSourceIterator(SourceIterator):
             return None
 
         # Skip non installed games
-        if not int(local_data["StateFlags"]) & self.installed_state_mask:
+        if not int(local_data["stateflags"]) & self.installed_state_mask:
             return None
 
         # Build game from local data
@@ -101,9 +102,9 @@ class SteamSourceIterator(SourceIterator):
         # TODO move to its own manager
         try:
             online_data = steam.get_api_data(appid=appid)
-        except (HTTPError, JSONDecodeError, SteamGameNotFoundError):
+        except (HTTPError, JSONDecodeError):
             pass
-        except SteamNotAGameError:
+        except (SteamNotAGameError, SteamGameNotFoundError):
             game.update_values({"blacklisted": True})
         else:
             game.update_values(online_data)
diff --git a/src/utils/steam.py b/src/utils/steam.py
index 5e5677c..f332456 100644
--- a/src/utils/steam.py
+++ b/src/utils/steam.py
@@ -23,12 +23,16 @@ class SteamInvalidManifestError(SteamError):
 
 
 class SteamManifestData(TypedDict):
+    """Dict returned by SteamHelper.get_manifest_data"""
+
     name: str
     appid: str
-    StateFlags: str
+    stateflags: str
 
 
 class SteamAPIData(TypedDict):
+    """Dict returned by SteamHelper.get_api_data"""
+
     developers: str
 
 
@@ -47,7 +51,7 @@ class SteamHelper:
 
         for key in SteamManifestData.__required_keys__:
             regex = f'"{key}"\s+"(.*)"\n'
-            if (match := re.search(regex, contents)) is None:
+            if (match := re.search(regex, contents, re.IGNORECASE)) is None:
                 raise SteamInvalidManifestError()
             data[key] = match.group(1)
 
@@ -68,9 +72,11 @@ class SteamHelper:
             raise error
 
         if not data["success"]:
+            logging.debug("Appid %s not found", appid)
             raise SteamGameNotFoundError()
 
         if data["data"]["type"] != "game":
+            logging.debug("Appid %s is not a game", appid)
             raise SteamNotAGameError()
 
         # Return API values we're interested in