cdn: add decrypt param to get_manifests() and dont iter files on encrypted depots

steam/client/cdn.py

@@ -413,7 +413,7 @@ class CDNDepotManifest(DepotManifest):
         if self.name:
             params = repr(self.name) + ', ' + params
 
-        if self.metadata.filenames_encrypted:
+        if self.filenames_encrypted:
             params += ', filenames_encrypted=True'
 
         return "<%s(%s)>" % (
@@ -658,7 +658,7 @@ class CDNClient(object):
             self.app_depots[app_id] = self.steam.get_product_info([app_id])['apps'][app_id]['depots']
         return self.app_depots[app_id]
 
-    def get_manifests(self, app_id, branch='public', password=None, filter_func=None):
+    def get_manifests(self, app_id, branch='public', password=None, filter_func=None, decrypt=True):
         """Get a list of CDNDepotManifest for app
 
         :param app_id: App ID
@@ -694,8 +694,8 @@ class CDNClient(object):
                 if (app_id, branch) not in self.beta_passwords:
                     raise SteamError("Incorrect password for branch %r" % branch)
 
-        def async_fetch_manifest(app_id, depot_id, manifest_gid, name):
+        def async_fetch_manifest(app_id, depot_id, manifest_gid, decrypt, name):
-            manifest = self.get_manifest(app_id, depot_id, manifest_gid)
+            manifest = self.get_manifest(app_id, depot_id, manifest_gid, decrypt)
             manifest.name = name
             return manifest
 
@@ -743,6 +743,7 @@ class CDNClient(object):
                                               app_id,
                                               depot_id,
                                               manifest_gid,
+                                              decrypt,
                                               depot_info['name'],
                                               ))
 

steam/core/manifest.py

@@ -159,6 +159,11 @@ class DepotManifest(object):
         """:type: int"""
         return self.metadata.cb_disk_compressed
 
+    @property
+    def filenames_encrypted(self):
+        """:type: bool"""
+        return self.metadata.filenames_encrypted
+
     def decrypt_filenames(self, depot_key):
         """Decrypt all filenames in the manifest
 
@@ -256,19 +261,21 @@ class DepotManifest(object):
             return data.getvalue()
 
     def __iter__(self):
-        for mapping in self.payload.mappings:
+        if not self.filenames_encrypted:
-            yield self.DepotFileClass(self, mapping)
+            for mapping in self.payload.mappings:
+                yield self.DepotFileClass(self, mapping)
 
     def iter_files(self, pattern=None):
         """
         :param pattern: unix shell wildcard pattern, see :func:`.fnmatch`
         :type  pattern: str
         """
-        for mapping in self.payload.mappings:
+        if not self.filenames_encrypted:
-            if (pattern is not None
+            for mapping in self.payload.mappings:
-               and not fnmatch(mapping.filename.rstrip('\x00 \n\t'), pattern)):
+                if (pattern is not None
-                continue
+                   and not fnmatch(mapping.filename.rstrip('\x00 \n\t'), pattern)):
-            yield self.DepotFileClass(self, mapping)
+                    continue
+                yield self.DepotFileClass(self, mapping)
 
     def __len__(self):
         return len(self.payload.mappings)