aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--database/src/lib.rs8
-rw-r--r--import/src/lib.rs2
-rw-r--r--import/src/plugins/acoustid.rs1
-rw-r--r--import/src/plugins/infojson.rs14
-rw-r--r--import/src/plugins/media_info.rs1
-rw-r--r--import/src/plugins/misc.rs9
-rw-r--r--import/src/plugins/tags.rs1
-rw-r--r--import/src/plugins/tmdb.rs2
-rw-r--r--import/src/plugins/trakt.rs3
9 files changed, 9 insertions, 32 deletions
diff --git a/database/src/lib.rs b/database/src/lib.rs
index 62bc585..0e89873 100644
--- a/database/src/lib.rs
+++ b/database/src/lib.rs
@@ -170,11 +170,7 @@ impl Database {
}
}
- pub fn update_node_init(
- &self,
- id: NodeID,
- update: impl FnOnce(&mut Node) -> Result<()>,
- ) -> Result<()> {
+ pub fn update_node_init(&self, id: NodeID, update: impl FnOnce(&mut Node)) -> Result<()> {
let time = SystemTime::now()
.duration_since(SystemTime::UNIX_EPOCH)
.unwrap()
@@ -188,7 +184,7 @@ impl Database {
let mut node = t_node.get(id.0)?.map(|v| v.value().0).unwrap_or_default();
let dh_before = serde_json::to_vec(&node).unwrap();
- update(&mut node)?;
+ update(&mut node);
let dh_after = serde_json::to_vec(&node).unwrap();
if dh_before == dh_after {
diff --git a/import/src/lib.rs b/import/src/lib.rs
index 44f87f7..ce16a26 100644
--- a/import/src/lib.rs
+++ b/import/src/lib.rs
@@ -195,7 +195,6 @@ fn import_traverse(
}
n.slug = slug;
n.visibility = iflags.visibility;
- Ok(())
})?;
path.read_dir()?.par_bridge().try_for_each(|e| {
@@ -281,7 +280,6 @@ fn import_file(
node.parents.insert(parent);
}
node.visibility = iflags.visibility;
- Ok(())
}))
.is_some();
diff --git a/import/src/plugins/acoustid.rs b/import/src/plugins/acoustid.rs
index 38e818c..1908ea2 100644
--- a/import/src/plugins/acoustid.rs
+++ b/import/src/plugins/acoustid.rs
@@ -176,7 +176,6 @@ impl ImportPlugin for AcoustID {
n.identifiers.insert(IdentifierType::AcoustIdTrack, atid);
n.identifiers
.insert(IdentifierType::MusicbrainzRecording, mbid);
- Ok(())
})?;
};
Ok(())
diff --git a/import/src/plugins/infojson.rs b/import/src/plugins/infojson.rs
index 03db70c..04c2a13 100644
--- a/import/src/plugins/infojson.rs
+++ b/import/src/plugins/infojson.rs
@@ -193,7 +193,6 @@ impl ImportPlugin for Infojson {
node.ratings
.insert(RatingType::YoutubeFollowers, followers as f64);
}
- Ok(())
})?;
Ok(())
@@ -214,6 +213,12 @@ impl ImportPlugin for Infojson {
.context("infojson parsing")?;
if let Some(infojson) = infojson {
+ let release_date = infojson
+ .upload_date
+ .as_ref()
+ .map(|date| parse_upload_date(date).context("parsing upload date"))
+ .transpose()?;
+
ct.db.update_node_init(node, |node| {
node.kind = if let Some(ty) = &infojson.media_type
&& ty == "short"
@@ -241,11 +246,8 @@ impl ImportPlugin for Infojson {
if let Some(desc) = infojson.description {
node.description = Some(desc)
}
+ node.release_date = release_date.or(node.release_date);
node.tagline = Some(infojson.webpage_url);
- if let Some(date) = &infojson.upload_date {
- node.release_date =
- Some(parse_upload_date(date).context("parsing upload date")?);
- }
match infojson.extractor.as_str() {
"youtube" => {
node.identifiers
@@ -264,8 +266,6 @@ impl ImportPlugin for Infojson {
),
_ => (),
}
-
- Ok(())
})?;
}
Ok(())
diff --git a/import/src/plugins/media_info.rs b/import/src/plugins/media_info.rs
index 43d76e8..4f08b3e 100644
--- a/import/src/plugins/media_info.rs
+++ b/import/src/plugins/media_info.rs
@@ -83,7 +83,6 @@ impl ImportPlugin for MediaInfo {
),
tracks,
});
- Ok(())
})?;
Ok(())
diff --git a/import/src/plugins/misc.rs b/import/src/plugins/misc.rs
index 4a4851e..a3cb6b2 100644
--- a/import/src/plugins/misc.rs
+++ b/import/src/plugins/misc.rs
@@ -44,7 +44,6 @@ impl ImportPlugin for ImageFiles {
)?);
ct.db.update_node_init(parent, |node| {
node.pictures.insert(slot, asset);
- Ok(())
})?;
Ok(())
}
@@ -75,7 +74,6 @@ impl ImportPlugin for ImageAttachments {
ct.db.update_node_init(node, |node| {
node.pictures.insert(PictureSlot::Cover, cover);
- Ok(())
})?;
Ok(())
}
@@ -94,13 +92,11 @@ impl ImportPlugin for General {
if line == "hidden" {
ct.db.update_node_init(node, |node| {
node.visibility = node.visibility.min(Visibility::Hidden);
- Ok(())
})?;
}
if line == "reduced" {
ct.db.update_node_init(node, |node| {
node.visibility = node.visibility.min(Visibility::Reduced);
- Ok(())
})?;
}
if let Some(kind) = line.strip_prefix("kind-").or(line.strip_prefix("kind=")) {
@@ -119,20 +115,17 @@ impl ImportPlugin for General {
};
ct.db.update_node_init(node, |node| {
node.kind = kind;
- Ok(())
})?;
}
if let Some(title) = line.strip_prefix("title=") {
ct.db.update_node_init(node, |node| {
node.title = Some(title.to_owned());
- Ok(())
})?;
}
if let Some(index) = line.strip_prefix("index=") {
let index = index.parse().context("parse index")?;
ct.db.update_node_init(node, |node| {
node.index = Some(index);
- Ok(())
})?;
}
Ok(())
@@ -160,7 +153,6 @@ impl ImportPlugin for Children {
ct.db.update_node_init(NodeID::from_slug(line), |n| {
n.slug = line.to_owned();
n.parents.insert(parent);
- Ok(())
})?;
}
}
@@ -195,7 +187,6 @@ impl ImportPlugin for EpisodeIndex {
node.kind = NodeKind::Episode;
node.index = Some(episode);
node.season_index = Some(season);
- Ok(())
})?;
}
}
diff --git a/import/src/plugins/tags.rs b/import/src/plugins/tags.rs
index 7e30504..e8e675c 100644
--- a/import/src/plugins/tags.rs
+++ b/import/src/plugins/tags.rs
@@ -60,7 +60,6 @@ impl ImportPlugin for Tags {
})),
}
}
- Ok(())
})?;
Ok(())
}
diff --git a/import/src/plugins/tmdb.rs b/import/src/plugins/tmdb.rs
index 4d172c5..eedc053 100644
--- a/import/src/plugins/tmdb.rs
+++ b/import/src/plugins/tmdb.rs
@@ -210,7 +210,6 @@ impl Tmdb {
node.ratings.insert(RatingType::Tmdb, details.vote_average);
node.pictures.extend(images);
node.release_date = release_date.or(node.release_date);
- Ok(())
})?;
Ok(())
}
@@ -242,7 +241,6 @@ impl Tmdb {
node.release_date = release_date.or(node.release_date);
node.ratings.insert(RatingType::Tmdb, details.vote_average);
node.pictures.extend(images);
- Ok(())
})?;
Ok(())
}
diff --git a/import/src/plugins/trakt.rs b/import/src/plugins/trakt.rs
index 8dc5bdc..c4b3bb2 100644
--- a/import/src/plugins/trakt.rs
+++ b/import/src/plugins/trakt.rs
@@ -403,7 +403,6 @@ impl ImportPlugin for Trakt {
};
ct.db.update_node_init(node, |node| {
node.identifiers.insert(ty, id.to_owned());
- Ok(())
})?;
}
Ok(())
@@ -485,7 +484,6 @@ impl Trakt {
if let Some(rating) = &details.rating {
node.ratings.insert(RatingType::Trakt, *rating);
}
- Ok(())
})?;
Ok(())
}
@@ -517,7 +515,6 @@ impl Trakt {
if let Some(r) = episode.rating {
node.ratings.insert(RatingType::Trakt, r);
}
- Ok(())
})?;
}
}
generated by cgit v1.3 (git 2.53.0) at 2026-03-20 20:42:22 +0000