wd23 commited on
Commit
fcba17b
·
verified ·
1 Parent(s): d4f1b90

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +20 -5
app.py CHANGED
@@ -708,7 +708,7 @@ def discover():
708
  if category in ['popular', 'now_playing', 'top_rated', 'upcoming']:
709
  url = f"https://api.themoviedb.org/3/movie/{category}?api_key={TMDB_API_KEY}&language=zh-CN&page={page}&region=CN"
710
  else:
711
- url = f"https://api.themoviedb.org/3/discover/movie?api_key={TMDB_API_KEY}&language=zh-CN&page={page}&sort_by=popularity.desc&vote_count.gte=30"
712
  if filters.get('region'):
713
  region_map = {'movie_region_cn': 'CN', 'movie_region_us': 'US', 'movie_region_jp': 'JP', 'movie_region_kr': 'KR',
714
  'movie_region_uk': 'GB', 'movie_region_fr': 'FR', 'movie_region_de': 'DE'}
@@ -720,7 +720,7 @@ def discover():
720
  genres_str = '|'.join(str(g) for g in filters['genres'])
721
  url += f"&with_genres={genres_str}"
722
  else:
723
- url = f"https://api.themoviedb.org/3/discover/tv?api_key={TMDB_API_KEY}&language=zh-CN&page={page}&sort_by=popularity.desc&vote_count.gte=30"
724
  if filters.get('region'):
725
  region_map = {'cn': 'CN', 'us_eu': 'US|GB|FR|DE', 'jp': 'JP', 'kr': 'KR', 'tw': 'TW', 'hk': 'HK', 'th': 'TH'}
726
  country = region_map.get(filters['region'], filters['region'].upper())
@@ -1442,12 +1442,27 @@ HTML_TEMPLATE = r"""<!DOCTYPE html>
1442
  let movieFilters={main:'popular', region:null, year:null, genres:[]};
1443
  let tvFilters={official:'popular', region:null, year:null, genres:[]};
1444
  const ALLOWED_PAN_TYPES=['115','baidu','magnet'];
1445
- const MOVIE_MAIN=[{id:'popular',name:'🔥 热门电影'},{id:'now_playing',name:'🎬 正在热映'},{id:'top_rated',name:'⭐ 评分最高'},{id:'upcoming',name:'📅 即将上映'}];
1446
- const MOVIE_REGION=[{id:'movie_region_cn',name:'🇨🇳 国产'},{id:'movie_region_us',name:'🇺🇸 美国'},{id:'movie_region_jp',name:'🇯🇵 日本'},{id:'movie_region_kr',name:'🇰🇷 韩国'},{id:'movie_region_uk',name:'🇬🇧 英国'},{id:'movie_region_fr',name:'🇫🇷 法国'},{id:'movie_region_de',name:'🇩🇪 德国'}];
 
 
 
 
 
 
 
 
 
 
1447
  const MOVIE_YEAR=[{id:'movie_year_2026',name:'2026'},{id:'movie_year_2025',name:'2025'},{id:'movie_year_2024',name:'2024'},{id:'movie_year_2023',name:'2023'},{id:'movie_year_2022',name:'2022'},{id:'movie_year_2021',name:'2021'},{id:'movie_year_2020',name:'2020'},{id:'movie_year_2019',name:'2019'},{id:'movie_year_2018',name:'2018'},{id:'movie_year_2017',name:'2017'},{id:'movie_year_2016',name:'2016'},{id:'movie_year_2015',name:'2015'},{id:'movie_year_2014',name:'2014'},{id:'movie_year_2013',name:'2013'},{id:'movie_year_2012',name:'2012'},{id:'movie_year_2011',name:'2011'},{id:'movie_year_2010',name:'2010'}];
1448
  const MOVIE_GENRE=[{id:'movie_genre_28',name:'⚔️ 动作'},{id:'movie_genre_12',name:'🧙 冒险'},{id:'movie_genre_16',name:'🎨 动画'},{id:'movie_genre_35',name:'😄 喜剧'},{id:'movie_genre_80',name:'🔫 犯罪'},{id:'movie_genre_99',name:'📹 纪录片'},{id:'movie_genre_18',name:'📖 剧情'},{id:'movie_genre_10751',name:'👨‍👩‍👧 家庭'},{id:'movie_genre_14',name:'✨ 奇幻'},{id:'movie_genre_36',name:'📜 历史'},{id:'movie_genre_27',name:'👻 恐怖'},{id:'movie_genre_10402',name:'🎵 音乐'},{id:'movie_genre_9648',name:'🕵️ 悬疑'},{id:'movie_genre_10749',name:'💕 爱情'},{id:'movie_genre_878',name:'🚀 科幻'},{id:'movie_genre_53',name:'⚡ 惊悚'},{id:'movie_genre_10752',name:'⚔️ 战争'},{id:'movie_genre_37',name:'🤠 西部'}];
1449
  const TV_OFFICIAL=[{id:'popular',name:'🔥 热门剧集'},{id:'top_rated',name:'⭐ 评分最高'},{id:'on_the_air',name:'📡 正在播出'},{id:'airing_today',name:'📺 今日播出'}];
1450
- const TV_REGION=[{id:'cn',name:'🇨🇳 国产'},{id:'us_eu',name:'🌍 欧美'},{id:'jp',name:'🇯🇵 日剧'},{id:'kr',name:'🇰🇷 韩剧'},{id:'tw',name:'🇹🇼 台剧'},{id:'hk',name:'🇭🇰 港剧'},{id:'th',name:'🇹🇭 泰剧'}];
 
 
 
 
 
1451
  const TV_YEAR=[{id:'year_2026',name:'2026'},{id:'year_2025',name:'2025'},{id:'year_2024',name:'2024'},{id:'year_2023',name:'2023'},{id:'year_2022',name:'2022'},{id:'year_2021',name:'2021'},{id:'year_2020',name:'2020'},{id:'year_2019',name:'2019'},{id:'year_2018',name:'2018'},{id:'year_2017',name:'2017'},{id:'year_2016',name:'2016'},{id:'year_2015',name:'2015'},{id:'year_2014',name:'2014'},{id:'year_2013',name:'2013'},{id:'year_2012',name:'2012'},{id:'year_2011',name:'2011'},{id:'year_2010',name:'2010'}];
1452
  const TV_GENRE=[{id:'genre_18',name:'📖 剧情'},{id:'genre_35',name:'😄 喜剧'},{id:'genre_10759',name:'⚔️ 动作冒险'},{id:'genre_10765',name:'🚀 科幻奇幻'},{id:'genre_9648',name:'🕵️ 悬疑'},{id:'genre_10749',name:'💕 爱情'},{id:'genre_99',name:'📹 纪录片'},{id:'genre_16',name:'🎨 动画'},{id:'genre_80',name:'🔫 犯罪'},{id:'genre_10751',name:'👨‍👩‍👧 家庭'},{id:'genre_10762',name:'🎭 真人秀'},{id:'genre_10763',name:'🗳️ 新闻'},{id:'genre_10764',name:'📺 真人秀'},{id:'genre_10766',name:'🎬 肥皂剧'},{id:'genre_10767',name:'🗣️ 脱口秀'},{id:'genre_10768',name:'⚖️ 律政'}];
1453
  function extractLinkFromResource(r){return r.link||r.download_url||r.url||r.pan_url||'';}
 
708
  if category in ['popular', 'now_playing', 'top_rated', 'upcoming']:
709
  url = f"https://api.themoviedb.org/3/movie/{category}?api_key={TMDB_API_KEY}&language=zh-CN&page={page}&region=CN"
710
  else:
711
+ url = f"https://api.themoviedb.org/3/discover/movie?api_key={TMDB_API_KEY}&language=zh-CN&page={page}&sort_by=popularity.desc&vote_count.gte=100"
712
  if filters.get('region'):
713
  region_map = {'movie_region_cn': 'CN', 'movie_region_us': 'US', 'movie_region_jp': 'JP', 'movie_region_kr': 'KR',
714
  'movie_region_uk': 'GB', 'movie_region_fr': 'FR', 'movie_region_de': 'DE'}
 
720
  genres_str = '|'.join(str(g) for g in filters['genres'])
721
  url += f"&with_genres={genres_str}"
722
  else:
723
+ url = f"https://api.themoviedb.org/3/discover/tv?api_key={TMDB_API_KEY}&language=zh-CN&page={page}&sort_by=popularity.desc&vote_count.gte=100"
724
  if filters.get('region'):
725
  region_map = {'cn': 'CN', 'us_eu': 'US|GB|FR|DE', 'jp': 'JP', 'kr': 'KR', 'tw': 'TW', 'hk': 'HK', 'th': 'TH'}
726
  country = region_map.get(filters['region'], filters['region'].upper())
 
1442
  let movieFilters={main:'popular', region:null, year:null, genres:[]};
1443
  let tvFilters={official:'popular', region:null, year:null, genres:[]};
1444
  const ALLOWED_PAN_TYPES=['115','baidu','magnet'];
1445
+ const MOVIE_MAIN=[
1446
+ {id:'popular',name:'🔥 热门电影'},
1447
+ {id:'now_playing',name:'🎬 正在热映'},
1448
+ {id:'top_rated',name:'⭐ 高分电影'},
1449
+ {id:'upcoming',name:'📅 即将上映'}
1450
+ ];
1451
+ const MOVIE_REGION=[
1452
+ {id:'movie_region_cn',name:'🇨🇳 国产电影'},
1453
+ {id:'movie_region_us',name:'🇺🇸 欧美电影'},
1454
+ {id:'movie_region_jp',name:'🇯🇵 日本电影'},
1455
+ {id:'movie_region_kr',name:'🇰🇷 韩国电影'}
1456
+ ];
1457
  const MOVIE_YEAR=[{id:'movie_year_2026',name:'2026'},{id:'movie_year_2025',name:'2025'},{id:'movie_year_2024',name:'2024'},{id:'movie_year_2023',name:'2023'},{id:'movie_year_2022',name:'2022'},{id:'movie_year_2021',name:'2021'},{id:'movie_year_2020',name:'2020'},{id:'movie_year_2019',name:'2019'},{id:'movie_year_2018',name:'2018'},{id:'movie_year_2017',name:'2017'},{id:'movie_year_2016',name:'2016'},{id:'movie_year_2015',name:'2015'},{id:'movie_year_2014',name:'2014'},{id:'movie_year_2013',name:'2013'},{id:'movie_year_2012',name:'2012'},{id:'movie_year_2011',name:'2011'},{id:'movie_year_2010',name:'2010'}];
1458
  const MOVIE_GENRE=[{id:'movie_genre_28',name:'⚔️ 动作'},{id:'movie_genre_12',name:'🧙 冒险'},{id:'movie_genre_16',name:'🎨 动画'},{id:'movie_genre_35',name:'😄 喜剧'},{id:'movie_genre_80',name:'🔫 犯罪'},{id:'movie_genre_99',name:'📹 纪录片'},{id:'movie_genre_18',name:'📖 剧情'},{id:'movie_genre_10751',name:'👨‍👩‍👧 家庭'},{id:'movie_genre_14',name:'✨ 奇幻'},{id:'movie_genre_36',name:'📜 历史'},{id:'movie_genre_27',name:'👻 恐怖'},{id:'movie_genre_10402',name:'🎵 音乐'},{id:'movie_genre_9648',name:'🕵️ 悬疑'},{id:'movie_genre_10749',name:'💕 爱情'},{id:'movie_genre_878',name:'🚀 科幻'},{id:'movie_genre_53',name:'⚡ 惊悚'},{id:'movie_genre_10752',name:'⚔️ 战争'},{id:'movie_genre_37',name:'🤠 西部'}];
1459
  const TV_OFFICIAL=[{id:'popular',name:'🔥 热门剧集'},{id:'top_rated',name:'⭐ 评分最高'},{id:'on_the_air',name:'📡 正在播出'},{id:'airing_today',name:'📺 今日播出'}];
1460
+ const TV_REGION=[
1461
+ {id:'tv_region_cn',name:'🇨🇳 国产剧'},
1462
+ {id:'tv_region_kr',name:'🇰🇷 韩剧'},
1463
+ {id:'tv_region_jp',name:'🇯🇵 日剧'},
1464
+ {id:'tv_region_us',name:'🇺🇸 美剧'}
1465
+ ];
1466
  const TV_YEAR=[{id:'year_2026',name:'2026'},{id:'year_2025',name:'2025'},{id:'year_2024',name:'2024'},{id:'year_2023',name:'2023'},{id:'year_2022',name:'2022'},{id:'year_2021',name:'2021'},{id:'year_2020',name:'2020'},{id:'year_2019',name:'2019'},{id:'year_2018',name:'2018'},{id:'year_2017',name:'2017'},{id:'year_2016',name:'2016'},{id:'year_2015',name:'2015'},{id:'year_2014',name:'2014'},{id:'year_2013',name:'2013'},{id:'year_2012',name:'2012'},{id:'year_2011',name:'2011'},{id:'year_2010',name:'2010'}];
1467
  const TV_GENRE=[{id:'genre_18',name:'📖 剧情'},{id:'genre_35',name:'😄 喜剧'},{id:'genre_10759',name:'⚔️ 动作冒险'},{id:'genre_10765',name:'🚀 科幻奇幻'},{id:'genre_9648',name:'🕵️ 悬疑'},{id:'genre_10749',name:'💕 爱情'},{id:'genre_99',name:'📹 纪录片'},{id:'genre_16',name:'🎨 动画'},{id:'genre_80',name:'🔫 犯罪'},{id:'genre_10751',name:'👨‍👩‍👧 家庭'},{id:'genre_10762',name:'🎭 真人秀'},{id:'genre_10763',name:'🗳️ 新闻'},{id:'genre_10764',name:'📺 真人秀'},{id:'genre_10766',name:'🎬 肥皂剧'},{id:'genre_10767',name:'🗣️ 脱口秀'},{id:'genre_10768',name:'⚖️ 律政'}];
1468
  function extractLinkFromResource(r){return r.link||r.download_url||r.url||r.pan_url||'';}