From 59f66978ff564d9e0e76a6dd4a8b2d5103591601 Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Sat, 15 Feb 2025 15:47:33 -0700
Subject: [PATCH] musikr: make id3v2 naming consistent

---
 musikr/src/main/jni/src/taglib/file.rs              | 2 +-
 musikr/src/main/jni/src/taglib/{id3.rs => id3v2.rs} | 4 ++--
 musikr/src/main/jni/src/taglib/mod.rs               | 2 +-
 musikr/src/main/jni/src/taglib/mpeg.rs              | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename musikr/src/main/jni/src/taglib/{id3.rs => id3v2.rs} (98%)

diff --git a/musikr/src/main/jni/src/taglib/file.rs b/musikr/src/main/jni/src/taglib/file.rs
index b4457c2da..52ff9c914 100644
--- a/musikr/src/main/jni/src/taglib/file.rs
+++ b/musikr/src/main/jni/src/taglib/file.rs
@@ -5,7 +5,7 @@ use super::mpeg::MPEGFile;
 use super::ogg::OpusFile;
 use super::ogg::VorbisFile;
 use super::flac::FLACFile;
-use super::id3::Tag;
+use super::id3v2::ID3v2Tag;
 
 pub struct File<'file_ref> {
     this: Pin<&'file_ref mut CPPFile>
diff --git a/musikr/src/main/jni/src/taglib/id3.rs b/musikr/src/main/jni/src/taglib/id3v2.rs
similarity index 98%
rename from musikr/src/main/jni/src/taglib/id3.rs
rename to musikr/src/main/jni/src/taglib/id3v2.rs
index 3b0c2bd8b..4bcabd6ee 100644
--- a/musikr/src/main/jni/src/taglib/id3.rs
+++ b/musikr/src/main/jni/src/taglib/id3v2.rs
@@ -5,11 +5,11 @@ use super::bridge::{
 use super::tk::{ByteVector, StringList};
 use std::pin::Pin;
 
-pub struct Tag<'file_ref> {
+pub struct ID3v2Tag<'file_ref> {
     this: Pin<&'file_ref CPPID3v2Tag>
 }
 
-impl<'file_ref> Tag<'file_ref> {
+impl<'file_ref> ID3v2Tag<'file_ref> {
     pub(super) fn new(this: Pin<&'file_ref CPPID3v2Tag>) -> Self {
         Self { this }
     }
diff --git a/musikr/src/main/jni/src/taglib/mod.rs b/musikr/src/main/jni/src/taglib/mod.rs
index dc2dd7fe2..d9ed9a183 100644
--- a/musikr/src/main/jni/src/taglib/mod.rs
+++ b/musikr/src/main/jni/src/taglib/mod.rs
@@ -9,4 +9,4 @@ pub mod flac;
 pub mod xiph;
 pub mod mpeg;
 pub mod tk;
-pub mod id3;
\ No newline at end of file
+pub mod id3v2;
diff --git a/musikr/src/main/jni/src/taglib/mpeg.rs b/musikr/src/main/jni/src/taglib/mpeg.rs
index 0d7de8738..3e00baed3 100644
--- a/musikr/src/main/jni/src/taglib/mpeg.rs
+++ b/musikr/src/main/jni/src/taglib/mpeg.rs
@@ -1,6 +1,6 @@
 use std::pin::Pin;
 use super::bridge::{self, CPPMPEGFile};
-use super::id3::Tag;
+use super::id3v2::ID3v2Tag;
 
 pub struct MPEGFile<'file_ref> {
     this: Pin<&'file_ref mut CPPMPEGFile>
@@ -11,10 +11,10 @@ impl<'file_ref> MPEGFile<'file_ref> {
         Self { this }
     }
 
-    pub fn id3v2_tag(&mut self) -> Option<Tag<'file_ref>> {
+    pub fn id3v2_tag(&mut self) -> Option<ID3v2Tag<'file_ref>> {
         let tag = self.this.as_mut().ID3v2Tag(false);
         let tag_ref = unsafe { tag.as_ref() };
         let tag_pin = tag_ref.map(|tag| unsafe { Pin::new_unchecked(tag) });
-        tag_pin.map(|tag| Tag::new(tag))
+        tag_pin.map(|tag| ID3v2Tag::new(tag))
     }
 }