johrpan/musicus
1
0
Fork 0
mirror of https://github.com/johrpan/musicus.git synced 2025-10-26 19:57:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

database: Add error for missing items

Browse source
This commit is contained in:
Elias Projahn 2021-04-25 22:48:25 +02:00
parent d9746c8ab4
commit ac14beb665
4 changed files with 21 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

28
database/src/recordings.rs
View file

@ -218,47 +218,31 @@ impl Database {
person: match row.person {
Some(id) => Some(
self.get_person(&id)?
.ok_or(Error::Other(format!(
"Failed to get person ({}) for recording ({}).",
id,
row.id,
)))?
.ok_or(Error::MissingItem("person", id))?,
),
None => None,
},
ensemble: match row.ensemble {
Some(id) => Some(
self.get_ensemble(&id)?
.ok_or(Error::Other(format!(
"Failed to get ensemble ({}) for recording ({}).",
id,
row.id,
)))?
.ok_or(Error::MissingItem("ensemble", id))?,
),
None => None,
},
role: match row.role {
Some(id) => Some(
self.get_instrument(&id)?
.ok_or(Error::Other(format!(
"Failed to get instrument ({}) for recording ({}).",
id,
row.id,
)))?
.ok_or(Error::MissingItem("instrument", id))?,
),
None => None,
},
});
}
let work_id = &row.work;
let work_id = row.work;
let work = self
.get_work(work_id)?
.ok_or(Error::Other(format!(
"Failed to get work ({}) for recording ({}).",
work_id,
row.id,
)))?;
.get_work(&work_id)?
.ok_or(Error::MissingItem("work", work_id))?;
let recording_description = Recording {
id: row.id,