fix: 修复 filter option 未使用的问题 (#80)

amtoaer · Apr 26, 2024 · 97aec74 · 97aec74
1 parent aa9d8c9
commit 97aec74
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git 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<Vec<VideoCodecs>>,
+    pub codecs: Vec<VideoCodecs>,
     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
@@ -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?;