forked from kenzuya/unshackle
fix(dl): skip empty vault pushes and count cached keys once
A licence that repeats vault keys no longer sends an empty InsertKeys, --cdm-only no longer logs "Cached N Keys to 0/0 Vaults", and a key two tracks both licensed counts once.
This commit is contained in:
@@ -1236,7 +1236,7 @@ class dl:
|
||||
|
||||
self.cdm_override = ctx.params.get("cdm_name")
|
||||
cdm_only = ctx.params.get("cdm_only")
|
||||
self.vault_cache_tally: Optional[tuple[int, int]] = None
|
||||
self.vault_cache_tally: Optional[tuple[set[UUID], int]] = None
|
||||
|
||||
if cdm_only:
|
||||
self.vaults = Vaults(self.vault_service)
|
||||
@@ -4149,7 +4149,8 @@ class dl:
|
||||
if not (self.vault_cache_tally and self.vault_cache_tally[0]):
|
||||
self.vault_cache_tally = None
|
||||
return
|
||||
keys, successful_caches = self.vault_cache_tally
|
||||
kids, successful_caches = self.vault_cache_tally
|
||||
keys = len(kids)
|
||||
self.vault_cache_tally = None
|
||||
self.log.info(f"Cached {keys} Key{'' if keys == 1 else 's'} to {successful_caches}/{len(self.vaults)} Vaults")
|
||||
|
||||
@@ -4204,12 +4205,14 @@ class dl:
|
||||
def cache_keys_to_vaults(self, content_keys: dict[UUID, str]) -> None:
|
||||
"""Store licence keys in every vault. A licence key clears a flag on its pair first: the
|
||||
flag came from a decode check that was wrong, and a local vault refuses a flagged pair."""
|
||||
if not content_keys or not self.vaults:
|
||||
return
|
||||
for kid, key in content_keys.items():
|
||||
if self.vaults.is_flagged(kid, key):
|
||||
self.vaults.unflag_bad_key(kid, key)
|
||||
successful_caches = self.vaults.add_keys(content_keys)
|
||||
keys, caches = self.vault_cache_tally or (0, successful_caches)
|
||||
self.vault_cache_tally = (keys + len(content_keys), min(caches, successful_caches))
|
||||
kids, caches = self.vault_cache_tally or (set(), successful_caches)
|
||||
self.vault_cache_tally = (kids | content_keys.keys(), min(caches, successful_caches))
|
||||
|
||||
@classmethod
|
||||
def drm_lock(cls, drm: DRM_T) -> Lock:
|
||||
|
||||
Reference in New Issue
Block a user