From da8d2de2082ab55f11d76d0aef7e6c3614672b45 Mon Sep 17 00:00:00 2001
From: "lauren n. liberda" <lauren@selfisekai.rocks>
Date: Tue, 27 Dec 2022 20:57:26 +0100
Subject: [extractor/cda] Support premium and misc improvements (#5529)

* Fix cache for non-ASCII key
* Improve error messages
* Better UA for fingerprint bypass

Authored by: selfisekai
---
 yt_dlp/cache.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'yt_dlp/cache.py')

diff --git a/yt_dlp/cache.py b/yt_dlp/cache.py
index 4f9fb78d3..7be91eae5 100644
--- a/yt_dlp/cache.py
+++ b/yt_dlp/cache.py
@@ -5,6 +5,7 @@ import os
 import re
 import shutil
 import traceback
+import urllib.parse
 
 from .utils import expand_path, traverse_obj, version_tuple, write_json_file
 from .version import __version__
@@ -22,11 +23,9 @@ class Cache:
         return expand_path(res)
 
     def _get_cache_fn(self, section, key, dtype):
-        assert re.match(r'^[a-zA-Z0-9_.-]+$', section), \
-            'invalid section %r' % section
-        assert re.match(r'^[a-zA-Z0-9_.-]+$', key), 'invalid key %r' % key
-        return os.path.join(
-            self._get_root_dir(), section, f'{key}.{dtype}')
+        assert re.match(r'^[\w.-]+$', section), f'invalid section {section!r}'
+        key = urllib.parse.quote(key, safe='').replace('%', ',')  # encode non-ascii characters
+        return os.path.join(self._get_root_dir(), section, f'{key}.{dtype}')
 
     @property
     def enabled(self):
-- 
cgit v1.2.3