jimzah/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-11-26 19:22:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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."))?,
height
.try_into()
.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Width is invalid."))?,
.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Height is invalid."))?,
)
.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
let latest_database_version = 15;
let latest_database_version = 16;
if services().users.count()? > 0 {
// MIGRATIONS
@ -942,7 +942,7 @@ impl KeyValueDatabase {
warn!("Migration: 12 -> 13 finished");
}
if services().globals.database_version()? < 15 {
if services().globals.database_version()? < 16 {
// Reconstruct all media using the filesystem
db.mediaid_file.clear().unwrap();
@ -1002,7 +1002,7 @@ impl KeyValueDatabase {
services().globals.get_media_file(&new_key),
) {
Ok(_) => {
db.mediaid_file.insert(&mediaid, &[])?;
db.mediaid_file.insert(&new_key, &[])?;
}
Err(_) => {
fs::rename(
@ -1013,11 +1013,13 @@ impl KeyValueDatabase {
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!(