fix(ui): image cache safety, discord state, settings freq editing

Author: 0PandaDEV

src/ui/assets/image_cache.rs

@@ -108,14 +108,12 @@ impl ImageCache for VleerImageCache {
         let hash = hash(resource);
 
         if let Some(item) = self.cache.get_mut(&hash) {
-            let current_idx = self
-                .usage_list
-                .iter()
-                .position(|item| *item == hash)
-                .expect("cache has an item usage_list doesn't");
-
-            self.usage_list.remove(current_idx);
-            self.usage_list.push_front(hash);
+            if let Some(current_idx) = self.usage_list.iter().position(|h| *h == hash) {
+                self.usage_list.remove(current_idx);
+                self.usage_list.push_front(hash);
+            } else {
+                self.usage_list.push_front(hash);
+            }
 
             return item.0.get();
         }
@@ -131,11 +129,8 @@ impl ImageCache for VleerImageCache {
         if self.usage_list.len() >= self.max_items {
             trace!("Image cache is full, evicting oldest item");
 
-            let oldest = self.usage_list.pop_back().unwrap();
-            let mut image = self
-                .cache
-                .remove(&oldest)
-                .expect("usage_list has an item cache doesn't");
+            let oldest = self.usage_list.pop_back()?;
+            let mut image = self.cache.remove(&oldest)?;
 
             if let Some(Ok(image)) = image.0.get() {
                 trace!("requesting image to be dropped");

src/ui/discord_presence.rs

@@ -123,12 +123,16 @@ impl DiscordPresence {
 
                 let mut act = activity::Activity::new()
                     .details(&song.title)
-                    .state("Playing")
                     .activity_type(activity::ActivityType::Listening)
                     .timestamps(activity::Timestamps::new().start(start).end(end));
 
-                if let Some(ref name) = song.artist_name {
-                    act = act.state(name);
+                match &song.artist_name {
+                    Some(name) => {
+                        act = act.state(name);
+                    }
+                    None => {
+                        act = act.state("Playing");
+                    }
                 }
 
                 if client.set_activity(act).is_err() {

src/ui/views/settings.rs

@@ -389,6 +389,28 @@ impl SettingsView {
             .detach();
         }
 
+        for (i, input) in freq_inputs.iter().enumerate() {
+            cx.subscribe(input, move |_this, _entity, event, cx| {
+                if let InputEvent::Submit(text) = event
+                    && let Ok(new_freq) = text.parse::<i32>()
+                {
+                    let new_freq = new_freq.clamp(20, 20000);
+                    cx.update_global::<Config, _>(|config, _cx| {
+                        config.set(|s| {
+                            if let Some(f) = s.equalizer.frequencies.get_mut(i) {
+                                *f = new_freq;
+                            }
+                        });
+                    });
+                    cx.update_global::<Playback, _>(|playback, cx| {
+                        let config = cx.global::<Config>().clone();
+                        playback.apply_config(&config);
+                    });
+                }
+            })
+            .detach();
+        }
+
         Self {
             gain_inputs,
             freq_inputs,