Lomanic/NewLeaf
1
0
Fork 0
mirror of https://git.sr.ht/~cadence/NewLeaf synced 2026-03-07 13:01:37 +00:00
Code Issues Releases Wiki Activity

Channel path fixes I'm pretty sure I already did?

Browse source 
- use "channels" as default path, not "user"
- cache based on the combination of the path and the id
- fix channel latest
This commit is contained in:
Cadence Ember 2022-09-12 23:13:37 +12:00
parent ac1aa07108
commit 714f1030fb
No known key found for this signature in database
GPG key ID: BC1C2C61CF521B17
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
extractors/channel.py
View file

@ -13,9 +13,11 @@ channel_latest_cache = TTLCache(maxsize=500, ttl=300)
channel_latest_cache_lock = Lock()
def extract_channel(ucid, second__path="user"):
cache_key = (ucid, second__path)
with channel_cache_lock:
if ucid in channel_cache:
return channel_cache[ucid]
if cache_key in channel_cache:
return channel_cache[cache_key]
channel_type = "channel" if len(ucid) == 24 and ucid[:2] == "UC" else second__path
r = requests.get("https://www.youtube.com/{}/{}/videos?hl=en".format(channel_type, ucid), cookies=eu_consent_cookie())
@ -154,12 +156,12 @@ def extract_channel(ucid, second__path="user"):
}
with channel_cache_lock:
channel_cache[ucid] = channel
channel_cache[cache_key] = channel
return channel
def extract_channel_videos(ucid):
channel = extract_channel(ucid)
def extract_channel_videos(ucid, second__path="channel"):
channel = extract_channel(ucid, second__path)
if "error" in channel:
return channel
else: