From 4ac1fba2400232495066c5f996aa05966728f18d Mon Sep 17 00:00:00 2001 From: MMaker Date: Thu, 27 Feb 2025 11:24:39 -0500 Subject: [PATCH] Found the real cache issue :^) --- app.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/app.py b/app.py index bdadcd0..67ffd30 100644 --- a/app.py +++ b/app.py @@ -114,12 +114,11 @@ def download_and_upload_video(video_id, url, video_quality): ) logger.info(f"Successfully uploaded video {video_id} to CDN") - if cache: - cache.set(f"{video_id}_uploaded", True, expire=CACHE_EXPIRATION_SECONDS) - # Clear cache for this video to ensure next view gets updated HTML - if cache: - cache.delete(video_id) + if cache is not None: + cache.set(f"{video_id}_uploaded", True, expire=CACHE_EXPIRATION_SECONDS) + # Clear HTML cache for this video to ensure next view gets updated HTML + cache.delete(f"{video_id}_html") logger.info(f"Cleared cache for video ID: {video_id}") return True @@ -167,7 +166,7 @@ worker_thread.start() def is_video_in_cdn(video_id): """Check if video exists in CDN""" - if cache and cache.get(f"{video_id}_uploaded"): + if cache is not None and cache.get(f"{video_id}_uploaded"): logger.info(f"Video {video_id} is already uploaded to CDN (cached)") return True @@ -282,9 +281,9 @@ def get_oembed_url(params): def proxy(video_id): logger.info(f"Received request for video ID: {video_id}") - if cache: + if cache is not None: logging.info(f"Checking cache for video ID: {video_id}") - cached_html = cache.get(video_id) + cached_html = cache.get(f"{video_id}_html") if cached_html is not None: logger.info(f"Using cached response for video ID: {video_id}") return Response(cached_html, mimetype="text/html") # type: ignore @@ -311,7 +310,7 @@ def proxy(video_id): download_allowed = allow_download(params) if params else False request_user_agent = request.headers.get('User-Agent', '').lower() if download_allowed and 'discordbot' not in request_user_agent: - logger.info(f"Download ignored for video ID {video_id} due to user agent ({request_user_agent})") + logger.info(f"Video download ignored for {video_id} due to user agent ({request_user_agent})") download_allowed = False video_quality = get_video_quality(params) if params else None if download_allowed and video_quality is not None: @@ -360,9 +359,9 @@ if you want to download videos, please consider using a tool like nndownload: ht {og_tags_str} """ - if cache: + if cache is not None: logging.info(f"Caching response for video ID: {video_id}") - cache.set(video_id, html_response, expire=CACHE_EXPIRATION_SECONDS) + cache.set(f"{video_id}_html", html_response, expire=CACHE_EXPIRATION_SECONDS) logging.info(f"Returning response for video ID: {video_id}") return Response(html_response, mimetype="text/html")