zhaarey/unshackle
1
0
Fork 0
mirror of https://github.com/unshackle-dl/unshackle.git synced 2025-10-23 15:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed RemoteCDM, added curl_cffi to instance checks. (#18)

Browse Source 
* Fix remoteCDM, add curl_cffi to instance check

* Update dash.py
This commit is contained in:
TPD94
2025-09-29 22:57:42 -04:00
committed by GitHub
parent e92e5c2ba3
commit ceea4ac827
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
unshackle/commands/dl.py
View File

@@ -1701,10 +1701,14 @@ class dl:
# All DecryptLabs CDMs use DecryptLabsRemoteCDM # All DecryptLabs CDMs use DecryptLabsRemoteCDM
return DecryptLabsRemoteCDM(service_name=service, vaults=self.vaults, **cdm_api) return DecryptLabsRemoteCDM(service_name=service, vaults=self.vaults, **cdm_api)
else: else:
del cdm_api["name"] return RemoteCdm(
if "type" in cdm_api: device_type=cdm_api['Device Type'],
del cdm_api["type"] system_id=cdm_api['System ID'],
return RemoteCdm(**cdm_api) security_level=cdm_api['Security Level'],
host=cdm_api['Host'],
secret=cdm_api['Secret'],
device_name=cdm_api['Device Name'],
)
prd_path = config.directories.prds / f"{cdm_name}.prd" prd_path = config.directories.prds / f"{cdm_name}.prd"
if not prd_path.is_file(): if not prd_path.is_file():

4
unshackle/core/manifests/dash.py
View File

@@ -253,8 +253,8 @@ class DASH:
): ):
if not session: if not session:
session = Session() session = Session()
elif not isinstance(session, Session): elif not isinstance(session, (Session, CurlSession)):
raise TypeError(f"Expected session to be a {Session}, not {session!r}") raise TypeError(f"Expected session to be a {Session} or {CurlSession}, not {session!r}")
if proxy: if proxy:
session.proxies.update({"all": proxy}) session.proxies.update({"all": proxy})