Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

musikr: make ogg field list map consistent

Browse source
This commit is contained in:
Alexander Capehart 2025-02-17 11:37:03 -07:00
parent 2c03cf8fed
commit 98bf82ea15
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
3 changed files with 4 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
musikr/src/main/jni/src/lib.rs
View file

@ -22,34 +22,6 @@ pub extern "C" fn Java_org_oxycblt_musikr_metadata_MetadataJNI_openFile<'local>(
let shared_env = Rc::new(RefCell::new(env)); let shared_env = Rc::new(RefCell::new(env));
let mut stream = JInputStream::new(shared_env.clone(), input); let mut stream = JInputStream::new(shared_env.clone(), input);
let file_ref = FileRef::new(stream); let file_ref = FileRef::new(stream);
let title = file_ref.file().and_then(|mut file| {
let audio_properties = file.audio_properties();
if let Some(vorbis_file) = file.as_vorbis() {
vorbis_file
.xiph_comments()
.map(|comments| comments.field_list_map().to_hashmap())
.and_then(|comments| comments.get("TITLE").cloned())
.and_then(|title| title.first().cloned())
.map(|s| s.to_string())
} else if let Some(opus_file) = file.as_opus() {
opus_file
.xiph_comments()
.map(|comments| comments.field_list_map().to_hashmap())
.and_then(|comments| comments.get("TITLE").cloned())
.and_then(|title| title.first().cloned())
.map(|s| s.to_string())
} else if let Some(mut flac_file) = file.as_flac() {
flac_file
.xiph_comments()
.map(|comments| comments.field_list_map().to_hashmap())
.and_then(|comments| comments.get("TITLE").cloned())
.and_then(|title| title.first().cloned())
.map(|s| s.to_string())
} else {
None
}
});
// Return the title // Return the title
let output = shared_env let output = shared_env

4
musikr/src/main/jni/src/taglib/bridge.rs
View file

@ -145,8 +145,8 @@ mod bridge_impl {
#[namespace = "taglib_shim"] #[namespace = "taglib_shim"]
#[cxx_name = "FieldListEntry"] #[cxx_name = "FieldListEntry"]
type CPPFieldListEntry; type CPPFieldListEntry;
fn key(self: Pin<&CPPFieldListEntry>) -> &CPPString; fn key<'slf, 'file_ref>(self: Pin<&'slf CPPFieldListEntry>) -> &'file_ref CPPString;
fn value(self: Pin<&CPPFieldListEntry>) -> &CPPStringList; fn value<'slf, 'file_ref>(self: Pin<&'slf CPPFieldListEntry>) -> &'file_ref CPPStringList;
#[namespace = "TagLib::ID3v2"] #[namespace = "TagLib::ID3v2"]
#[cxx_name = "Tag"] #[cxx_name = "Tag"]

4
musikr/src/main/jni/src/taglib/xiph.rs
View file

@ -39,7 +39,7 @@ impl<'file_ref> FieldListMap<'file_ref> {
} }
impl<'file_ref> FieldListMap<'file_ref> { impl<'file_ref> FieldListMap<'file_ref> {
pub fn to_hashmap(&self) -> HashMap<String, Vec<String>> { pub fn to_hashmap(&self) -> HashMap<String, tk::RefStringList<'file_ref>> {
let cxx_vec = FieldListMap_to_entries(self.this.pin()); let cxx_vec = FieldListMap_to_entries(self.this.pin());
cxx_vec cxx_vec
.iter() .iter()
@ -56,7 +56,7 @@ impl<'file_ref> FieldListMap<'file_ref> {
let key = tk::String::new(key_this).to_string(); let key = tk::String::new(key_this).to_string();
let value_ref = property_pin.value(); let value_ref = property_pin.value();
let value_this = unsafe { RefThis::new(value_ref) }; let value_this = unsafe { RefThis::new(value_ref) };
let value = tk::StringList::new(value_this).to_vec(); let value = tk::StringList::new(value_this);
(key, value) (key, value)
}) })
.collect() .collect()