Update app.py

app.py

@@ -359,16 +359,14 @@ def discover():
     data = request.json
     media_type = data.get('type', 'movie')
     page = data.get('page', 1)
-    preset = data.get('preset')      # 预设（如 'popular', 'now_playing' 等）
+    preset = data.get('preset')
     filters = data.get('filters', {})
     sort_by = filters.get('sort_by', 'latest')
 
-    # 辅助函数：构建 discover URL 并附加通用筛选条件
     def build_discover_url(base_params):
         url = f"https://api.themoviedb.org/3/discover/{media_type}?api_key={TMDB_API_KEY}&language=zh-CN&page={page}"
         for k, v in base_params.items():
             url += f"&{k}={v}"
-        # 附加 filters 中的筛选条件（地区、年份、类型）
         region = filters.get('region')
         if region:
             region_code = {
@@ -387,7 +385,7 @@ def discover():
                     url += "&primary_release_date.lte=2009-12-31"
                 else:
                     url += f"&primary_release_year={year}"
-            else:  # tv
+            else:
                 if year == '2010年前':
                     url += "&first_air_date.lte=2009-12-31"
                 else:
@@ -398,26 +396,23 @@ def discover():
             url += f"&with_genres={genres_str}"
         return url
 
-    # 情况1：有预设，则构建 discover 参数（预设决定排序或日期范围）
     if preset:
-        # 预设映射表
         preset_map_movie = {
             'popular': {'sort_by': 'popularity.desc'},
-            'now_playing': {'sort_by': 'primary_release_date.desc'},  # 正在热映：按上映日期降序
+            'now_playing': {'sort_by': 'primary_release_date.desc'},
             'top_rated': {'sort_by': 'vote_average.desc', 'vote_count.gte': 30},
-            'upcoming': {'sort_by': 'primary_release_date.asc'}   # 即将上映：按上映日期升序
+            'upcoming': {'sort_by': 'primary_release_date.asc'}
         }
         preset_map_tv = {
             'popular': {'sort_by': 'popularity.desc'},
             'top_rated': {'sort_by': 'vote_average.desc', 'vote_count.gte': 30},
             'on_the_air': {'sort_by': 'first_air_date.desc'},
-            'airing_today': {'sort_by': 'first_air_date.desc'}   # 今日播出可进一步精确，但简单按日期降序
+            'airing_today': {'sort_by': 'first_air_date.desc'}
         }
         if media_type == 'movie':
             base_params = preset_map_movie.get(preset, {'sort_by': 'popularity.desc'})
         else:
             base_params = preset_map_tv.get(preset, {'sort_by': 'popularity.desc'})
-        # 如果 filters 中也有 sort_by，则覆盖预设的排序
         if filters.get('sort_by'):
             user_sort = filters['sort_by']
             if user_sort == 'latest':
@@ -425,7 +420,6 @@ def discover():
             elif user_sort == 'imdb':
                 base_params['sort_by'] = 'vote_average.desc'
                 base_params['vote_count.gte'] = 30
-            # douban 无法直接映射，忽略
         url = build_discover_url(base_params)
         resp = requests.get(url, timeout=15)
         result = resp.json()
@@ -436,14 +430,13 @@ def discover():
         result['results'] = results
         return jsonify(result)
 
-    # 情况2：无预设，使用原有逻辑（兼容旧版，但该路径实际上当前端不传 preset 时触发）
+    # 无预设（理论上前端会传 preset，此路径保留兼容）
     if media_type == 'movie':
         base_url = f"https://api.themoviedb.org/3/discover/movie?api_key={TMDB_API_KEY}&language=zh-CN&page={page}"
         if sort_by == 'latest':
             base_url += "&sort_by=primary_release_date.desc"
         else:
             base_url += "&sort_by=vote_average.desc&vote_count.gte=30"
-        
         region = filters.get('region')
         if region:
             region_code = {
@@ -452,25 +445,22 @@ def discover():
             }.get(region, '')
             if region_code:
                 base_url += f"&with_origin_country={region_code}"
-        
         year = filters.get('year')
         if year:
             if year == '2010年前':
                 base_url += "&primary_release_date.lte=2009-12-31"
             else:
                 base_url += f"&primary_release_year={year}"
-        
         genres = filters.get('genres', [])
         if genres:
             genres_str = '|'.join(str(g) for g in genres)
             base_url += f"&with_genres={genres_str}"
-    else:  # tv
+    else:
         base_url = f"https://api.themoviedb.org/3/discover/tv?api_key={TMDB_API_KEY}&language=zh-CN&page={page}"
         if sort_by == 'latest':
             base_url += "&sort_by=first_air_date.desc"
         else:
             base_url += "&sort_by=vote_average.desc&vote_count.gte=30"
-        
         region = filters.get('region')
         if region:
             region_code = {
@@ -479,19 +469,16 @@ def discover():
             }.get(region, '')
             if region_code:
                 base_url += f"&with_origin_country={region_code}"
-        
         year = filters.get('year')
         if year:
             if year == '2010年前':
                 base_url += "&first_air_date.lte=2009-12-31"
             else:
                 base_url += f"&first_air_date_year={year}"
-        
         genres = filters.get('genres', [])
         if genres:
             genres_str = '|'.join(str(g) for g in genres)
             base_url += f"&with_genres={genres_str}"
-    
     resp = requests.get(base_url, timeout=15)
     result = resp.json()
     results = result.get('results', [])
@@ -906,8 +893,15 @@ HTML_TEMPLATE = r"""<!DOCTYPE html>
         .preset-bar { display: flex; flex-wrap: wrap; gap: 12px; justify-content: center; margin-bottom: 20px; padding-bottom: 12px; border-bottom: 1px solid #2a2a2a; }
         .preset-btn { padding: 6px 18px; border-radius: 30px; background: #2a2a2a; border: none; color: #ccc; cursor: pointer; font-size: 13px; transition: 0.2s; }
         .preset-btn.active { background: #e50914; color: #fff; }
-        .movie-cats { display: flex; flex-direction: column; gap: 15px; }
-        .tv-cats { display: none; }
+        /* 折叠面板样式 */
+        .filter-collapse { margin-top: 8px; border-top: 1px solid #2a2a2a; }
+        .filter-header { display: flex; justify-content: space-between; align-items: center; padding: 12px 0; cursor: pointer; user-select: none; color: #e50914; font-size: 14px; font-weight: 500; }
+        .filter-header:hover { opacity: 0.8; }
+        .filter-header span:first-child { display: flex; align-items: center; gap: 8px; }
+        .toggle-icon { font-size: 18px; transition: transform 0.2s; }
+        .filter-content { transition: all 0.2s ease; overflow: hidden; }
+        .filter-content.collapsed { display: none; }
+        .movie-cats, .tv-cats { display: flex; flex-direction: column; gap: 15px; }
         .filter-row { margin-bottom: 15px; }
         .filter-label { font-size: 13px; color: #aaa; margin-bottom: 8px; text-align: center; font-weight: 600; }
         .filter-buttons { display: flex; flex-wrap: wrap; gap: 8px; justify-content: center; }
@@ -1030,17 +1024,26 @@ HTML_TEMPLATE = r"""<!DOCTYPE html>
             <button class="preset-btn" data-preset="on_the_air">📺 正在播出</button>
             <button class="preset-btn" data-preset="airing_today">📅 今日播出</button>
         </div>
-        <div id="movie-cats" class="movie-cats">
-            <div class="filter-row"><div class="filter-label">🌍 地区</div><div class="filter-buttons" id="movie-region"></div></div>
-            <div class="filter-row"><div class="filter-label">📅 年份</div><div class="filter-buttons" id="movie-year"></div></div>
-            <div class="filter-row"><div class="filter-label">🎭 类型 (TMDB)</div><div class="filter-buttons" id="movie-genre"></div></div>
-            <div class="filter-row"><div class="filter-label">📊 排序</div><div class="filter-buttons" id="movie-sort"></div></div>
-        </div>
-        <div id="tv-cats" class="tv-cats">
-            <div class="filter-row"><div class="filter-label">🌍 地区</div><div class="filter-buttons" id="tv-region"></div></div>
-            <div class="filter-row"><div class="filter-label">📅 年份</div><div class="filter-buttons" id="tv-year"></div></div>
-            <div class="filter-row"><div class="filter-label">🎭 类型 (TMDB)</div><div class="filter-buttons" id="tv-genre"></div></div>
-            <div class="filter-row"><div class="filter-label">📊 排序</div><div class="filter-buttons" id="tv-sort"></div></div>
+        <!-- 折叠面板 -->
+        <div class="filter-collapse">
+            <div class="filter-header" onclick="toggleFilterPanel()">
+                <span>🔽 筛选条件 (地区/年份/类型/排序)</span>
+                <span class="toggle-icon" id="filterToggleIcon">▼</span>
+            </div>
+            <div class="filter-content" id="filterContent">
+                <div id="movie-cats" class="movie-cats">
+                    <div class="filter-row"><div class="filter-label">🌍 地区</div><div class="filter-buttons" id="movie-region"></div></div>
+                    <div class="filter-row"><div class="filter-label">📅 年份</div><div class="filter-buttons" id="movie-year"></div></div>
+                    <div class="filter-row"><div class="filter-label">🎭 类型 (TMDB)</div><div class="filter-buttons" id="movie-genre"></div></div>
+                    <div class="filter-row"><div class="filter-label">📊 排序</div><div class="filter-buttons" id="movie-sort"></div></div>
+                </div>
+                <div id="tv-cats" class="tv-cats" style="display: none;">
+                    <div class="filter-row"><div class="filter-label">🌍 地区</div><div class="filter-buttons" id="tv-region"></div></div>
+                    <div class="filter-row"><div class="filter-label">📅 年份</div><div class="filter-buttons" id="tv-year"></div></div>
+                    <div class="filter-row"><div class="filter-label">🎭 类型 (TMDB)</div><div class="filter-buttons" id="tv-genre"></div></div>
+                    <div class="filter-row"><div class="filter-label">📊 排序</div><div class="filter-buttons" id="tv-sort"></div></div>
+                </div>
+            </div>
         </div>
     </div>
     <div class="search-section">
@@ -1090,6 +1093,30 @@ HTML_TEMPLATE = r"""<!DOCTYPE html>
     </div>
 </div>
 <script>
+    // 折叠面板状态 (默认收起)
+    let filterPanelCollapsed = true;
+    function toggleFilterPanel() {
+        const content = document.getElementById('filterContent');
+        const icon = document.getElementById('filterToggleIcon');
+        if (filterPanelCollapsed) {
+            content.classList.remove('collapsed');
+            content.style.display = 'block';
+            icon.innerHTML = '▲';
+            filterPanelCollapsed = false;
+        } else {
+            content.classList.add('collapsed');
+            content.style.display = 'none';
+            icon.innerHTML = '▼';
+            filterPanelCollapsed = true;
+        }
+    }
+    // 初始状态：折叠
+    document.addEventListener('DOMContentLoaded', function() {
+        const content = document.getElementById('filterContent');
+        content.classList.add('collapsed');
+        content.style.display = 'none';
+    });
+
     // 日志相关
     let logRefreshInterval = null;
     async function fetchLogs() {
@@ -1242,7 +1269,7 @@ HTML_TEMPLATE = r"""<!DOCTYPE html>
             });
         }
     }
-    // 清除所有筛选（地区/年份/类型/排序）的高亮和值
+    // 清除所有筛选
     function resetFilters() {
         if (currentType === 'movie') {
             movieFilters = { region:null, year:null, genres:[], sort_by:'latest' };
@@ -1258,20 +1285,19 @@ HTML_TEMPLATE = r"""<!DOCTYPE html>
             renderTVSortButtons();
         }
     }
-    // 点击预设（与筛选共存）
+    // 点击预设
     function selectPreset(preset) {
         if (currentPreset === preset) {
-            // 再次点击同一预设：取消预设（回到无预设模式，不清筛选）
             currentPreset = null;
         } else {
             currentPreset = preset;
         }
-        updatePresetButtons();   // 更新高亮
+        updatePresetButtons();
         currentPage = 1;
         selectedMovie = null;
         loadMovies();
     }
-    // 筛选交互 - 点击后不清除预设，直接修改筛选并加载
+    // 筛选交互
     function selectMovieRegion(code) {
         movieFilters.region = (movieFilters.region===code ? null : code);
         renderMovieRegionButtons();
@@ -1317,7 +1343,6 @@ HTML_TEMPLATE = r"""<!DOCTYPE html>
     // 切换类型
     async function switchType(type){
         currentType=type; currentPage=1; currentQuery=''; selectedMovie=null;
-        // 重置预设和筛选
         currentPreset = 'popular';
         resetFilters();
         document.getElementById('search-input').value='';
@@ -1353,7 +1378,6 @@ HTML_TEMPLATE = r"""<!DOCTYPE html>
                 totalPages = data.total_pages || 1;
                 document.getElementById('panel-title').innerHTML = `🔍 搜索结果: ${currentQuery}`;
             } else {
-                // 构建 discover 请求参数，同时携带 preset 和 filters
                 let filters = (currentType === 'movie') ? { ...movieFilters } : { ...tvFilters };
                 params = {type: currentType, page: currentPage, filters: filters};
                 if (currentPreset) {
@@ -1363,7 +1387,6 @@ HTML_TEMPLATE = r"""<!DOCTYPE html>
                 let data = await resp.json();
                 currentMovies = data.results || [];
                 totalPages = data.total_pages || 1;
-                // 设置面板标题
                 let title = '';
                 if (currentPreset) {
                     const presetNames = {
@@ -1398,7 +1421,6 @@ HTML_TEMPLATE = r"""<!DOCTYPE html>
         let kw=document.getElementById('search-input').value.trim();
         if(!kw) return;
         currentQuery=kw; currentPage=1; selectedMovie=null;
-        // 搜索时清除预设和筛选
         currentPreset = null;
         resetFilters();
         updatePresetButtons();
@@ -1557,7 +1579,6 @@ HTML_TEMPLATE = r"""<!DOCTYPE html>
     // 初始化
     (async function init() {
         await Promise.all([loadMovieGenres(), loadTVGenres()]);
-        // 绑定预设按钮事件
         document.getElementById('movie-presets').querySelectorAll('.preset-btn').forEach(btn => {
             btn.addEventListener('click', () => selectPreset(btn.dataset.preset));
         });