Merge branch 'main' into load_modules

src/auto_archiver/enrichers/wacz_enricher.py

@@ -84,7 +84,8 @@ class WaczArchiverEnricher(Enricher, Archiver):
             "--behaviors", "autoscroll,autoplay,autofetch,siteSpecific",
             "--behaviorTimeout", str(self.timeout),
             "--timeout", str(self.timeout),
-            "--blockAds" # TODO: test
+            "--diskUtilization", "99",
+            # "--blockAds" # note: this has been known to cause issues on cloudflare protected sites
         ]
         
         if self.docker_in_docker:

src/auto_archiver/modules/generic_extractor/generic_extractor.py

@@ -236,6 +236,10 @@ class GenericExtractor(Archiver):
             result = self.get_metadata_for_video(data, info_extractor, url, ydl)
 
         except Exception as e:
+            if info_extractor.ie_key() == "generic":
+                # don't clutter the logs with issues about the 'generic' extractor not having a dropin
+                return False
+
             logger.debug(f'Issue using "{info_extractor.IE_NAME}" extractor to download video (error: {repr(e)}), attempting to use extractor to get post data instead')
             try:
                 result = self.get_metadata_for_post(info_extractor, url, ydl)