vikarti.anatra/polaris-mirror
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

properly export and use the match macro

Browse source
This commit is contained in:
Yannik Böttcher 2020-08-07 15:03:36 +02:00
parent 943174bafa
commit 8de736e563
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/index/metadata.rs
View file

@ -14,8 +14,6 @@ use opus_headers;
use crate::utils; use crate::utils;
use crate::utils::AudioFormat; use crate::utils::AudioFormat;
use crate::match_ignore_case;
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq)]
pub struct SongTags { pub struct SongTags {
pub disc_number: Option<u32>, pub disc_number: Option<u32>,
@ -164,7 +162,7 @@ fn read_vorbis(path: &Path) -> Result<SongTags> {
}; };
for (key, value) in source.comment_hdr.comment_list { for (key, value) in source.comment_hdr.comment_list {
match_ignore_case! { utils::match_ignore_case! {
match key { match key {
"TITLE" => tags.title = Some(value), "TITLE" => tags.title = Some(value),
"ALBUM" => tags.album = Some(value), "ALBUM" => tags.album = Some(value),
@ -197,7 +195,7 @@ fn read_opus(path: &Path) -> Result<SongTags> {
}; };
for (key, value) in headers.comments.user_comments { for (key, value) in headers.comments.user_comments {
match_ignore_case! { utils::match_ignore_case! {
match key { match key {
"TITLE" => tags.title = Some(value), "TITLE" => tags.title = Some(value),
"ALBUM" => tags.album = Some(value), "ALBUM" => tags.album = Some(value),

1
src/utils.rs
View file

@ -13,6 +13,7 @@ macro_rules! match_ignore_case {
{ $catch_all } { $catch_all }
}}; }};
} }
pub use crate::match_ignore_case;
#[cfg(target_family = "windows")] #[cfg(target_family = "windows")]
const APP_INFO: AppInfo = AppInfo { const APP_INFO: AppInfo = AppInfo {