Major refactor #141

Merged
sim0n00ps merged 55 commits from whimsical-c4lic0/OF-DL:refactor-architecture into master 2026-02-13 00:21:58 +00:00
10 changed files with 16 additions and 18 deletions
Showing only changes of commit 5df13775f0 - Show all commits

View File

@ -1,10 +1,10 @@
using Org.BouncyCastle.Crypto; using System.Security.Cryptography;
using Org.BouncyCastle.Crypto;
using Org.BouncyCastle.Crypto.Engines; using Org.BouncyCastle.Crypto.Engines;
using Org.BouncyCastle.Crypto.Macs; using Org.BouncyCastle.Crypto.Macs;
using Org.BouncyCastle.Crypto.Parameters; using Org.BouncyCastle.Crypto.Parameters;
using System.Security.Cryptography;
namespace WidevineClient.Crypto namespace OF_DL.Crypto
{ {
public class CryptoUtils public class CryptoUtils
{ {

View File

@ -1,6 +1,6 @@
using System.Security.Cryptography; using System.Security.Cryptography;
namespace WidevineClient.Crypto namespace OF_DL.Crypto
{ {
public class Padding public class Padding
{ {

View File

@ -463,7 +463,7 @@ public class Program(IServiceProvider serviceProvider)
Environment.Exit(4); Environment.Exit(4);
} }
if (!File.Exists(Path.Join(WidevineClient.Widevine.Constants.DEVICES_FOLDER, WidevineClient.Widevine.Constants.DEVICE_NAME, "device_client_id_blob"))) if (!File.Exists(Path.Join(Constants.DEVICES_FOLDER, Constants.DEVICE_NAME, "device_client_id_blob")))
{ {
clientIdBlobMissing = true; clientIdBlobMissing = true;
Log.Debug("clientIdBlobMissing missing"); Log.Debug("clientIdBlobMissing missing");
@ -471,10 +471,10 @@ public class Program(IServiceProvider serviceProvider)
else else
{ {
AnsiConsole.Markup($"[green]device_client_id_blob located successfully![/]\n"); AnsiConsole.Markup($"[green]device_client_id_blob located successfully![/]\n");
Log.Debug("clientIdBlobMissing found: " + File.Exists(Path.Join(WidevineClient.Widevine.Constants.DEVICES_FOLDER, WidevineClient.Widevine.Constants.DEVICE_NAME, "device_client_id_blob"))); Log.Debug("clientIdBlobMissing found: " + File.Exists(Path.Join(Constants.DEVICES_FOLDER, Constants.DEVICE_NAME, "device_client_id_blob")));
} }
if (!File.Exists(Path.Join(WidevineClient.Widevine.Constants.DEVICES_FOLDER, WidevineClient.Widevine.Constants.DEVICE_NAME, "device_private_key"))) if (!File.Exists(Path.Join(Constants.DEVICES_FOLDER, Constants.DEVICE_NAME, "device_private_key")))
{ {
devicePrivateKeyMissing = true; devicePrivateKeyMissing = true;
Log.Debug("devicePrivateKeyMissing missing"); Log.Debug("devicePrivateKeyMissing missing");
@ -482,7 +482,7 @@ public class Program(IServiceProvider serviceProvider)
else else
{ {
AnsiConsole.Markup($"[green]device_private_key located successfully![/]\n"); AnsiConsole.Markup($"[green]device_private_key located successfully![/]\n");
Log.Debug("devicePrivateKeyMissing found: " + File.Exists(Path.Join(WidevineClient.Widevine.Constants.DEVICES_FOLDER, WidevineClient.Widevine.Constants.DEVICE_NAME, "device_private_key"))); Log.Debug("devicePrivateKeyMissing found: " + File.Exists(Path.Join(Constants.DEVICES_FOLDER, Constants.DEVICE_NAME, "device_private_key")));
} }
if (clientIdBlobMissing || devicePrivateKeyMissing) if (clientIdBlobMissing || devicePrivateKeyMissing)

View File

@ -1,7 +1,7 @@
using OF_DL.Helpers; using OF_DL.Helpers;
using System.Text; using System.Text;
namespace WidevineClient namespace OF_DL.Utils
{ {
class HttpUtil class HttpUtil
{ {

View File

@ -1,10 +1,10 @@
using System.Reflection; using System.Reflection;
using System.Security.Cryptography; using System.Security.Cryptography;
using System.Text; using System.Text;
using OF_DL.Crypto;
using ProtoBuf; using ProtoBuf;
using WidevineClient.Crypto;
namespace WidevineClient.Widevine namespace OF_DL.Widevine
{ {
public class CDM public class CDM
{ {

View File

@ -1,6 +1,4 @@
using WidevineClient.Widevine; namespace OF_DL.Widevine
namespace OF_DL.Widevine
{ {
public class CDMApi public class CDMApi
{ {

View File

@ -7,7 +7,7 @@ using Org.BouncyCastle.Crypto.Signers;
using Org.BouncyCastle.OpenSsl; using Org.BouncyCastle.OpenSsl;
using ProtoBuf; using ProtoBuf;
namespace WidevineClient.Widevine namespace OF_DL.Widevine
{ {
public class CDMDevice public class CDMDevice
{ {

View File

@ -1,4 +1,4 @@
namespace WidevineClient.Widevine namespace OF_DL.Widevine
{ {
public class Constants public class Constants
{ {

View File

@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace WidevineClient.Widevine namespace OF_DL.Widevine
{ {
[Serializable] [Serializable]
public class ContentKey public class ContentKey

View File

@ -1,4 +1,4 @@
namespace WidevineClient.Widevine namespace OF_DL.Widevine
{ {
public class DerivedKeys public class DerivedKeys
{ {