upstream spammers code removed

README.md

@@ -65,7 +65,7 @@ The top level vinefeeder config file at  TwinVine/packages/vinefeeder/src/vinefe
 
 **Services**
 
-Vinefeeder currently has 8 services for which search, browse and list-select are available  
+Vinefeeder currently has 10 services for which search, browse and list-select are available  
   
   ALL4  BBC  ITVX  MY5 PLEX RTE STV  TPTV  TVNZ  U 
   

packages/envied/src/envied/commands/dl.py

@@ -41,7 +41,6 @@ from rich.text import Text
 from rich.tree import Tree
 
 from envied.core import binaries
-from envied.core.cdm import DecryptLabsRemoteCDM
 from envied.core.config import config
 from envied.core.console import console
 from envied.core.constants import DOWNLOAD_LICENCE_ONLY, AnyTrack, context_settings
@@ -354,10 +353,8 @@ class dl:
                 sys.exit(1)
 
             if self.cdm:
-                if isinstance(self.cdm, DecryptLabsRemoteCDM):
-                    drm_type = "PlayReady" if self.cdm.is_playready else "Widevine"
-                    self.log.info(f"Loaded {drm_type} Remote CDM: DecryptLabs (L{self.cdm.security_level})")
-                elif hasattr(self.cdm, "device_type") and self.cdm.device_type.name in ["ANDROID", "CHROME"]:
+               
+                if hasattr(self.cdm, "device_type") and self.cdm.device_type.name in ["ANDROID", "CHROME"]:
                     self.log.info(f"Loaded Widevine CDM: {self.cdm.system_id} (L{self.cdm.security_level})")
                 else:
                     self.log.info(
@@ -923,9 +920,7 @@ class dl:
                                             service.get_playready_license
                                             if (
                                                 isinstance(self.cdm, PlayReadyCdm)
-                                                or (
-                                                    isinstance(self.cdm, DecryptLabsRemoteCDM) and self.cdm.is_playready
-                                                )
+                                                
                                             )
                                             and hasattr(service, "get_playready_license")
                                             else service.get_widevine_license,
@@ -1254,17 +1249,13 @@ class dl:
             return
 
         if isinstance(drm, Widevine):
-            if not isinstance(self.cdm, (WidevineCdm, DecryptLabsRemoteCDM)) or (
-                isinstance(self.cdm, DecryptLabsRemoteCDM) and self.cdm.is_playready
-            ):
+            if not isinstance(self.cdm, (WidevineCdm)):
                 widevine_cdm = self.get_cdm(self.service, self.profile, drm="widevine")
                 if widevine_cdm:
                     self.log.info("Switching to Widevine CDM for Widevine content")
                     self.cdm = widevine_cdm
         elif isinstance(drm, PlayReady):
-            if not isinstance(self.cdm, (PlayReadyCdm, DecryptLabsRemoteCDM)) or (
-                isinstance(self.cdm, DecryptLabsRemoteCDM) and not self.cdm.is_playready
-            ):
+            if not isinstance(self.cdm, (PlayReadyCdm)):
                 playready_cdm = self.get_cdm(self.service, self.profile, drm="playready")
                 if playready_cdm:
                     self.log.info("Switching to PlayReady CDM for PlayReady content")
@@ -1547,7 +1538,7 @@ class dl:
                 del cdm_api["type"]
 
                 # All DecryptLabs CDMs use DecryptLabsRemoteCDM
-                return DecryptLabsRemoteCDM(service_name=service, vaults=self.vaults, **cdm_api)
+                return None
             else:
                 del cdm_api["name"]
                 if "type" in cdm_api:

packages/envied/src/envied/core/downloaders/n_m3u8dl_re.py

@@ -150,6 +150,7 @@ def download(
 
     track_type = track.__class__.__name__
     thread_count = str(config.n_m3u8dl_re.get("thread_count", max_workers))
+    retry_count = str(config.n_m3u8dl_re.get("retry_count", max_workers))
     ad_keyword = config.n_m3u8dl_re.get("ad_keyword")
 
     arguments = [
@@ -160,6 +161,8 @@ def download(
         output_dir,
         "--thread-count",
         thread_count,
+        "--download-retry-count",
+        retry_count,
         "--no-log",
         "--write-meta-json",
         "false",
@@ -296,4 +299,4 @@ def n_m3u8dl_re(
     yield from download(urls, track, output_dir, filename, headers, cookies, proxy, max_workers, content_keys)
 
 
-__all__ = ("n_m3u8dl_re",)
+__all__ = ("n_m3u8dl_re",)