From 97aec74242a011ecd06deb4602f0db70ef81d585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=B4=80=E1=B4=8D=E1=B4=9B=E1=B4=8F=E1=B4=80=E1=B4=87?= =?UTF-8?q?=CA=80?= Date: Fri, 26 Apr 2024 19:34:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20filter=20option=20?= =?UTF-8?q?=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84=E9=97=AE=E9=A2=98=20(#80)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/bilibili/analyzer.rs | 6 ++---- src/core/command.rs | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/bilibili/analyzer.rs b/src/bilibili/analyzer.rs index 3ec1a98..3dbaa85 100644 --- a/src/bilibili/analyzer.rs +++ b/src/bilibili/analyzer.rs @@ -1,5 +1,3 @@ -use std::sync::Arc; - use anyhow::{anyhow, bail, Result}; use serde::{Deserialize, Serialize}; @@ -49,7 +47,7 @@ pub struct FilterOption { pub video_min_quality: VideoQuality, pub audio_max_quality: AudioQuality, pub audio_min_quality: AudioQuality, - pub codecs: Arc>, + pub codecs: Vec, pub no_dolby_video: bool, pub no_dolby_audio: bool, pub no_hdr: bool, @@ -63,7 +61,7 @@ impl Default for FilterOption { video_min_quality: VideoQuality::Quality360p, audio_max_quality: AudioQuality::QualityHiRES, audio_min_quality: AudioQuality::Quality64k, - codecs: Arc::new(vec![VideoCodecs::AV1, VideoCodecs::HEV, VideoCodecs::AVC]), + codecs: vec![VideoCodecs::AV1, VideoCodecs::HEV, VideoCodecs::AVC], no_dolby_video: false, no_dolby_audio: false, no_hdr: false, diff --git a/src/core/command.rs b/src/core/command.rs index 308b2e4..e7cc785 100644 --- a/src/core/command.rs +++ b/src/core/command.rs @@ -20,7 +20,7 @@ use super::status::{PageStatus, VideoStatus}; use super::utils::{ unhandled_videos_pages, update_pages_model, update_videos_model, ModelWrapper, NFOMode, NFOSerializer, TEMPLATE, }; -use crate::bilibili::{BestStream, BiliClient, BiliError, Dimension, FavoriteList, FilterOption, PageInfo, Video}; +use crate::bilibili::{BestStream, BiliClient, BiliError, Dimension, FavoriteList, PageInfo, Video}; use crate::config::CONFIG; use crate::core::utils::{ create_video_pages, create_videos, exist_labels, filter_unfilled_videos, handle_favorite_info, total_video_count, @@ -522,7 +522,7 @@ pub async fn fetch_page_video( let streams = bili_video .get_page_analyzer(page_info) .await? - .best_stream(&FilterOption::default())?; + .best_stream(&CONFIG.filter_option)?; match streams { BestStream::Mixed(mix_stream) => { downloader.fetch(mix_stream.url(), &page_path).await?;