Update rthk.py

Author: raileo98

code/rthk.py

@@ -26,14 +26,9 @@
 from feedgen.feed import FeedGenerator
 from urllib.parse import urlparse
 from requests_cache import CachedResponse
-import logging
 
 setattr(CachedResponse, "lazy", False) # https://github.com/jawah/niquests/issues/241
 
-# 設置日誌
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
-
 # ------------------------------
 # 初始設定：檢查環境並顯示提示
 def initial_setup():
@@ -61,8 +56,7 @@ class CachedSession(requests_cache.session.CacheMixin, niquests.Session):
 # 建立網路請求的 Session，包含緩存和 QUIC 支援
 session = CachedSession(
     # allowable_methods=('GET', 'HEAD'),  # 支援的 HTTP 方法
-    # resolver="doh://mozilla.cloudflare-dns.com/dns-query",  # 使用 DoH 解析 DNS
-    resolver="doh://8.8.8.8/dns-query",
+    resolver="doh://mozilla.cloudflare-dns.com/dns-query",  # 使用 DoH 解析 DNS
     pool_connections=poolConn,  # 連線池設定
     pool_maxsize=poolSize,
     backend='redis',  # 緩存後端使用 Redis
@@ -177,91 +171,63 @@ def modify_image_url(imageUrl, new_quality):
     new_url = new_url.replace('n=-1&w=720', 'n=-1&we&w=720')  # 修正特定參數
     return new_url
 
-async def optimize_image_quality(image_url, max_size_bytes=50*1000, min_quality=1, max_quality=99, extra_quality_reduction=10):
-    """
-    優化圖片品質，返還品質最低（quality 最小）但大小不超過 max_size_bytes 嘅圖片 URL。
-    如果 x-upstream-response-length 或 quality=max_quality 嘅圖片 ≤ max_size_bytes，會將 quality 再調低 extra_quality_reduction。
-
-    :param image_url: 原始圖片 URL
-    :param max_size_bytes: 目標圖片大小（預設 50KB = 50,000 字節）
-    :param min_quality: 最小品質（預設 1）
-    :param max_quality: 最大品質（預設 99）
-    :param extra_quality_reduction: 額外減低嘅 quality 值（預設 10）
-    :return: 優化後嘅圖片 URL
-    """
-    # 獲取 quality=max_quality 嘅圖片 URL（即 q=99）
-    max_quality_url = modify_image_url(image_url, max_quality)
+async def optimize_image_quality(imgUrl):
+    # 優化圖片品質，確保檔案大小適中
+    q = 99  # 初始品質
+    latest_imgUrl = modify_image_url(imgUrl, 1)
+    latestAvailableQ = None
+    content_length_q99 = None
 
-    try:
-        # 發送 HEAD 請求獲取圖片資訊
-        response = await get_response(max_quality_url, method='HEAD', session=session)
-        
-        if response.ok:
-            # 獲取 x-upstream-response-length（原始圖片大小）
-            upstream_response_length = int(response.headers.get('x-upstream-response-length', 0))
-            
-            # 獲取 q=99 嘅圖片大小
-            max_quality_size = int(response.headers.get('Content-Length', 0))
-        else:
-            upstream_response_length = None
-            max_quality_size = None
-            logger.warning(f"獲取 quality=max_quality 圖片資訊失敗，HTTP 狀態碼: {response.status_code}")
-    except Exception as e:
-        upstream_response_length = None
-        max_quality_size = None
-        logger.error(f"獲取 quality=max_quality 圖片資訊出錯: {e}")
-
-    low, high = min_quality, max_quality
-    best_image_url = None
-    best_quality = max_quality + 1  # 初始值設為 max_quality + 1，確保可以更新
-
-    # 二分搜索搵 quality 最小嘅圖片
-    while low <= high:
-        mid_quality = (low + high) // 2
-        current_image_url = modify_image_url(image_url, mid_quality)
-        
+    while True:
+        imgUrlWithQ = modify_image_url(imgUrl, q)
         try:
-            response = await get_response(current_image_url, method='HEAD', session=session)
+            response = await get_response(imgUrlWithQ, method='HEAD', session=session)
             if response.status_code >= 400 and response.status_code < 600:
-                logger.warning(f"HTTP 錯誤: {response.status_code}, URL: {current_image_url}")
-                low = mid_quality + 1
-                continue
-
-            if response.ok:
-                current_size = int(response.headers.get('Content-Length', 0))
-                logger.info(f"圖片大小: {current_size} bytes, quality: {mid_quality}, URL: {current_image_url}")
-
-                # 檢查圖片大小同原始圖片
-                if current_size > max_size_bytes or (upstream_response_length is not None and current_size > upstream_response_length):
-                    low = mid_quality + 1
+                if q > 1:
+                    q = 1
+                    print(f"圖片品質設為 1，因 HTTP 狀態: {response.status_code}, URL: {imgUrl}")
                 else:
-                    if mid_quality < best_quality:
-                        best_image_url = current_image_url
-                        best_quality = mid_quality
-                    high = mid_quality - 1
-            else:
-                logger.warning(f"響應不成功: {response.status_code}, URL: {current_image_url}")
-                low = mid_quality + 1
-
+                    print(f"無法獲取圖片，退出迴圈, URL: {imgUrl}")
+                    break
+            
+            elif response.ok:
+                latestAvailableQ = imgUrlWithQ
+                content_length = int(response.headers.get('Content-Length', 0))
+                upstream_response_length = int(response.headers.get('x-upstream-response-length', 0))
+                print(f"圖片大小: {content_length} bytes, Upstream: {upstream_response_length}, q: {q}, URL: {imgUrl}")
+                
+                if q == 99:
+                    content_length_q99 = content_length
+                
+                if q == 1:
+                    print(f"品質已降至 1，退出迴圈, URL: {imgUrl}")
+                    break
+                
+                if content_length > 1000 * 50 or content_length > upstream_response_length:
+                    if q == 99:
+                        q = 95
+                    if q <= 95:
+                        q = max(1, q - 5)
+                elif content_length <= 1000 * 50:
+                    print(f"圖片小於 100KB，品質適中, URL: {imgUrl}, q: {q}")
+                    latest_imgUrl = latestAvailableQ if latestAvailableQ else imgUrlWithQ
+                    break
+        
         except Exception as e:
-            logger.error(f"獲取圖片大小失敗, URL: {current_image_url}, 錯誤: {e}")
-            low = mid_quality + 1
-
-    # 如果搵唔到符合條件嘅 URL，返 min_quality 嘅 URL
-    if best_image_url is None:
-        best_image_url = modify_image_url(image_url, min_quality)
-        logger.warning(f"搵唔到大小 ≤ {max_size_bytes} bytes 嘅圖片，返 min_quality={min_quality} 嘅 URL: {best_image_url}")
-        return best_image_url
-
-    # 檢查 x-upstream-response-length 或 quality=max_quality
-    if (upstream_response_length is not None and upstream_response_length <= max_size_bytes) or \
-       (max_quality_size is not None and max_quality_size <= max_size_bytes):
-        # 如果 x-upstream-response-length 或 quality=max_quality ≤ max_size_bytes，調低 quality
-        adjusted_quality = max(min_quality, best_quality - extra_quality_reduction)
-        best_image_url = modify_image_url(image_url, adjusted_quality)
-        logger.info(f"x-upstream-response-length 或 quality=max_quality ≤ {max_size_bytes} bytes，調低 quality 至 {adjusted_quality}, URL: {best_image_url}")
-
-    return best_image_url
+            print(f"獲取圖片大小失敗, URL: {imgUrl}, 錯誤: {e}")
+            q = 1
+            latest_imgUrl = latestAvailableQ if latestAvailableQ else imgUrlWithQ
+            break
+
+    if (upstream_response_length <= 1000 * 50 or (content_length_q99 is not None and content_length_q99 <= 1000 * 50)):
+        if q == 99:
+            q = 90
+        elif q <= 95:
+            q = max(1, q - 10)
+        latest_imgUrl = modify_image_url(imgUrl, q)
+        print(f"圖片小於 100KB，調整品質至 q={q}, URL: {latest_imgUrl}")
+    
+    return latest_imgUrl
 
 # ------------------------------
 # HTTP 請求函數：支援緩存與錯誤重試