TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Migration typo for media

Browse source
This commit is contained in:
Timo Kösters 2024-09-24 23:00:37 +02:00
parent a7405cddc0
commit fea85b0894
No known key found for this signature in database
GPG key ID: 0B25E636FBA7E4CB
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/api/client_server/media.rs
View file

@ -359,7 +359,7 @@ async fn get_content_thumbnail(
.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Width is invalid."))?, .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Width is invalid."))?,
height height
.try_into() .try_into()
.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Width is invalid."))?, .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Height is invalid."))?,
) )
.await .await
{ {

12
src/database/mod.rs
View file

@ -425,7 +425,7 @@ impl KeyValueDatabase {
} }
// If the database has any data, perform data migrations before starting // If the database has any data, perform data migrations before starting
let latest_database_version = 15; let latest_database_version = 16;
if services().users.count()? > 0 { if services().users.count()? > 0 {
// MIGRATIONS // MIGRATIONS
@ -942,7 +942,7 @@ impl KeyValueDatabase {
warn!("Migration: 12 -> 13 finished"); warn!("Migration: 12 -> 13 finished");
} }
if services().globals.database_version()? < 15 { if services().globals.database_version()? < 16 {
// Reconstruct all media using the filesystem // Reconstruct all media using the filesystem
db.mediaid_file.clear().unwrap(); db.mediaid_file.clear().unwrap();
@ -1002,7 +1002,7 @@ impl KeyValueDatabase {
services().globals.get_media_file(&new_key), services().globals.get_media_file(&new_key),
) { ) {
Ok(_) => { Ok(_) => {
db.mediaid_file.insert(&mediaid, &[])?; db.mediaid_file.insert(&new_key, &[])?;
} }
Err(_) => { Err(_) => {
fs::rename( fs::rename(
@ -1013,11 +1013,13 @@ impl KeyValueDatabase {
db.mediaid_file.insert(&shorter_key, &[])?; db.mediaid_file.insert(&shorter_key, &[])?;
} }
} }
} else {
db.mediaid_file.insert(&mediaid, &[])?;
} }
} }
services().globals.bump_database_version(15)?; services().globals.bump_database_version(16)?;
warn!("Migration: 13 -> 15 finished"); warn!("Migration: 13 -> 16 finished");
} }
assert_eq!( assert_eq!(