Buon natale a tutti ❤️

Author: Arrowar

.github/workflows/update_domain.yml

@@ -7,46 +7,59 @@ on:
 jobs:
   update-domains:
     runs-on: ubuntu-latest
-
     permissions:
       contents: write
-
+    
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0  # Serve per l'amend
+          fetch-depth: 0
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
           python-version: '3.12'
-
+      
       - name: Install dependencies
         run: |
           pip install httpx tldextract ua-generator dnspython
           pip install --upgrade pip setuptools wheel
-
+      
       - name: Configure DNS
         run: |
           sudo sh -c 'echo "nameserver 208.67.220.220" > /etc/resolv.conf'
           sudo sh -c 'echo "nameserver 208.67.222.222" >> /etc/resolv.conf'
           sudo sh -c 'echo "nameserver 77.88.8.8" >> /etc/resolv.conf'
-
+      
       - name: Execute domain update script
         run: python .github/workflows/script/domain_update.py
 
-      - name: Always amend last commit
+      - name: Check for changes and amend/commit
         run: |
           git config --global user.name 'github-actions[bot]'
           git config --global user.email 'github-actions[bot]@users.noreply.github.com'
           
           if ! git diff --quiet .github/workflows/script/domains.json; then
-            echo "📝 Changes detected - amending last commit"
+            echo "📝 Changes detected in domains.json"
             git add .github/workflows/script/domains.json
-            git commit --amend --no-edit
-            git push --force-with-lease origin main
+            
+            if git rev-parse HEAD >/dev/null 2>&1; then
+              if git log origin/main..HEAD --oneline | grep -q .; then
+                echo "🔄 Amending unpushed commit"
+                git commit --amend --no-edit
+              else
+                echo "✨ Creating new commit (last commit already pushed)"
+                git commit -m "🔄 Update domains.json [$(date +'%Y-%m-%d %H:%M:%S')]"
+              fi
+            else
+              echo "✨ Creating first commit"
+              git commit -m "🔄 Update domains.json [$(date +'%Y-%m-%d %H:%M:%S')]"
+            fi
+            
+            git push --force-with-lease origin main || git push origin main
+            echo "✅ Changes pushed successfully"
           else
             echo "✅ No changes to domains.json"
           fi
@@ -55,5 +68,5 @@ jobs:
         if: failure()
         run: |
           echo "❌ Something went wrong. Repository state:"
-          git log --oneline -5
+          git log --oneline -5 || echo "No commits yet"
           git status

StreamingCommunity/Lib/DASH/downloader.py

@@ -20,7 +20,7 @@
 from .parser import MPD_Parser
 from .segments import MPD_Segments
 from .decrypt import decrypt_with_mp4decrypt
-from .cdm_helpher import get_widevine_keys, map_keys_to_representations
+from .extractor import get_widevine_keys, map_keys_to_representations
 
 
 # FFmpeg functions

StreamingCommunity/Lib/DASH/extractor/__init__.py

@@ -0,0 +1,8 @@
+# 24.12.25
+
+from .ex_widevine import get_widevine_keys, map_keys_to_representations
+
+__all__ = [
+    'get_widevine_keys', 
+    'map_keys_to_representations'
+]

…reamingCommunity/Lib/DASH/cdm_helpher.py …munity/Lib/DASH/extractor/ex_widevine.pyStreamingCommunity/Lib/DASH/cdm_helpher.py renamed to StreamingCommunity/Lib/DASH/extractor/ex_widevine.py StreamingCommunity/Lib/DASH/cdm_helpher.py renamed to StreamingCommunity/Lib/DASH/extractor/ex_widevine.py

@@ -16,7 +16,6 @@
 console = Console()
 
 
-
 def get_widevine_keys(pssh: str, license_url: str, cdm_device_path: str, headers: dict = None, query_params: dict =None, key: str=None):
     """
     Extract Widevine CONTENT keys (KID/KEY) from a license using pywidevine.
@@ -173,15 +172,9 @@ def get_info_wvd(cdm_device_path):
 
     # Extract client info
     info = {ci.name: ci.value for ci in device.client_id.client_info}
-    caps = device.client_id.client_capabilities
-
-    company = info.get("company_name", "N/A")
     model = info.get("model_name", "N/A")
-
     device_name = info.get("device_name", "").lower()
     build_info = info.get("build_info", "").lower()
-
-    # Extract device type
     is_emulator = any(x in device_name for x in [
         "generic", "sdk", "emulator", "x86"
     ]) or "test-keys" in build_info or "userdebug" in build_info
@@ -196,6 +189,5 @@ def get_info_wvd(cdm_device_path):
     console.print(
         f"[cyan]Load WVD: "
         f"[red]L{device.security_level} [cyan]| [red]{dev_type} [cyan]| "
-        f"[red]{company} {model} [cyan]| API [red]{caps.oem_crypto_api_version} [cyan]| "
         f"[cyan]SysID: [red]{device.system_id}"
     )

StreamingCommunity/Lib/HLS/segments.py

@@ -31,7 +31,7 @@
 
 # External
 from ..MP4 import MP4_Downloader
-from ..DASH.cdm_helpher import get_widevine_keys
+from ..DASH.extractor import get_widevine_keys
 from ..DASH.decrypt import decrypt_with_mp4decrypt
 
 

StreamingCommunity/Util/os.py

@@ -15,7 +15,7 @@
 
 # Internal utilities
 from .installer import check_ffmpeg, check_mp4decrypt, check_device_wvd_path, check_megatools
-from StreamingCommunity.Lib.DASH.cdm_helpher import get_info_wvd
+from StreamingCommunity.Lib.DASH.extractor.ex_widevine import get_info_wvd
 
 
 # Variable