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

Cosmetic changes

Browse source
This commit is contained in:
Antoine Gersant 2024-08-09 20:02:23 -07:00
parent 91152fdc08
commit a7c4c90427
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/app/index/collection.rs
View file

@ -34,7 +34,7 @@ pub struct Album {
#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
pub struct Song { pub struct Song {
pub path: PathBuf, pub real_path: PathBuf,
pub virtual_path: PathBuf, pub virtual_path: PathBuf,
pub track_number: Option<i64>, pub track_number: Option<i64>,
pub disc_number: Option<i64>, pub disc_number: Option<i64>,

8
src/app/index/storage.rs
View file

@ -37,7 +37,7 @@ pub struct Album {
#[derive(Clone, Serialize, Deserialize)] #[derive(Clone, Serialize, Deserialize)]
pub struct Song { pub struct Song {
pub path: PathKey, pub real_path: PathKey,
pub virtual_path: PathKey, pub virtual_path: PathKey,
pub track_number: Option<i64>, pub track_number: Option<i64>,
pub disc_number: Option<i64>, pub disc_number: Option<i64>,
@ -89,7 +89,7 @@ impl Song {
} }
pub fn store_song(strings: &mut Rodeo, song: &scanner::Song) -> Option<Song> { pub fn store_song(strings: &mut Rodeo, song: &scanner::Song) -> Option<Song> {
let Some(path) = (&song.path).get_or_intern(strings) else { let Some(real_path) = (&song.real_path).get_or_intern(strings) else {
return None; return None;
}; };
@ -106,7 +106,7 @@ pub fn store_song(strings: &mut Rodeo, song: &scanner::Song) -> Option<Song> {
}; };
Some(Song { Some(Song {
path, real_path,
virtual_path, virtual_path,
track_number: song.track_number, track_number: song.track_number,
disc_number: song.disc_number, disc_number: song.disc_number,
@ -151,7 +151,7 @@ pub fn store_song(strings: &mut Rodeo, song: &scanner::Song) -> Option<Song> {
pub fn fetch_song(strings: &RodeoReader, song: &Song) -> super::Song { pub fn fetch_song(strings: &RodeoReader, song: &Song) -> super::Song {
super::Song { super::Song {
path: PathBuf::from(strings.resolve(&song.path.0)), real_path: PathBuf::from(strings.resolve(&song.real_path.0)),
virtual_path: PathBuf::from(strings.resolve(&song.virtual_path.0)), virtual_path: PathBuf::from(strings.resolve(&song.virtual_path.0)),
track_number: song.track_number, track_number: song.track_number,
disc_number: song.disc_number, disc_number: song.disc_number,

4
src/app/scanner.rs
View file

@ -20,7 +20,7 @@ pub struct Directory {
#[derive(Debug, Default, PartialEq, Eq)] #[derive(Debug, Default, PartialEq, Eq)]
pub struct Song { pub struct Song {
pub path: PathBuf, pub real_path: PathBuf,
pub virtual_path: PathBuf, pub virtual_path: PathBuf,
pub track_number: Option<i64>, pub track_number: Option<i64>,
pub disc_number: Option<i64>, pub disc_number: Option<i64>,
@ -279,7 +279,7 @@ fn process_directory<P: AsRef<Path>, Q: AsRef<Path>>(
}); });
} else if let Some(metadata) = formats::read_metadata(&entry_real_path) { } else if let Some(metadata) = formats::read_metadata(&entry_real_path) {
songs.push(Song { songs.push(Song {
path: entry_real_path.clone(), real_path: entry_real_path.clone(),
virtual_path: entry_virtual_path.clone(), virtual_path: entry_virtual_path.clone(),
track_number: metadata.track_number.map(|n| n as i64), track_number: metadata.track_number.map(|n| n as i64),
disc_number: metadata.disc_number.map(|n| n as i64), disc_number: metadata.disc_number.map(|n| n as i64),