mirror of
https://github.com/unshackle-dl/unshackle.git
synced 2025-10-23 15:11:08 +00:00
Fix remoteCDM, add curl_cffi to instance check
This commit is contained in:
6
.gitignore
vendored
6
.gitignore
vendored
@@ -235,3 +235,9 @@ cython_debug/
|
|||||||
marimo/_static/
|
marimo/_static/
|
||||||
marimo/_lsp/
|
marimo/_lsp/
|
||||||
__marimo__/
|
__marimo__/
|
||||||
|
.idea/vcs.xml
|
||||||
|
.idea/unshackle.iml
|
||||||
|
.idea/modules.xml
|
||||||
|
.idea/misc.xml
|
||||||
|
.idea/inspectionProfiles/Project_Default.xml
|
||||||
|
.idea/inspectionProfiles/profiles_settings.xml
|
||||||
|
|||||||
8
.idea/.gitignore
generated
vendored
Normal file
8
.idea/.gitignore
generated
vendored
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
# Default ignored files
|
||||||
|
/shelf/
|
||||||
|
/workspace.xml
|
||||||
|
# Editor-based HTTP Client requests
|
||||||
|
/httpRequests/
|
||||||
|
# Datasource local storage ignored files
|
||||||
|
/dataSources/
|
||||||
|
/dataSources.local.xml
|
||||||
@@ -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():
|
||||||
|
|||||||
@@ -253,7 +253,7 @@ 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}, not {session!r}")
|
||||||
|
|
||||||
if proxy:
|
if proxy:
|
||||||
|
|||||||
Reference in New Issue
Block a user