Remove prelude modules from some crates

.markdownlint-cli2.yaml

@@ -10,7 +10,8 @@ config:
   # The same headline in different nested sections is okay (and necessary for
   # CHANGELOG.md).
   no-duplicate-header:
-    allow_different_nesting: true
+    # https://github.com/DavidAnson/markdownlint/blob/main/doc/md024.md
+    siblings_only: true
 
   # We use ordered lists to make stuff easier to read in a text editor.
   ol-prefix:

Cargo.toml

@@ -50,7 +50,9 @@ image = "0.25.5"
 jiff = "0.1.14"
 log = "0.4.22"
 mime = "0.3.17"
+nonicle = "0.1.1"
 regex = "1.11.1"
+semval = "0.5.2"
 serde = "1.0.215"
 serde_json = "1.0.132"
 static_assertions = "1.1.0"

crates/backend-embedded/src/batch/reindex_tracks.rs

@@ -11,9 +11,8 @@ use tantivy::{
 
 use aoide_core::util::clock::OffsetDateTimeMs;
 use aoide_core_api::{
-    sorting::SortDirection,
     track::search::{SortField, SortOrder},
-    Pagination,
+    Pagination, SortDirection,
 };
 use aoide_storage_sqlite::connection::pool::gatekeeper::Gatekeeper;
 
@@ -87,7 +86,7 @@ pub async fn reindex_tracks(
                     aoide_usecases_sqlite::track::search::search(
                         connection,
                         &collection_uid,
-                        search_params.clone(),
+                        &search_params,
                         &pagination,
                         &mut collector,
                     )?;

crates/backend-embedded/src/collection/mod.rs

@@ -1,6 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (C) 2018-2024 Uwe Klotz <uwedotklotzatgmaildotcom> et al.
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
+use diesel::Connection as _;
+use url::Url;
+
 use aoide_core::{
     collection::{Collection, Entity, EntityHeader, EntityUid},
     media::content::ContentPath,
@@ -12,11 +15,9 @@ use aoide_core_api::{
 };
 use aoide_repo::{
     collection::{EntityWithSummaryCollector, KindFilter, MediaSourceRootUrlFilter, RecordHeader},
-    prelude::{RepoError, ReservableRecordCollector},
+    RepoError, ReservableRecordCollector,
 };
 use aoide_storage_sqlite::connection::pool::gatekeeper::Gatekeeper;
-use diesel::Connection as _;
-use url::Url;
 
 use crate::prelude::*;
 
@@ -96,6 +97,7 @@ pub async fn load_one(
             let connection = &mut *pooled_connection;
             connection.transaction::<_, Error, _>(|connection| {
                 aoide_usecases_sqlite::collection::load_one(connection, &entity_uid, load_scope)
+                    .map(|(_record_id, entity_with_summary)| entity_with_summary)
             })
         })
         .await

crates/backend-embedded/src/playlist/mod.rs

@@ -1,15 +1,16 @@
 // SPDX-FileCopyrightText: Copyright (C) 2018-2024 Uwe Klotz <uwedotklotzatgmaildotcom> et al.
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
+use diesel::Connection as _;
+
 use aoide_core::playlist::{Entity, EntityHeader, EntityUid, EntityWithEntries, Playlist};
 use aoide_core_api::{playlist::EntityWithEntriesSummary, Pagination};
 use aoide_repo::{
     playlist::{EntityWithEntriesSummaryCollector, KindFilter, RecordHeader},
-    prelude::ReservableRecordCollector,
+    ReservableRecordCollector,
 };
 use aoide_storage_sqlite::connection::pool::gatekeeper::Gatekeeper;
 use aoide_usecases::playlist::CollectionFilter;
-use diesel::Connection as _;
 
 use crate::prelude::*;
 

crates/backend-embedded/src/track/mod.rs

@@ -3,17 +3,15 @@
 
 use std::sync::{atomic::AtomicBool, Arc};
 
+use diesel::Connection as _;
+
 use aoide_core::{
     media::content::ContentPath,
     track::{Entity, EntityUid, Track},
 };
 use aoide_core_api::{track::find_unsynchronized::UnsynchronizedTrackEntity, Pagination};
-use aoide_repo::{
-    prelude::{RecordCollector, ReservableRecordCollector},
-    track::RecordHeader,
-};
+use aoide_repo::{track::RecordHeader, RecordCollector, ReservableRecordCollector};
 use aoide_storage_sqlite::connection::pool::gatekeeper::Gatekeeper;
-use diesel::Connection as _;
 
 use crate::prelude::*;
 
@@ -141,7 +139,7 @@ where
                 aoide_usecases_sqlite::track::search::search(
                     connection,
                     &collection_uid,
-                    params,
+                    &params,
                     &pagination,
                     &mut collector,
                 )?;

crates/backend-webapi-json/Cargo.toml

@@ -19,7 +19,7 @@ workspace = true
 anyhow.workspace = true
 diesel.workspace = true
 log.workspace = true
-nonicle = "0.1.1"
+nonicle.workspace = true
 serde.workspace = true
 thiserror.workspace = true
 url.workspace = true

crates/backend-webapi-json/src/collection/load_one.rs

@@ -18,5 +18,5 @@ pub fn handle_request(
         .transaction::<_, Error, _>(|connection| {
             uc::load_one(connection, entity_uid, LoadScope::EntityWithSummary).map_err(Into::into)
         })
-        .map(export_entity_with_summary)
+        .map(|(_record_id, entity_with_summary)| export_entity_with_summary(entity_with_summary))
 }

crates/backend-webapi-json/src/collection/mod.rs

@@ -4,10 +4,7 @@
 use aoide_core::CollectionUid;
 use aoide_core_api_json::collection::{export_entity_with_summary, EntityWithSummary};
 use aoide_core_json::collection::{Collection, Entity};
-use aoide_repo::{
-    collection::RecordHeader,
-    prelude::{RecordCollector, ReservableRecordCollector},
-};
+use aoide_repo::{collection::RecordHeader, RecordCollector, ReservableRecordCollector};
 
 use super::*;
 

crates/backend-webapi-json/src/lib.rs

@@ -7,16 +7,17 @@
 
 use std::result::Result as StdResult;
 
-use aoide_core::CollectionUid;
-use aoide_core_json::entity::EntityRevision;
-use aoide_repo::prelude::{Pagination, PaginationLimit, PaginationOffset};
-use aoide_repo_sqlite::DbConnection;
-use aoide_usecases_sqlite as uc;
 use diesel::Connection as _;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use uuid::Uuid;
 
+use aoide_core::CollectionUid;
+use aoide_core_api::{Pagination, PaginationLimit, PaginationOffset};
+use aoide_core_json::entity::EntityRevision;
+use aoide_repo_sqlite::DbConnection;
+use aoide_usecases_sqlite as uc;
+
 pub mod collection;
 pub mod media;
 pub mod playlist;

crates/backend-webapi-json/src/playlist/mod.rs

@@ -4,10 +4,7 @@
 use aoide_core::playlist::EntityUid;
 use aoide_core_api_json::playlist::{export_entity_with_entries_summary, EntityWithEntriesSummary};
 use aoide_core_json::playlist::{Entity, Entry, Playlist};
-use aoide_repo::{
-    playlist::RecordHeader,
-    prelude::{RecordCollector, ReservableRecordCollector},
-};
+use aoide_repo::{playlist::RecordHeader, RecordCollector, ReservableRecordCollector};
 
 use super::*;
 

crates/backend-webapi-json/src/track/mod.rs

@@ -9,10 +9,7 @@ use aoide_core::{
 };
 use aoide_core_json::track::Entity;
 use aoide_media_file::fmt::encode_gig_tags;
-use aoide_repo::{
-    prelude::{RecordCollector, ReservableRecordCollector},
-    track::RecordHeader,
-};
+use aoide_repo::{track::RecordHeader, RecordCollector, ReservableRecordCollector};
 
 use super::*;
 

crates/backend-webapi-json/src/track/search.rs

@@ -87,7 +87,7 @@ pub fn handle_request(
         uc::search(
             connection,
             collection_uid,
-            params,
+            &params,
             &pagination,
             &mut collector,
         )

crates/core-api-json/src/sorting.rs

@@ -4,7 +4,7 @@
 use crate::prelude::*;
 
 mod _inner {
-    pub(super) use crate::_inner::sorting::*;
+    pub(super) use crate::_inner::SortDirection;
 }
 
 #[derive(Debug)]

crates/core-api/src/lib.rs

@@ -1,17 +1,19 @@
 // SPDX-FileCopyrightText: Copyright (C) 2018-2024 Uwe Klotz <uwedotklotzatgmaildotcom> et al.
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-// TODO: Remove temporary workaround.
-// <https://github.com/rust-lang/rust-clippy/issues/11237>
-#![allow(clippy::wildcard_imports)]
+use aoide_core::{PlaylistUid, TrackUid};
 
 pub mod collection;
-pub use collection::Summary as CollectionSummary;
+pub use self::collection::Summary as CollectionSummary;
 
 pub mod filtering;
+
 pub mod media;
 pub mod playlist;
-pub mod sorting;
+
+mod sorting;
+pub use sorting::SortDirection;
+
 pub mod tag;
 pub mod track;
 
@@ -65,3 +67,13 @@ impl Pagination {
         self.limit.unwrap_or(PaginationLimit::MAX)
     }
 }
+
+#[derive(Debug, Clone)]
+pub enum TrackSelection {
+    All,
+    One(TrackUid),
+    Many(Vec<TrackUid>),
+    Search { filter: track::search::Filter },
+    OnePlaylist(PlaylistUid),
+    ManyPlaylists(Vec<PlaylistUid>),
+}

crates/core-api/src/tag/search.rs

@@ -3,7 +3,10 @@
 
 use aoide_core::tag::FacetKey;
 
-use crate::{filtering::*, sorting::*};
+use crate::{
+    filtering::{FilterModifier, NumericPredicate, StringPredicate},
+    SortDirection,
+};
 
 /// Filter by facets.
 ///
@@ -29,16 +32,6 @@ pub struct Filter {
 }
 
 impl Filter {
-    #[must_use]
-    pub const fn any_facet() -> Option<Vec<String>> {
-        None
-    }
-
-    #[must_use]
-    pub fn no_facet() -> Option<Vec<String>> {
-        Some(Vec::default())
-    }
-
     #[must_use]
     pub const fn any_term() -> Option<StringPredicate<'static>> {
         None

crates/core-api/src/track/search.rs

@@ -12,7 +12,14 @@ use aoide_core::{
 };
 use strum::FromRepr;
 
-use crate::{filtering::*, media::source::ResolveUrlFromContentPath, sorting::*, tag};
+use crate::{
+    filtering::{
+        DateTimePredicate, FilterModifier, NumericPredicate, NumericValue, ScalarFieldFilter,
+        StringFilter, StringPredicate,
+    },
+    media::source::ResolveUrlFromContentPath,
+    tag, SortDirection,
+};
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum StringField {

crates/core-json/Cargo.toml

@@ -20,6 +20,8 @@ workspace = true
 anyhow.workspace = true
 data-encoding.workspace = true
 mime.workspace = true
+nonicle.workspace = true
+semval.workspace = true
 serde = { workspace = true, features = ["derive"] }
 serde_repr = "0.1.19"
 url = { workspace = true, features = ["serde"] }

crates/core-json/src/tag/mod.rs

@@ -3,7 +3,7 @@
 
 use std::{collections::HashMap, fmt};
 
-use aoide_core::prelude::*;
+use semval::prelude::*;
 use serde::{de::Visitor, Deserializer, Serializer};
 
 use crate::prelude::*;

crates/core-json/src/track/album/mod.rs

@@ -1,11 +1,12 @@
 // SPDX-FileCopyrightText: Copyright (C) 2018-2024 Uwe Klotz <uwedotklotzatgmaildotcom> et al.
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-use aoide_core::prelude::*;
+use nonicle::{Canonical, CanonicalizeInto as _};
 
-use super::{actor::Actor, title::Title};
 use crate::prelude::*;
 
+use super::{actor::Actor, title::Title};
+
 mod _core {
     pub(super) use aoide_core::track::album::*;
 }