dtourolle/DarkRoom
1
0
Fork 0
Code Issues 39 Pull Requests Actions 12 Packages Projects Releases 20 Wiki Activity

Satisfy rustfmt and clippy on the album and folder picker changes

Browse Source 
rustfmt over the files the albums work touched, and the album merge's
incoming row as a named struct rather than an eight-field tuple, which
clippy's type_complexity refused.
This commit is contained in:
dtourolle
2026-09-26 14:13:54 -04:00
parent 1abb18d972
commit 9b580c3720
18 changed files with 487 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/dr-catalog/src/albums.rs
+24 -7
View File
@@ -128,7 +128,12 @@ pub fn create(conn: &Connection, name: &str, place: &Place) -> Result<AlbumId, C
tx.execute(
"INSERT INTO albums(uuid, name, server_path, created, revision, modified)
VALUES (?1, ?2, ?3, ?4, 1, ?4)",
rusqlite::params![crate::collections::new_uuid(), name, server_path(place), now],
rusqlite::params![
crate::collections::new_uuid(),
name,
server_path(place),
now
],
)?;
let id = AlbumId(tx.last_insert_rowid() as u64);
if let Place::Local(folder) = place {
@@ -206,8 +211,14 @@ pub fn delete(conn: &Connection, id: AlbumId) -> Result<(), CatalogError> {
if n == 0 {
return Err(CatalogError::NoSuchAlbum(id.0));
}
tx.execute("DELETE FROM album_exports WHERE album_id = ?1", [id.0 as i64])?;
tx.execute("DELETE FROM album_folders WHERE album_id = ?1", [id.0 as i64])?;
tx.execute(
"DELETE FROM album_exports WHERE album_id = ?1",
[id.0 as i64],
)?;
tx.execute(
"DELETE FROM album_folders WHERE album_id = ?1",
[id.0 as i64],
)?;
tx.commit()?;
Ok(())
}
@@ -424,7 +435,11 @@ mod tests {
record_exports(
conn,
album,
&[(a, "a.jpg".into()), (a, "a (1).jpg".into()), (b, "b.jpg".into())],
&[
(a, "a.jpg".into()),
(a, "a (1).jpg".into()),
(b, "b.jpg".into()),
],
)
.unwrap();
@@ -490,9 +505,11 @@ mod tests {
let album = create(conn, "Web", &Place::Local("/out".into())).unwrap();
rename(conn, album, "Website").unwrap();
let rev: i64 = conn
.query_row("SELECT revision FROM albums WHERE id = ?1", [album.0 as i64], |r| {
r.get(0)
})
.query_row(
"SELECT revision FROM albums WHERE id = ?1",
[album.0 as i64],
|r| r.get(0),
)
.unwrap();
assert_eq!(rev, 2);
}