GithubBackup/bilibili-video-downloader
1
0
Fork 0
mirror of https://github.com/lanyeeee/bilibili-video-downloader.git synced 2026-05-06 20:02:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 优化媒体资源的选择逻辑

Browse Source
This commit is contained in:
lanyeeee
2026-02-08 04:08:52 +08:00
parent c21e92c3a5
commit fe36c84426
2 changed files with 75 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src-tauri/src/downloader/tasks/audio_task.rs
View File

@@ -252,17 +252,19 @@ impl AudioTask {
return;
}
let media = if self.audio_quality == AudioQuality::Unknown {
get_media_by_priority(app, medias)
// 如果`audio_quality`为`Unknown`，则更倾向于使用优先级选择
let prefer_select_by_priority = self.audio_quality == AudioQuality::Unknown;
let selected_media = if prefer_select_by_priority {
select_media_by_priority(app, &medias)
} else {
medias
.iter()
.find(|m| {
let quality: AudioQuality = m.id.into();
quality == self.audio_quality
})
.cloned()
.unwrap_or_else(|| get_media_by_priority(app, medias))
select_exact_match_media(self, &medias)
.or_else(|| select_media_by_priority(app, &medias))
};
let Some(media) = selected_media else {
self.completed = true;
return;
};
self.audio_quality = media.id.into();
@@ -448,17 +450,34 @@ struct MediaForPrepare {
pub url_with_content_length: Vec<(String, u64)>,
}
fn get_media_by_priority(app: &AppHandle, mut medias: Vec<MediaForPrepare>) -> MediaForPrepare {
fn select_exact_match_media(
audio_task: &AudioTask,
medias: &[MediaForPrepare],
) -> Option<MediaForPrepare> {
let media = medias.iter().find(|m| {
let quality: AudioQuality = m.id.into();
quality == audio_task.audio_quality
});
media.cloned()
}
fn select_media_by_priority(
app: &AppHandle,
medias: &[MediaForPrepare],
) -> Option<MediaForPrepare> {
let quality_priority = app.get_config().read().audio_quality_priority.clone();
let priority_map: HashMap<&AudioQuality, usize> = quality_priority
.iter()
.enumerate()
.map(|(index, quality)| (quality, index))
.collect();
medias.sort_by_key(|media| {
let media = medias.iter().min_by_key(|media| {
let quality: AudioQuality = media.id.into();
priority_map.get(&quality).unwrap_or(&usize::MAX)
});
medias[0].clone()
media.cloned()
}

70
src-tauri/src/downloader/tasks/video_task.rs
View File

@@ -248,30 +248,30 @@ impl VideoTask {
fn prepare(&mut self, app: &AppHandle, medias: Vec<MediaForPrepare>) -> anyhow::Result<()> {
if medias.is_empty() {
return Err(anyhow!("获取视频地址失败"));
return Err(anyhow!("获取视频地址失败，medias为空"));
}
let video_quality_is_unknown = self.video_quality == VideoQuality::Unknown;
let codec_type_is_unknown = self.codec_type == CodecType::Unknown;
let media = if video_quality_is_unknown && codec_type_is_unknown {
get_media_by_priority(app, medias)
} else if !video_quality_is_unknown && !codec_type_is_unknown {
medias
.iter()
.find(|m| {
let quality: VideoQuality = m.id.into();
let codec_type: CodecType = m.codecid.into();
quality == self.video_quality && codec_type == self.codec_type
})
.cloned()
.unwrap_or_else(|| get_media_by_priority(app, medias))
} else {
if video_quality_is_unknown != codec_type_is_unknown {
return Err(anyhow!(
"`video_quality`和`codec_type`必须同时为`Unknown`或同时不为`Unknown`"
));
}
// 如果`video_quality`和`codec_type`同时为`Unknown`，则更倾向于使用优先级选择
let prefer_select_by_priority = video_quality_is_unknown;
let selected_media = if prefer_select_by_priority {
select_media_by_priority(app, &medias)
} else {
select_exact_match_media(self, &medias)
.or_else(|| select_media_by_priority(app, &medias))
};
let media = selected_media.context("获取视频地址失败，medias为空")?;
self.video_quality = media.id.into();
self.codec_type = media.codecid.into();
@@ -462,7 +462,23 @@ struct MediaForPrepare {
pub codecid: i64,
}
fn get_media_by_priority(app: &AppHandle, mut medias: Vec<MediaForPrepare>) -> MediaForPrepare {
fn select_exact_match_media(
video_task: &VideoTask,
medias: &[MediaForPrepare],
) -> Option<MediaForPrepare> {
let media = medias.iter().find(|media| {
let quality: VideoQuality = media.id.into();
let codec_type: CodecType = media.codecid.into();
quality == video_task.video_quality && codec_type == video_task.codec_type
});
media.cloned()
}
fn select_media_by_priority(
app: &AppHandle,
medias: &[MediaForPrepare],
) -> Option<MediaForPrepare> {
let (video_quality_priority, codec_type_priority) = {
let config = app.get_config().inner().read();
(
@@ -471,29 +487,29 @@ fn get_media_by_priority(app: &AppHandle, mut medias: Vec<MediaForPrepare>) -> M
)
};
// 构建索引表，这是为了在排序时能以 O(1) 查找到优先级，索引越小优先级越高
let video_priority_map: HashMap<&VideoQuality, usize> = video_quality_priority
.iter()
.enumerate()
.map(|(index, quality)| (quality, index))
.collect();
medias.sort_by_key(|media| {
let quality: VideoQuality = media.id.into();
video_priority_map.get(&quality).unwrap_or(&usize::MAX)
});
let retain_id = medias[0].id;
medias.retain(|m| m.id == retain_id);
let codec_priority_map: HashMap<&CodecType, usize> = codec_type_priority
.iter()
.enumerate()
.map(|(index, codec_type)| (codec_type, index))
.collect();
medias.sort_by_key(|m| {
let codec_type: CodecType = m.codecid.into();
codec_priority_map.get(&codec_type).unwrap_or(&usize::MAX)
let media = medias.iter().min_by_key(|media| {
let quality: VideoQuality = media.id.into();
let quality_index = video_priority_map.get(&quality).unwrap_or(&usize::MAX);
let codec_type: CodecType = media.codecid.into();
let codec_index = codec_priority_map.get(&codec_type).unwrap_or(&usize::MAX);
// Rust 的元组比较机制是从左到右依次比较
// 先比较quality_index(主排序键)
// 如果quality_index相同，则比较codec_index(次排序键)
(quality_index, codec_index)
});
medias[0].clone()
media.cloned()
}