Changed the prvatekey and client_id checks to use the constants and m…

…oved chrome_1601 to a constant - so that all magic strings and path builders are in 1 location
sim0n00ps · Jun 13, 2024 · 43d179b · 43d179b
1 parent 8cda128
commit 43d179b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/OF DL/CDMApi.cs b/OF DL/CDMApi.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace WidevineClient.Widevine
@@ -9,7 +9,7 @@ public class CDMApi
 
         public byte[] GetChallenge(string initDataB64, string certDataB64, bool offline = false, bool raw = false)
         {
-            SessionId = CDM.OpenSession(initDataB64, "chrome_1610", offline, raw);
+            SessionId = CDM.OpenSession(initDataB64, Constants.DEVICE_NAME, offline, raw);
             CDM.SetServiceCertificate(SessionId, Convert.FromBase64String(certDataB64));
             return CDM.GetLicenseRequest(SessionId);
         }

diff --git a/OF DL/OF DL.csproj b/OF DL/OF DL.csproj
@@ -31,4 +31,13 @@
     </Reference>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="auth.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="rules.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/OF DL/Program.cs b/OF DL/Program.cs
@@ -221,7 +221,7 @@ public async static Task Main(string[] args)
                 }
             }
 
-            if (!File.Exists("cdm/devices/chrome_1610/device_client_id_blob"))
+            if (!File.Exists(Path.Join(WidevineClient.Widevine.Constants.DEVICES_FOLDER, WidevineClient.Widevine.Constants.DEVICE_NAME, "device_client_id_blob")))
             {
                 clientIdBlobMissing = true;
             }
@@ -230,7 +230,7 @@ public async static Task Main(string[] args)
                 AnsiConsole.Markup($"[green]device_client_id_blob located successfully![/]\n");
             }
 
-            if (!File.Exists("cdm/devices/chrome_1610/device_private_key"))
+            if (!File.Exists(Path.Join(WidevineClient.Widevine.Constants.DEVICES_FOLDER, WidevineClient.Widevine.Constants.DEVICE_NAME, "device_private_key")))
             {
                 devicePrivateKeyMissing = true;
             }

diff --git a/OF DL/Widevine/CDM.cs b/OF DL/Widevine/CDM.cs
@@ -1,4 +1,4 @@
-using ProtoBuf;
+using ProtoBuf;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -14,7 +14,7 @@ public class CDM
     {
         static Dictionary<string, CDMDevice> Devices { get; } = new Dictionary<string, CDMDevice>()
         {
-            ["chrome_1610"] = new CDMDevice("chrome_1610", null, null, null)
+            [Constants.DEVICE_NAME] = new CDMDevice(Constants.DEVICE_NAME, null, null, null)
         };
         static Dictionary<string, Session> Sessions { get; set; } = new Dictionary<string, Session>();
 

diff --git a/OF DL/Widevine/Constants.cs b/OF DL/Widevine/Constants.cs
@@ -1,8 +1,9 @@
-namespace WidevineClient.Widevine
+namespace WidevineClient.Widevine
 {
     public class Constants
     {
         public static string WORKING_FOLDER { get; set; } = System.IO.Path.GetFullPath(System.IO.Path.Join(System.IO.Directory.GetCurrentDirectory(), "cdm"));
         public static string DEVICES_FOLDER { get; set; } = System.IO.Path.GetFullPath(System.IO.Path.Join(WORKING_FOLDER, "devices"));
+        public static string DEVICE_NAME { get; set; } = "chrome_1610";
     }
 }