Skip to content

Commit 62e8323

Browse files
biezhihuabiezhihua
committed
update
1 parent 600579e commit 62e8323

File tree

2 files changed

+9
-50
lines changed

2 files changed

+9
-50
lines changed

‎soda_resource_tools_lib/src/soda/fanart.rs

+3-48
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,9 @@ pub(crate) fn obtain_images(mt_info: &mut MTInfo) {
184184
match mt_info {
185185
MTInfo::MOVIE(movie) => match movie {
186186
super::entity::MovieType::TMDB(info) => {
187-
if let Some(tvdb_id) = info.movie.tvdb_id() {
188-
match request_fanart_movies(&tvdb_id) {
187+
let tmdb_id = info.movie.tmdb_id();
188+
if !tmdb_id.is_empty() {
189+
match request_fanart_movies(&tmdb_id) {
189190
Ok(fanart) => {
190191
info.fanart = Some(fanart);
191192
}
@@ -597,49 +598,3 @@ mod fanart_tests {
597598
println!("{:?}", ret);
598599
}
599600
}
600-
601-
// INFO: Uvicorn running on http://0.0.0.0:3001 (Press CTRL+C to quit)
602-
// INFO: themoviedb - Saw X 使用TMDB识别缓存：电锯惊魂10
603-
// INFO: tmdbapi.py - 正在查询TMDB电影：951491 ...
604-
// INFO: tmdbapi.py - 951491 查询结果：电锯惊魂10
605-
// INFO: themoviedb - Saw X TMDB识别结果：电影 电锯惊魂10 (2023) 951491
606-
// INFO: dirmonitor - 电锯惊魂10.saw.x.2023.1080p.WEB-DL.DD5.1.H264-OurTV.mkv 识别为：电影 电锯惊魂10 (2023)
607-
// INFO: fanart - 更新fanart图片 logo https://assets.fanart.tv/fanart/movies/951491/hdmovielogo/saw-x-64c52cb371bcb.png
608-
// INFO: fanart - 更新fanart图片 clearart https://assets.fanart.tv/fanart/movies/951491/hdmovieclearart/saw-x-65342033bd3b1.png
609-
// INFO: fanart - 更新fanart图片 disc https://assets.fanart.tv/fanart/movies/951491/moviedisc/saw-x-651013649097d.png
610-
// INFO: fanart - 更新fanart图片 thumb https://assets.fanart.tv/fanart/movies/951491/moviethumb/saw-x-64c52cede218e.jpg
611-
// INFO: fanart - 更新fanart图片 background https://assets.fanart.tv/fanart/movies/951491/moviebackground/saw-x-64c52cdf03d7a.jpg
612-
// INFO: fanart - 更新fanart图片 banner https://assets.fanart.tv/fanart/movies/951491/moviebanner/saw-x-6534204b56374.jpg
613-
// INFO: filetransfer - 获取转移目标路径：D:\Downloads\Target
614-
// INFO: filetransfer - 正在转移文件：D:\Downloads\Src\电锯惊魂10.saw.x.2023.1080p.WEB-DL.DD5.1.H264-OurTV.mkv 到 D:\Downloads\Target\电影\外语电影\电锯惊魂10 (2023)\电锯惊魂10 (2023) - 1080p.mkv
615-
// INFO: filetransfer - 文件 D:\Downloads\Src\电锯惊魂10.saw.x.2023.1080p.WEB-DL.DD5.1.H264-OurTV.mkv link完成
616-
// INFO: filetransfer - 文件 D:\Downloads\Src\电锯惊魂10.saw.x.2023.1080p.WEB-DL.DD5.1.H264-OurTV.mkv 转移成功
617-
// INFO: themoviedb - 开始刮削媒体库文件：D:\Downloads\Target\电影\外语电影\电锯惊魂10 (2023)\电锯惊魂10 (2023) - 1080p.mkv ...
618-
// INFO: scraper.py - 正在生成电影NFO文件：电锯惊魂10 (2023) - 1080p.mkv
619-
// INFO: scraper.py - NFO文件已保存：D:\Downloads\Target\电影\外语电影\电锯惊魂10 (2023)\电锯惊魂10 (2023) - 1080p.nfo
620-
// INFO: scraper.py - save_image D:\Downloads\Target\电影\外语电影\电锯惊魂10 (2023)\backdrop.jpg backdrop_path https://image.tmdb.org/t/p/original/uUJp5I4IbzuhdUiEx4R9OAoFpbz.jpg
621-
// INFO: scraper.py - 正在下载backdrop图片：https://image.tmdb.org/t/p/original/uUJp5I4IbzuhdUiEx4R9OAoFpbz.jpg ...
622-
// INFO: scraper.py - 图片已保存：D:\Downloads\Target\电影\外语电影\电锯惊魂10 (2023)\backdrop.jpg
623-
// INFO: scraper.py - save_image D:\Downloads\Target\电影\外语电影\电锯惊魂10 (2023)\poster.jpg poster_path https://image.tmdb.org/t/p/original/lB9T0hBsj48CXhnAw140cNHEiCN.jpg
624-
// INFO: scraper.py - 正在下载poster图片：https://image.tmdb.org/t/p/original/lB9T0hBsj48CXhnAw140cNHEiCN.jpg ...
625-
// INFO: scraper.py - 图片已保存：D:\Downloads\Target\电影\外语电影\电锯惊魂10 (2023)\poster.jpg
626-
// INFO: scraper.py - save_image D:\Downloads\Target\电影\外语电影\电锯惊魂10 (2023)\logo.png logo_path https://assets.fanart.tv/fanart/movies/951491/hdmovielogo/saw-x-64c52cb371bcb.png
627-
// INFO: scraper.py - 正在下载logo图片：https://assets.fanart.tv/fanart/movies/951491/hdmovielogo/saw-x-64c52cb371bcb.png ...
628-
// INFO: scraper.py - 图片已保存：D:\Downloads\Target\电影\外语电影\电锯惊魂10 (2023)\logo.png
629-
// INFO: scraper.py - save_image D:\Downloads\Target\电影\外语电影\电锯惊魂10 (2023)\clearart.png clearart_path https://assets.fanart.tv/fanart/movies/951491/hdmovieclearart/saw-x-65342033bd3b1.png
630-
// INFO: scraper.py - 正在下载clearart图片：https://assets.fanart.tv/fanart/movies/951491/hdmovieclearart/saw-x-65342033bd3b1.png ...
631-
// INFO: scraper.py - 图片已保存：D:\Downloads\Target\电影\外语电影\电锯惊魂10 (2023)\clearart.png
632-
// INFO: scraper.py - save_image D:\Downloads\Target\电影\外语电影\电锯惊魂10 (2023)\disc.png disc_path https://assets.fanart.tv/fanart/movies/951491/moviedisc/saw-x-651013649097d.png
633-
// INFO: scraper.py - 正在下载disc图片：https://assets.fanart.tv/fanart/movies/951491/moviedisc/saw-x-651013649097d.png ...
634-
// INFO: scraper.py - 图片已保存：D:\Downloads\Target\电影\外语电影\电锯惊魂10 (2023)\disc.png
635-
// INFO: scraper.py - save_image D:\Downloads\Target\电影\外语电影\电锯惊魂10 (2023)\thumb.jpg thumb_path https://assets.fanart.tv/fanart/movies/951491/moviethumb/saw-x-64c52cede218e.jpg
636-
// INFO: scraper.py - 正在下载thumb图片：https://assets.fanart.tv/fanart/movies/951491/moviethumb/saw-x-64c52cede218e.jpg ...
637-
// INFO: scraper.py - 图片已保存：D:\Downloads\Target\电影\外语电影\电锯惊魂10 (2023)\thumb.jpg
638-
// INFO: scraper.py - save_image D:\Downloads\Target\电影\外语电影\电锯惊魂10 (2023)\background.jpg background_path https://assets.fanart.tv/fanart/movies/951491/moviebackground/saw-x-64c52cdf03d7a.jpg
639-
// INFO: scraper.py - 正在下载background图片：https://assets.fanart.tv/fanart/movies/951491/moviebackground/saw-x-64c52cdf03d7a.jpg ...
640-
// INFO: scraper.py - 图片已保存：D:\Downloads\Target\电影\外语电影\电锯惊魂10 (2023)\background.jpg
641-
// INFO: scraper.py - save_image D:\Downloads\Target\电影\外语电影\电锯惊魂10 (2023)\banner.jpg banner_path https://assets.fanart.tv/fanart/movies/951491/moviebanner/saw-x-6534204b56374.jpg
642-
// INFO: scraper.py - 正在下载banner图片：https://assets.fanart.tv/fanart/movies/951491/moviebanner/saw-x-6534204b56374.jpg ...
643-
// INFO: scraper.py - 图片已保存：D:\Downloads\Target\电影\外语电影\电锯惊魂10 (2023)\banner.jpg
644-
// INFO: themoviedb - D:\Downloads\Target\电影\外语电影\电锯惊魂10 (2023)\电锯惊魂10 (2023) - 1080p.mkv 刮削完成
645-
// INFO: command.py - 处理事件：transfer.complete - []

‎soda_resource_tools_lib/src/soda/tmdb/entity.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -531,14 +531,18 @@ impl TmdbMovie {
531531

532532
pub(crate) fn tvdb_id(&self) -> Option<String> {
533533
if let Some(external_ids) = &self.external_ids {
534-
return Some(external_ids.tvdb_id().to_string());
534+
if let Some(tvdb_id) = external_ids.tvdb_id {
535+
return Some(tvdb_id.to_string());
536+
}
535537
}
536538
return None;
537539
}
538540

539541
pub(crate) fn imdb_id(&self) -> Option<&str> {
540542
if let Some(external_ids) = &self.external_ids {
541-
return Some(external_ids.imdb_id());
543+
if let Some(imdb_id) = &external_ids.imdb_id {
544+
return Some(imdb_id);
545+
}
542546
}
543547
return None;
544548
}

0 commit comments

Comments
 (0)