desktop-app: Delete FetchStateTag from track repo search

Author: uklotzde

crates/desktop-app/src/track/repo_search/mod.rs

@@ -22,32 +22,6 @@ pub struct Context {
     pub params: Params,
 }
 
-/// A light-weight tag that denotes the [`State`] variant.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
-pub enum FetchStateTag {
-    #[default]
-    Initial,
-    Ready,
-    Pending,
-    Failed,
-}
-
-impl FetchStateTag {
-    /// Check whether the state is stable.
-    #[must_use]
-    pub const fn is_idle(&self) -> bool {
-        match self {
-            Self::Initial | Self::Ready | Self::Failed => true,
-            Self::Pending => false,
-        }
-    }
-
-    #[must_use]
-    pub const fn should_prefetch(&self) -> bool {
-        matches!(self, Self::Initial)
-    }
-}
-
 #[derive(Debug, Clone)]
 pub struct FetchedEntity {
     pub offset_hash: u64,
@@ -85,20 +59,13 @@ enum FetchState {
 
 impl FetchState {
     #[must_use]
-    const fn state_tag(&self) -> FetchStateTag {
+    const fn is_idle(&self) -> bool {
         match self {
-            Self::Initial => FetchStateTag::Initial,
-            Self::Ready { .. } => FetchStateTag::Ready,
-            Self::Failed { .. } => FetchStateTag::Failed,
-            Self::Pending { .. } => FetchStateTag::Pending,
+            Self::Initial | Self::Ready { .. } | Self::Failed { .. } => true,
+            Self::Pending { .. } => false,
         }
     }
 
-    #[must_use]
-    const fn is_idle(&self) -> bool {
-        self.state_tag().is_idle()
-    }
-
     #[must_use]
     fn fetched_entities(&self) -> Option<&[FetchedEntity]> {
         match self {
@@ -119,7 +86,7 @@ impl FetchState {
 
     #[must_use]
     const fn should_prefetch(&self) -> bool {
-        self.state_tag().should_prefetch()
+        matches!(self, Self::Initial)
     }
 
     #[must_use]
@@ -272,11 +239,6 @@ impl State {
         &self.context
     }
 
-    #[must_use]
-    pub const fn fetch_state_tag(&self) -> FetchStateTag {
-        self.fetch.state_tag()
-    }
-
     #[must_use]
     pub const fn is_idle(&self) -> bool {
         self.fetch.is_idle()
@@ -314,7 +276,8 @@ impl State {
         // is required to avoid redundant code for determining in advance if
         // the state would actually change or not.
         let reset = Self::new(self.default_params.clone());
-        if self.context == reset.context && self.fetch.state_tag() == reset.fetch.state_tag() {
+        if self.context == reset.context && matches!(self.fetch, FetchState::Initial) {
+            debug_assert!(matches!(reset.fetch, FetchState::Initial));
             // No effect.
             log::debug!("State doesn't need to be reset");
             return false;

crates/desktop-app/src/track/repo_search/tasklet.rs

@@ -12,7 +12,7 @@ use unnest::some_or_return_with;
 
 use crate::{collection, WeakHandle};
 
-use super::{FetchStateTag, ObservableState, State};
+use super::{ObservableState, State};
 
 pub fn on_should_prefetch_trigger(
     subscriber: Subscriber<State>,
@@ -76,43 +76,6 @@ pub fn on_should_prefetch(
     }
 }
 
-fn capture_fetch_state_tag_changes(state_tag: &mut FetchStateTag, new_state: &State) -> bool {
-    if *state_tag == new_state.fetch_state_tag() {
-        return false;
-    }
-    *state_tag = new_state.fetch_state_tag();
-    true
-}
-
-pub fn on_fetch_state_tag_changed(
-    mut subscriber: Subscriber<State>,
-    mut on_changed: impl FnMut(FetchStateTag) -> OnChanged + Send + 'static,
-) -> impl Future<Output = ()> + Send + 'static {
-    let initial_value = subscriber.read_ack().fetch_state_tag();
-    discro::tasklet::capture_changes(
-        subscriber,
-        initial_value,
-        capture_fetch_state_tag_changes,
-        move |fetch_state_tag| on_changed(*fetch_state_tag),
-    )
-}
-
-pub fn on_fetch_state_tag_changed_async<T>(
-    mut subscriber: Subscriber<State>,
-    mut on_changed: impl FnMut(FetchStateTag) -> T + Send + 'static,
-) -> impl Future<Output = ()> + Send + 'static
-where
-    T: Future<Output = OnChanged> + Send + 'static,
-{
-    let initial_value = subscriber.read_ack().fetch_state_tag();
-    discro::tasklet::capture_changes_async(
-        subscriber,
-        initial_value,
-        capture_fetch_state_tag_changes,
-        move |fetch_state_tag| on_changed(*fetch_state_tag),
-    )
-}
-
 pub fn on_collection_state_changed(
     collection_state: &Arc<collection::ObservableState>,
     observable_state: Weak<ObservableState>,

demo-app/src/main.rs

@@ -424,16 +424,7 @@ impl Model for AppModel {
                         self.collection_state = new_collection_state;
                     }
                     LibraryNotification::TrackSearchStateChanged => {
-                        log::warn!(
-                            "TODO: Track search state changed: {fetch_state_tag:?}",
-                            fetch_state_tag = self
-                                .app
-                                .library
-                                .state()
-                                .track_search()
-                                .read_observable()
-                                .fetch_state_tag()
-                        );
+                        log::warn!("TODO: Track search state changed");
                     }
                 },
             },