Improve denuvo-detection by also checking Steam's DRM notice.

dailyreleases/main.py

@@ -175,10 +175,13 @@ class DailyReleasesBot(object):
 
         # If one of the store links we found is to Steam, use their API to get (better) information about the game.
         # Note: Doesn't apply to Steam bundles, as Steam has no public API for those.
-        try:
+        if "Steam" in store_links:
-            steam_type, steam_appid = re.search("(app|sub)(?:/)([0-9]+)", store_links["Steam"]).groups()
             logger.debug("Getting information about game using Steam API")
+            steam_type, steam_appid = re.search("(app|sub|bundle)(?:/)([0-9]+)", store_links["Steam"]).groups()
 
+            if steam_type == "bundle":
+                logger.debug("Steam link is to bundle: not utilizing API")
+            else:
                 # If the release is a package on Steam (e.g. game + dlc), we need to find the base game of the package
                 if steam_type == "sub":
                     steam_packagedetails = self.steam.packagedetails(steam_appid)
@@ -190,7 +193,7 @@ class DailyReleasesBot(object):
                     steam_package_appids = [str(app["id"]) for app in steam_packagedetails["apps"]]
                     steam_package_apps_appdetails = [self.steam.appdetails(appid) for appid in steam_package_appids]
                     steam_package_basegame_appdetails = max(steam_package_apps_appdetails,
-                                                        key=lambda app: self.steam.reviews(app["steam_appid"]).number)
+                                                            key=lambda app: self.steam.reviews(app["steam_appid"]).num)
 
                     # Use the base game as the basis for further computation
                     steam_appdetails = steam_package_basegame_appdetails
@@ -204,22 +207,17 @@ class DailyReleasesBot(object):
                 # Now that we have a single Steam game to represent the release, use it to improve the information
                 score, num_reviews = self.steam.reviews(steam_appid)
 
-            # DLC releases doesn't always contain the word "dlc" (e.g. 'Fallout New Vegas: Dead Money'), so some DLCs
+                # DLC releases don't always contain the word "dlc" (e.g. 'Fallout New Vegas: Dead Money'), so some DLCs
-            # get mislabeled as games during offline parsing. We can use the Steam API to get the correct release type,
+                # get mislabeled as games during offline parsing. We can use Steam's API to get the correct type, but if
-            # but if the release was already deemed an update, keep it as such, because an update to a DLC is an update.
+                # the release was already deemed an update, keep it as such, because an update to a DLC is an update.
                 if steam_appdetails["type"] == "dlc" and rls_type != "Update":
                     rls_type = "DLC"
 
-            # If Steam links to a 3rd-party EULA, check it for the word "denuvo" and add a highlight if it occurs
+                # Add highlight if "denuvo" occurs in Steam's DRM notice or potential 3rd-party EULA
-            if "denuvo" in self.steam.eula(steam_appid).lower():
+                if "denuvo" in (steam_appdetails.get("drm_notice", "") + self.steam.eula(steam_appid)).lower():
-                logger.info("'denuvo' found in EULA; adding 'DENUVO' to highlights")
+                    logger.info("'denuvo' found in Steam DRM-notice/EULA; adding 'DENUVO' to highlights")
                     highlights.append("DENUVO")
 
-        except KeyError:
-            pass  # no link to Steam store
-        except AttributeError:
-            logger.debug("Steam link is to bundle: not utilizing API")
-
         release = {
             "dirname": dirname,
             "rls_name": rls_name,  # dirname without group

dailyreleases/steam.py

@@ -1,6 +1,8 @@
 import logging
 from collections import namedtuple
 
+from bs4 import BeautifulSoup
+
 from dailyreleases import util
 
 logger = logging.getLogger(__name__)
@@ -38,7 +40,7 @@ class Steam(object):
 
     def reviews(self, appid):
         app_review = self.appreviews(appid)
-        Reviews = namedtuple("Reviews", ("score", "number"))
+        Reviews = namedtuple("Reviews", ("score", "num"))
 
         if app_review["total_reviews"] == 0:
             return Reviews(-1, -1)
@@ -47,7 +49,11 @@ class Steam(object):
         return Reviews(positive, app_review["total_reviews"])
 
     def eula(self, appid):
-        return self.cache.get(f"https://store.steampowered.com//eula/{appid}_eula_0").text
+        r = self.cache.get(f"https://store.steampowered.com//eula/{appid}_eula_0")
+        soup = BeautifulSoup(r.text, "html.parser").find(id="eula_content")
+        if soup is not None:
+            return soup.text
+        return ""
 
     def search(self, query):
         logger.debug("Searching Steam store for %s", query)

tests/test_parse_dirname.py

@@ -113,9 +113,13 @@ class ParseDirnameTestCase(unittest.TestCase):
         self.assertEqual("Game", p["type"])
         self.assertIn("store.steampowered.com/bundle/232", p["store_links"]["Steam"])
 
-    def test_denuvo_eula(self):
+    def test_steam_denuvo(self):
+        # "denuvo" occurs in the Steam EULA
         p = self.bot.parse_dirname("Deus.Ex.Mankind.Divided-CPY")
-        self.assertIn("store.steampowered.com/app/337000", p["store_links"]["Steam"])
+        self.assertEqual(["DENUVO"], p["highlights"])
+
+        # "denuvo" occurs in the Steam DRM notice
+        p = self.bot.parse_dirname("Yakuza.0-FAKE")
         self.assertEqual(["DENUVO"], p["highlights"])
 
     def test_episode_release(self):