Merge pull request #836 from RustyNova016/lazy_user_data

User data struct

Author: RustyNova016

Cargo.lock

@@ -12,11 +12,6 @@ resolver = "3"
 [profile.dev]
 debug = "line-tables-only"
 
-[patch]
-
-[patch.crates-io]
-sequelles = { git = "https://github.com/RustyNova016/sequelles", rev = "f5f5df6b1669d6757cacbd5a33744f1661dbdadc"}
-
 [workspace.lints.rust]
 unsafe_code = "forbid"
 

Cargo.toml

@@ -33,25 +33,19 @@ extend = "1.2.0"
 directories = "6.0.0"
 reqwest = { version = "0.12.23", features = ["json"] }
 rand = "0.9.2"
-thiserror = "2.0.17"
-derive_more = { version = "2.0.1", features = ["full"] }
-derive-new = "0.7.0"
-derive-getters = "0.5.0"
 regex = "1.11.3"
 sqlx = { version = "0.8.6", features = ["runtime-tokio", "macros"] }
 macon = "1.3.0"
-async-fn-stream = "0.3.0"
-zip = "5.1.1"
 indoc = "2.0.6"
 strsim = "0.11.1"
-strum_macros = "0.27.2"
 dotenvy = "0.15.7"
 url = "2.5.4"
 
 # Async
 futures = "0.3.31"
 tokio = { version = "1.47.1", features = ["rt", "rt-multi-thread", "parking_lot"] }
 streamies = "0.2.2"
+async-fn-stream = "0.3.0"
 
 # Cli
 clap = { version = "4.5.48", features = [
@@ -64,14 +58,25 @@ clap_complete = "4.5.58"
 clap-markdown = "0.1.5"
 clap-verbosity-flag = { version = "3.0.3", default-features = false, features = ["tracing"] }
 
+# Error handling
+color-eyre = "0.6.5"
+thiserror = "2.0.17"
+
+# Macros
+bon = "3.7.2"
+derive_more = { version = "2.0.1", features = ["full"] }
+derive-new = "0.7.0"
+derive-getters = "0.5.0"
+strum_macros = "0.27.2"
+
 # Tracing
 tracing = "0.1.41"
 tracing-subscriber = "0.3.20"
 tracing-appender = "0.2.3"
 tracing-indicatif = "0.3.13"
-color-eyre = "0.6.5"
 
 # Other
+zip = "5.1.1"
 
 [features]
 default = ["full"]
@@ -95,6 +100,3 @@ async_fn_in_trait = { level = "allow", priority = 1 }
 
 [lints.clippy]
 result_large_err = { level = "allow", priority = 1 }
-
-[patch.crates-io]
-sequelles = { git = "https://github.com/RustyNova016/sequelles", rev = "f5f5df6b1669d6757cacbd5a33744f1661dbdadc"}

alistral_cli/Cargo.toml

@@ -12,8 +12,6 @@ use alistral_core::datastructures::entity_with_listens::release::collection::Rel
 use alistral_core::datastructures::entity_with_listens::release_group::collection::ReleaseGroupWithReleasesCollection;
 #[cfg(feature = "stats")]
 use alistral_core::datastructures::entity_with_listens::release_group::collection::ReleaseGroupWithReleasesStrategy;
-// use alistral_core::datastructures::entity_with_listens::work::collection::WorkWithRecordingsCollection;
-// use alistral_core::datastructures::entity_with_listens::work::collection::WorkWithRecordingsStrategy;
 
 use crate::models::client::AlistralCliClient;
 
@@ -23,8 +21,8 @@ pub fn artist_strategy(client: &AlistralCliClient) -> ArtistWithRecordingsStrate
     ArtistWithRecordingsStrategy::new(client.core.as_ref(), recording_strategy(client))
 }
 
-pub fn recording_strategy(client: &AlistralCliClient) -> RecordingWithListenStrategy<'_> {
-    RecordingWithListenStrategy::new(client.core.as_ref())
+pub fn recording_strategy(_client: &AlistralCliClient) -> RecordingWithListenStrategy {
+    RecordingWithListenStrategy::new()
 }
 
 #[cfg(feature = "stats")]
@@ -81,12 +79,3 @@ pub async fn release_group_stats(
 
     Ok(ListenFetchQuery::get_entity_with_listens(&client.core, user, &strategy).await?)
 }
-
-// pub async fn work_stats(
-//     client: &AlistralCliClient,
-//     user: String,
-// ) -> Result<WorkWithRecordingsCollection, crate::Error> {
-//     let strategy = work_strategy(client);
-
-//     Ok(ListenFetchQuery::get_entity_with_listens(&client.core, user, &strategy).await?)
-// }

alistral_cli/src/database/interfaces/statistics_data.rs

@@ -74,6 +74,7 @@ impl ListenSeeder {
         .into();
 
         let mut recordings = RecordingWithListensCollection::from_listencollection(
+            &ALISTRAL_CLIENT.core,
             listens,
             &recording_strategy(&ALISTRAL_CLIENT),
         )
@@ -125,6 +126,7 @@ impl ListenSeeder {
         .into();
 
         let mapped = RecordingWithListensCollection::from_listencollection(
+            &ALISTRAL_CLIENT.core,
             listens,
             &recording_strategy(&ALISTRAL_CLIENT),
         )

alistral_cli/src/datastructures/radio/seeders/listens.rs

@@ -1,10 +1,10 @@
 use core::fmt::Display;
 
-#[cfg(feature = "radio")]
+#[cfg(any(feature = "radio", feature = "lookup"))]
 use chrono::DateTime;
-#[cfg(feature = "radio")]
+#[cfg(any(feature = "radio", feature = "lookup"))]
 use chrono::Duration;
-#[cfg(feature = "radio")]
+#[cfg(any(feature = "radio", feature = "lookup"))]
 use chrono::Utc;
 use clap::ValueEnum;
 use derive_more::IsVariant;
@@ -67,7 +67,7 @@ pub enum Timeframe {
 }
 
 impl Timeframe {
-    #[cfg(feature = "radio")]
+    #[cfg(any(feature = "radio", feature = "lookup"))]
     pub fn get_start_date(&self) -> DateTime<Utc> {
         let now = Utc::now();
 

alistral_cli/src/models/cli/common.rs

@@ -11,8 +11,6 @@ use clap_verbosity_flag::InfoLevel;
 use clap_verbosity_flag::Verbosity;
 use config::ConfigCli;
 use listens::ListenCommand;
-#[cfg(feature = "lookup")]
-use lookup::LookupCommand;
 use mapping::MappingCommand;
 use tuillez::fatal_error::FatalError;
 use unstable::UnstableCommand;
@@ -26,6 +24,8 @@ use crate::tools::bumps::bump_down_command;
 use crate::tools::cache::CacheCommand;
 use crate::tools::compatibility::compatibility_command;
 use crate::tools::daily::daily_report;
+#[cfg(feature = "lookup")]
+use crate::tools::lookup::LookupCommand;
 #[cfg(feature = "musicbrainz")]
 use crate::tools::musicbrainz::MusicbrainzCommand;
 #[cfg(feature = "interzicf")]
@@ -40,8 +40,6 @@ pub mod config;
 #[cfg(feature = "interzic")]
 pub mod interzic;
 pub mod listens;
-#[cfg(feature = "lookup")]
-pub mod lookup;
 pub mod mapping;
 #[cfg(feature = "radio")]
 pub mod radio;
@@ -205,7 +203,7 @@ impl Commands {
             Self::Listens(val) => val.run(conn).await?,
 
             #[cfg(feature = "lookup")]
-            Self::Lookup(val) => val.run(conn).await?,
+            Self::Lookup(cmd) => cmd.run().await,
 
             Self::Mapping(val) => val.run(conn).await?,
 

alistral_cli/src/models/cli/lookup/mod.rs

@@ -4,6 +4,8 @@ use std::sync::Arc;
 use std::sync::LazyLock;
 
 use alistral_core::AlistralClient;
+use alistral_core::datastructures::entity_with_listens::recording::collection::RecordingWithListenStrategy;
+use alistral_core::datastructures::entity_with_listens::user::collection::UserWithListensStrategy;
 use futures::executor::block_on;
 #[cfg(feature = "interzicf")]
 use interzic::InterzicClient;
@@ -134,11 +136,14 @@ impl AlistralCliClient {
         musicbrainz_db: Arc<DBClient>,
         listenbrainz: Arc<ListenbrainzClient>,
     ) -> Arc<AlistralClient> {
-        Arc::new(AlistralClient {
-            listenbrainz,
-            musicbrainz_db,
-            offline: in_offline_mode(),
-        })
+        AlistralClient::builder()
+            .listenbrainz(listenbrainz)
+            .musicbrainz_db(musicbrainz_db)
+            .offline(in_offline_mode())
+            .recording_with_listen_strat(RecordingWithListenStrategy::default())
+            .user_with_listen_strat(UserWithListensStrategy::default())
+            .build()
+            .into()
     }
 
     /// Create the client, or fancy panic if an error occur

alistral_cli/src/models/cli/mod.rs

@@ -3,6 +3,7 @@ use core::cmp::Reverse;
 use alistral_core::datastructures::entity_with_listens::artist::collection::ArtistWithRecordingsCollection;
 use alistral_core::datastructures::listen_collection::ListenCollection;
 use alistral_core::datastructures::listen_collection::traits::ListenCollectionReadable as _;
+use alistral_core::models::listen_statistics_data::ListenStatisticsData;
 use chrono::DateTime;
 use chrono::Datelike;
 use chrono::NaiveDate;
@@ -18,14 +19,21 @@ use crate::ALISTRAL_CLIENT;
 use crate::api::listenbrainz::fresh_releases::FreshReleaseRelease;
 use crate::api::listenbrainz::fresh_releases::FreshReleaseRequest;
 use crate::database::interfaces::statistics_data::artist_strategy;
-use crate::database::interfaces::statistics_data::recording_stats;
 use crate::database::musicbrainz::anniversaries::get_recordings_aniversaries;
 use crate::models::config::Config;
 use crate::utils::constants::LISTENBRAINZ_FMT;
 
 #[instrument(skip(conn))]
 pub async fn daily_report(conn: &mut sqlx::SqliteConnection, username: &str) {
-    let recordings = recording_stats(&ALISTRAL_CLIENT, username.to_string())
+    let user_data = ListenStatisticsData::new_from_user_listens(
+        ALISTRAL_CLIENT.core.clone(),
+        username.to_string(),
+    )
+    .await
+    .expect("Couldn't fetch user listens");
+
+    let recordings = user_data
+        .recording_stats()
         .await
         .expect("Couldn't fetch the listened recordings");
 
@@ -157,6 +165,7 @@ async fn get_fresh_releases(
 
     //TODO: #529 Daily: Prevent recompiling recording with listens
     let artists = ArtistWithRecordingsCollection::from_listencollection(
+        &ALISTRAL_CLIENT.core,
         listens,
         &artist_strategy(&ALISTRAL_CLIENT),
     )