typo

unshackle/services/UKTV/__init__.py

@@ -120,14 +120,14 @@ class UKTV(Service):
         data = r.json()
 
         self.license = next((
-            x["key_systems"]["com.wiunshackle.alpha"]["license_url"]
+            x["key_systems"]["com.widevine.alpha"]["license_url"]
             for x in data["sources"]
-            if x.get("key_systems").get("com.wiunshackle.alpha")),
+            if x.get("key_systems").get("com.widevine.alpha")),
             None,
         )
         source_manifest = next((
             x["src"] for x in data["sources"] 
-            if x.get("key_systems").get("com.wiunshackle.alpha")),
+            if x.get("key_systems").get("com.widevine.alpha")),
             None,
         )
         if not self.license or not source_manifest:

unshackle/unshackle.yaml

@@ -14,65 +14,67 @@ decryption: mp4decrypt
 scene_naming: false
 series_year: false
 
+# Widevine pssh display; fold, crop or ellipsis
+pssh_display: ellipsis
+
 # Login credentials for each Service
 credentials:
-  ALL4: email:password
-  ROKU: email:password
-  TVNZ: email:password
-  TPTV: email:password
-  CBC: email:password
-# Override default directories used across envied
+  ALL4: angela.slaney@gmail.com:Nood13sh
+  ROKU: moretonplumber@yandex.com:$WPJ~Mdh2:X@EtB
+  TVNZ: moretonplumber@yandex.com:penumbra
+  TPTV: moretonplumber@yandex.com:penumbra1234
+  CBC: moretonplumber@yandex.com:penumbra
+# Override default directories used across unshackle
 directories:
-  cache: Cache
-  cookies: Cookies
+  cache: /home/angela/.local/tmp/devine
+  cookies: /home/angela/.local/share/devine/cookies
   dcsl: DCSL # Device Certificate Status List
-  downloads: Downloads
-  logs: Logs
-  temp: Temp
-  wvds: WVDs
+  downloads: /home/angela/Downloads/devine
+  logs: /home/angela/.local/tmp/devine/
+  temp: /home/angela/.local/tmp/devine/
+  wvds: /home/angela/.local/share/devine/WVDs/
   prds: PRDs
+  User_Configs: /home/angela/.local/share/devine/
   # Additional directories that can be configured:
   # commands: Commands
-  #services:
-  #  - ./envied/services/
-  vaults: vaults/
+  services:
+    - unshackle/services/
+  vaults: /home/angela/.local/share/devine/vaults/
   # fonts: Fonts
 
-# Pre-define which Widevine or PlayReady device to use for each Serviceuv run envied
+# Pre-define which Widevine or PlayReady device to use for each Service
 cdm:
   default: device
 
 # Use pywidevine Serve-compliant Remote CDMs
-# Currently not working!
-remote_cdm:
-    - name: "CDRM_Project_API"
-      device_type: ANDROID
-      system_id: 22590
-      security_level: 3
-      host: "https://cdrm-project.com/remotecdm/widevine"
-      secret: "CDRM"
-      device_name: "public"
+#remote_cdm:
+#    - name: "CDRM_Project_API"
+#      device_type: ANDROID
+#      system_id: 22590
+#      security_level: 3
+#      host: "https://cdrm-project.com/remotecdm/widevine"
+#      secret: "CDRM"
+#      device_name: "public"
 
 
 # Key Vaults store your obtained Content Encryption Keys (CEKs)
 key_vaults:
-#- type: SQLite
-#  name: Local vault
-#  path: key_store.db
+- type: SQLite
+  name: Local vault
+  path: /home/angela/Programming/gits/devine-services/key_store.db
 
 - type: HTTPAPI
   name: drmlab
   host: http://api.drmlab.io/vault/
   password: gEX75q7I5YVkvgF5SUkcNd41IbGrDtTT
-- type: API
-  name: CDRM Vault
-  uri: https://cdrm-project.com/api/cache
-  token: CDRM
+#- type: API
+#  name: "Online Vault"
+#  uri: "https://cdrm-project.com/api/cache"
+#  token: "CDRM"
 
 
 # Choose what software to use to download data
-# CAUTION: DO NOT USE n_m3u8dl_re BELOW ON WINDOWS MACHINES
-downloader: aria2c  
+downloader: n_m3u8dl_re
 # Options: requests | aria2c | curl_impersonate | n_m3u8dl_re
 # Can also be a mapping:
 # downloader:
@@ -113,16 +115,17 @@ headers:
   Accept-Language: "en-US,en;q=0.8"
   User-Agent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36"
 
-# Override default filenames used across envied
+# Override default filenames used across unshackle
 filenames:
-  log: "envied_{name}_{time}.log"
+  log: "unshackle_{name}_{time}.log"
   config: "config.yaml"
-  root_config: "envied.yaml"
+  root_config: "unshackle.yaml"
   chapters: "Chapters_{title}_{random}.txt"
   subtitle: "Subtitle_{id}_{language}.srt"
 
 # API key for The Movie Database (TMDB)
 tmdb_api_key: ""
+tvdb_api_key: "deec52e0-019c-44ec-b4eb-0f6c48473b20"
 
 # conversion_method:
 # - auto (default): Smart routing - subby for WebVTT/SAMI, standard for others
@@ -141,11 +144,12 @@ services:
   #   api_key: "service_specific_key"
 
 # Legacy NordVPN configuration (use proxy_providers instead)
-#proxy_providers:
-#  nordvpn:
-#    username: username
-#    password: password
-#    server_map:
-#     us: 6918
-#     uk: 2613
-#     nz: 100
+proxy_providers:
+  nordvpn:
+    username: gBM9ejjmY1J15jccH12VT7Qy
+    password: 1kmuCrRXnT55uAjiUTd8twv9
+    server_map:
+      us: 6918
+      uk: 2613
+      nz: 100
+