Fix bug, do minor refactor

endsong_ui/src/trace.rs

@@ -133,7 +133,8 @@ pub mod relative {
     /// Creates an empty trace if `aspect` is not in `entries`
     #[must_use]
     pub fn to_artist<Asp: AsRef<Album> + Music>(entries: &SongEntries, aspect: &Asp) -> TraceType {
-        let artist = &aspect.as_ref().artist;
+        let album: &Album = aspect.as_ref();
+        let artist = &album.artist;
 
         let mut times = Vec::<String>::new();
         // percentages relative to the sum of respective artist plays

endsong_ui/src/ui/mod.rs

@@ -512,7 +512,7 @@ fn match_print_songs(
             songs.len(),
             &songs[0].name,
             &songs[0].album.artist.name,
-            entries.gather_plays_of_many(&songs)
+            gather::plays_of_many(entries, &songs)
         );
     }
     for song in songs {

endsong_web/src/album.rs

@@ -2,7 +2,7 @@
 
 #![allow(clippy::module_name_repetitions, reason = "looks nicer")]
 
-use crate::{artist::ArtistSelectionTemplate, encode_url, not_found, AppState};
+use crate::{artist::ArtistSelectionTemplate, encode_url, not_found, AppState, UrlEncoding};
 
 use std::sync::Arc;
 
@@ -128,10 +128,11 @@ pub async fn base(
         None
     };
 
-    let encoded_artist = encode_url(&artist.name);
+    let encoded_artist = artist.encode();
 
     let Some(album) = album else {
-        let encoded_album = encode_url(&albums.first().unwrap().name);
+        // unwrap ok - find().album() guaranteed to contain at least one album if Some, see earlier
+        let encoded_album = albums.first().unwrap().encode();
 
         let link_base_album = if let Some(artist_id) = options.artist_id {
             format!("/album/{encoded_artist}/{encoded_album}?artist_id={artist_id}")
@@ -148,9 +149,10 @@ pub async fn base(
 
     // http://localhost:3000/album/TiA/%E6%B5%81%E6%98%9F
     // (i.e. could only happen on manual link entry)
-    if &album.artist != artist {
+    if album.artist != artist {
         return Redirect::permanent(&format!(
             "/artist/{encoded_artist}?artist_id={}",
+            // unwrap ok - you're right after the artist sel page if this happens -> artist_id exists
             options.artist_id.unwrap()
         ))
         .into_response();
@@ -167,17 +169,8 @@ pub async fn base(
     );
 
     // unwrap ok bc already made sure artist exists earlier
-    let first_listen = entries
-        .iter()
-        .find(|entry| album.is_entry(entry))
-        .unwrap()
-        .timestamp;
-    let last_listen = entries
-        .iter()
-        .rev()
-        .find(|entry| album.is_entry(entry))
-        .unwrap()
-        .timestamp;
+    let first_listen = gather::first_entry_of(entries, album).unwrap().timestamp;
+    let last_listen = gather::last_entry_of(entries, album).unwrap().timestamp;
 
     let link_artist = if let Some(artist_id) = options.artist_id {
         format!("/artist/{encoded_artist}?artist_id={artist_id}")

endsong_web/src/lib.rs

@@ -221,6 +221,7 @@ pub async fn top_artists(
             .map(|artist| {
                 (
                     artist.clone(),
+                    // unwrap ok - artist guaranteed to be in map
                     state.artist_info.get(artist).unwrap().clone(),
                 )
             })
@@ -233,6 +234,7 @@ pub async fn top_artists(
             .map(|artist| {
                 (
                     artist.clone(),
+                    // unwrap ok - artist guaranteed to be in map
                     state.artist_info.get(artist).unwrap().clone(),
                 )
             })

src/aspect.rs

@@ -152,6 +152,16 @@ impl AsRef<str> for Artist {
         &self.name
     }
 }
+impl PartialEq<&Artist> for Artist {
+    fn eq(&self, other: &&Artist) -> bool {
+        self.name == other.name
+    }
+}
+impl PartialEq<Artist> for &Artist {
+    fn eq(&self, other: &Artist) -> bool {
+        self.name == other.name
+    }
+}
 impl Music for Artist {
     fn is_entry(&self, entry: &SongEntry) -> bool {
         entry.artist == self.name
@@ -263,6 +273,16 @@ impl AsRef<str> for Album {
         &self.name
     }
 }
+impl PartialEq<&Album> for Album {
+    fn eq(&self, other: &&Album) -> bool {
+        self.name == other.name
+    }
+}
+impl PartialEq<Album> for &Album {
+    fn eq(&self, other: &Album) -> bool {
+        self.name == other.name
+    }
+}
 impl Music for Album {
     fn is_entry(&self, entry: &SongEntry) -> bool {
         self.artist.is_entry(entry) && entry.album == self.name
@@ -389,6 +409,16 @@ impl AsRef<str> for Song {
         &self.name
     }
 }
+impl PartialEq<&Song> for Song {
+    fn eq(&self, other: &&Song) -> bool {
+        self.name == other.name
+    }
+}
+impl PartialEq<Song> for &Song {
+    fn eq(&self, other: &Song) -> bool {
+        self.name == other.name
+    }
+}
 impl Music for Song {
     fn is_entry(&self, entry: &SongEntry) -> bool {
         self.album.is_entry(entry) && entry.track == self.name

src/entry.rs

@@ -459,12 +459,6 @@ impl SongEntries {
             .collect_vec()
     }
 
-    /// Counts up the plays of all [`Music`] in a collection
-    #[must_use]
-    pub fn gather_plays_of_many<Asp: Music>(&self, aspects: &[Asp]) -> usize {
-        gather::plays_of_many(self, aspects)
-    }
-
     /// Adds search capability
     ///
     /// Use with methods from [`Find`] to search for valid artist, album or song

src/gather.rs

@@ -275,3 +275,19 @@ pub fn listening_time_of_many<Asp: Music>(entries: &[SongEntry], aspects: &[Asp]
         .map(|entry| entry.time_played)
         .sum()
 }
+
+/// Returns first occurence of an aspect
+pub fn first_entry_of<'a, Asp: Music>(
+    entries: &'a [SongEntry],
+    aspect: &Asp,
+) -> Option<&'a SongEntry> {
+    entries.iter().find(|entry| aspect.is_entry(entry))
+}
+
+/// Returns last occurence of an aspect
+pub fn last_entry_of<'a, Asp: Music>(
+    entries: &'a [SongEntry],
+    aspect: &Asp,
+) -> Option<&'a SongEntry> {
+    entries.iter().rev().find(|entry| aspect.is_entry(entry))
+}

src/lib.rs

@@ -16,6 +16,7 @@
 // https://blog.rust-lang.org/2024/09/05/Rust-1.81.0.html#expectlint
 #![warn(clippy::allow_attributes_without_reason)]
 #![warn(clippy::allow_attributes)]
+#![allow(clippy::too_many_lines, reason = "stoopid")]
 
 pub mod aspect;
 pub mod entry;