Skip to content

Commit

Permalink
Update dependencies, fix traxsource genre panic
Browse files Browse the repository at this point in the history
  • Loading branch information
Marekkon5 committed Feb 5, 2024
1 parent 156d275 commit 32e488a
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 12 deletions.
30 changes: 27 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions crates/onetagger-platforms/src/traxsource.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ impl Traxsource {

// Genre
selector = Selector::parse("div.genre").unwrap();
let genre = track_element.select(&selector).next().unwrap().text().collect::<Vec<_>>().first().unwrap().to_owned();
let genre = track_element.select(&selector).next().map(|e| e.text().collect::<Vec<_>>().first().map(|v| v.to_string())).flatten();

// Release date
selector = Selector::parse("div.r-date").unwrap();
Expand All @@ -103,9 +103,7 @@ impl Traxsource {
album_artists: vec![],
label: Some(label.to_string()),
release_date: NaiveDate::parse_from_str(&release_date, "%Y-%m-%d").ok(),
genres: vec![genre.to_owned()],
styles: vec![],
other: vec![],
genres: genre.map(|g| vec![g]).unwrap_or_default(),
track_id: Some(track_id),
release_id: String::new(),
duration: duration.into(),
Expand Down
6 changes: 3 additions & 3 deletions crates/onetagger-tag/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ chrono = "0.4"
anyhow = "1.0"

log = { version = "0.4", optional = true }
id3 = { version = "1.6.0", optional = true }
id3 = { version = "1.12.0", optional = true }
riff = { version = "2.0.0", optional = true }
lofty = { version = "0.17.0", optional = true }
lofty = { version = "0.18.2", optional = true }
base64 = { version = "0.21", optional = true }
mp4ameta = { version = "0.11", optional = true }
metaflac = { version = "0.2.5", optional = true }
once_cell = { version = "1.17", optional = true }
once_cell = { version = "1.19", optional = true }

pyo3 = { version = "0.18", features = ["chrono", "serde"], optional = true }
serde = { version = "1.0", features = ["derive"] }
Expand Down
4 changes: 2 additions & 2 deletions crates/onetagger-tag/src/vorbis.rs
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ impl TagImpl for VorbisTag {
match self.tag.insert_picture(
lofty::Picture::new_unchecked(
self.picture_type(&kind),
MimeType::from_str(&mime.trim().to_lowercase()),
Some(MimeType::from_str(&mime.trim().to_lowercase())),
description.map(String::from),
data
),
Expand All @@ -188,7 +188,7 @@ impl TagImpl for VorbisTag {
kind: self.cover_type(&p.pic_type()),
description: p.description().map(String::from).unwrap_or(String::new()),
data: p.data().to_vec(),
mime: p.mime_type().to_string()
mime: p.mime_type().unwrap_or(&MimeType::Jpeg).to_string()
}
).collect()
}
Expand Down

0 comments on commit 32e488a

Please sign in to comment.