Shanty/db
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
Connor Johnstone
2026-03-18 15:35:58 -04:00
parent 37410ce216
commit c6452609d6
8 changed files with 60 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib.rs
View File

@@ -33,9 +33,7 @@ impl Database {
.min_connections(1)
.sqlx_logging(false);
let conn = SeaDatabase::connect(opts)
.await
.map_err(DbError::SeaOrm)?;
let conn = SeaDatabase::connect(opts).await.map_err(DbError::SeaOrm)?;
// Enable WAL mode for better concurrent read performance
if database_url.starts_with("sqlite:") && !database_url.contains(":memory:") {

1
src/migration/m20260317_000001_create_artists.rs
View File

@@ -74,6 +74,7 @@ impl MigrationTrait for Migration {
}
#[derive(DeriveIden)]
#[allow(clippy::enum_variant_names)]
pub(crate) enum Artists {
Table,
Id,

7
src/migration/m20260317_000003_create_tracks.rs
View File

@@ -21,7 +21,12 @@ impl MigrationTrait for Migration {
.auto_increment()
.primary_key(),
)
.col(ColumnDef::new(Tracks::FilePath).text().not_null().unique_key())
.col(
ColumnDef::new(Tracks::FilePath)
.text()
.not_null()
.unique_key(),
)
.col(ColumnDef::new(Tracks::Title).text())
.col(ColumnDef::new(Tracks::Artist).text())
.col(ColumnDef::new(Tracks::Album).text())

9
src/queries/albums.rs
View File

@@ -10,14 +10,13 @@ pub async fn upsert(
musicbrainz_id: Option<&str>,
artist_id: Option<i32>,
) -> DbResult<Album> {
if let Some(mbid) = musicbrainz_id {
if let Some(existing) = Albums::find()
if let Some(mbid) = musicbrainz_id
&& let Some(existing) = Albums::find()
.filter(album::Column::MusicbrainzId.eq(mbid))
.one(db)
.await?
{
return Ok(existing);
}
{
return Ok(existing);
}
if let Some(existing) = find_by_name_and_artist(db, name, album_artist).await? {

27
src/queries/artists.rs
View File

@@ -4,16 +4,19 @@ use sea_orm::*;
use crate::entities::artist::{self, ActiveModel, Entity as Artists, Model as Artist};
use crate::error::{DbError, DbResult};
pub async fn upsert(db: &DatabaseConnection, name: &str, musicbrainz_id: Option<&str>) -> DbResult<Artist> {
pub async fn upsert(
db: &DatabaseConnection,
name: &str,
musicbrainz_id: Option<&str>,
) -> DbResult<Artist> {
// Try to find by musicbrainz_id first, then by name
if let Some(mbid) = musicbrainz_id {
if let Some(existing) = Artists::find()
if let Some(mbid) = musicbrainz_id
&& let Some(existing) = Artists::find()
.filter(artist::Column::MusicbrainzId.eq(mbid))
.one(db)
.await?
{
return Ok(existing);
}
{
return Ok(existing);
}
if let Some(existing) = find_by_name(db, name).await? {
@@ -80,14 +83,22 @@ pub async fn update(db: &DatabaseConnection, id: i32, model: ActiveModel) -> DbR
Ok(active.update(db).await?)
}
pub async fn update_top_songs(db: &DatabaseConnection, id: i32, top_songs_json: &str) -> DbResult<Artist> {
pub async fn update_top_songs(
db: &DatabaseConnection,
id: i32,
top_songs_json: &str,
) -> DbResult<Artist> {
let existing = get_by_id(db, id).await?;
let mut active: ActiveModel = existing.into();
active.top_songs = Set(top_songs_json.to_string());
Ok(active.update(db).await?)
}
pub async fn update_similar_artists(db: &DatabaseConnection, id: i32, similar_json: &str) -> DbResult<Artist> {
pub async fn update_similar_artists(
db: &DatabaseConnection,
id: i32,
similar_json: &str,
) -> DbResult<Artist> {
let existing = get_by_id(db, id).await?;
let mut active: ActiveModel = existing.into();
active.similar_artists = Set(similar_json.to_string());

6
src/queries/tracks.rs
View File

@@ -106,7 +106,11 @@ pub async fn get_needing_metadata(db: &DatabaseConnection) -> DbResult<Vec<Track
.await?)
}
pub async fn update_metadata(db: &DatabaseConnection, id: i32, model: ActiveModel) -> DbResult<Track> {
pub async fn update_metadata(
db: &DatabaseConnection,
id: i32,
model: ActiveModel,
) -> DbResult<Track> {
let mut active = model;
active.id = Set(id);
active.updated_at = Set(Utc::now().naive_utc());

2
src/queries/wanted.rs
View File

@@ -1,6 +1,6 @@
use chrono::Utc;
use sea_orm::*;
use sea_orm::sea_query::Expr;
use sea_orm::*;
use crate::entities::wanted_item::{
self, ActiveModel, Entity as WantedItems, ItemType, Model as WantedItem, WantedStatus,

37
tests/integration.rs
View File

@@ -5,7 +5,9 @@ use shanty_db::entities::wanted_item::{ItemType, WantedStatus};
use shanty_db::{Database, queries};
async fn test_db() -> Database {
Database::new("sqlite::memory:").await.expect("failed to create test database")
Database::new("sqlite::memory:")
.await
.expect("failed to create test database")
}
#[tokio::test]
@@ -163,9 +165,17 @@ async fn test_wanted_items_lifecycle() {
.unwrap();
// Add wanted item
let item = queries::wanted::add(conn, ItemType::Artist, "Radiohead", None, Some(artist.id), None, None)
.await
.unwrap();
let item = queries::wanted::add(
conn,
ItemType::Artist,
"Radiohead",
None,
Some(artist.id),
None,
None,
)
.await
.unwrap();
assert_eq!(item.status, WantedStatus::Wanted);
assert_eq!(item.item_type, ItemType::Artist);
@@ -219,14 +229,9 @@ async fn test_download_queue_lifecycle() {
assert!(next.is_none());
// Fail it
queries::downloads::update_status(
conn,
item.id,
DownloadStatus::Failed,
Some("network error"),
)
.await
.unwrap();
queries::downloads::update_status(conn, item.id, DownloadStatus::Failed, Some("network error"))
.await
.unwrap();
// List failed
let failed = queries::downloads::list(conn, Some(DownloadStatus::Failed))
@@ -236,7 +241,9 @@ async fn test_download_queue_lifecycle() {
assert_eq!(failed[0].error_message.as_deref(), Some("network error"));
// Retry
queries::downloads::retry_failed(conn, item.id).await.unwrap();
queries::downloads::retry_failed(conn, item.id)
.await
.unwrap();
let pending = queries::downloads::list(conn, Some(DownloadStatus::Pending))
.await
.unwrap();
@@ -286,7 +293,9 @@ async fn test_search_cache_ttl() {
.await
.unwrap();
let purged = queries::cache::purge_prefix(conn, "artist_totals:").await.unwrap();
let purged = queries::cache::purge_prefix(conn, "artist_totals:")
.await
.unwrap();
assert_eq!(purged, 2);
// other_key should still exist