Ignore file size and md5 checks for trove items

Author: MayeulC

humble_downloader/actions.py

@@ -71,7 +71,7 @@ def batch_download(hapi, game_keys):
                                                                         key)
             item_count_total += len(humble_downloads)
             download_size_total += sum(
-                    dl.humble_file_size for dl in humble_downloads)
+                    dl.humble_file_size or 0 for dl in humble_downloads)
             logger.display_message(False, "Processing",
                                    "Added %d downloads for order %s"
                                    % (len(humble_downloads), key))

humble_downloader/humble_download.py

@@ -6,6 +6,7 @@
 from .config_data import ConfigData
 from .humble_api.events import Events
 from .humble_api.humble_hash import HumbleHash
+from .humble_api.model.trove_order import TroveOrder
 
 __author__ = "Brian Schkerke"
 __copyright__ = "Copyright 2016 Brian Schkerke"
@@ -40,6 +41,7 @@ def __init__(self, cd, cds, co, csp, cv):
         self.subproduct_name = csp.product_name
         self.humble_md5 = cds.md5
         self.machine_name = cd.machine_name
+        self.is_trove = isinstance(co, TroveOrder)
 
     @property
     def local_file_size(self):
@@ -121,7 +123,7 @@ def check_status(self):
                      self.local_file_size or 0))
             self.partial_download = True
             self.requires_download = True
-        elif not ConfigData.ignore_md5:
+        elif not ConfigData.ignore_md5 and not self.is_trove:
             if not self.md5_matches:
                 self.status_message = (
                         "MD5 of %s doesn't match (expected %s actual %s)." %
@@ -173,7 +175,8 @@ def __download_file(self, web_request, mode, read_bytes=0):
             # For a download that's resumed the content-length will be the
             # remaining bytes, not the total.
             # total_length = int(web_request.headers.get("content-length"))
-            total_length = self.humble_file_size
+            total_length = self.humble_file_size or int(
+                web_request.headers.get("content-length"))
             chunk_size = ConfigData.chunk_size
 
             for chunk in web_request.iter_content(chunk_size=chunk_size):
@@ -197,22 +200,25 @@ def __create_directory(self):
             os.makedirs(full_directory)
 
     def is_valid(self):
-        if self.humble_file_size is None or self.humble_file_size == 0:
-            self.status_message = ("Humble file size reported as 0. "
-                                   "Download is invalid.")
-            return False
         if self.download_url is None or len(self.download_url) == 0:
             self.status_message = ("Humble download URL is an empty string. "
                                    "Download is invalid.")
             return False
-        if self.humble_md5 is None or len(self.humble_md5) == 0:
-            self.status_message = ("Humble MD5 is an empty string. "
-                                   "Download is invalid.")
-            return False
         if self.filename is None or len(self.filename) == 0:
             self.status_message = ("Filename is an empty string. "
                                    "Download is invalid.")
             return False
+        if self.is_trove:
+            return True
+        if self.humble_file_size is None or self.humble_file_size == 0:
+            self.status_message = ("Humble file size reported as 0. "
+                                   "Download is invalid.")
+            print("size reported as 0")
+            return False
+        if self.humble_md5 is None or len(self.humble_md5) == 0:
+            self.status_message = ("Humble MD5 is an empty string. "
+                                   "Download is invalid.")
+            return False
 
         return True