aboutsummaryrefslogtreecommitdiff
path: root/import/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'import/src/plugins')
-rw-r--r--import/src/plugins/acoustid.rs6
-rw-r--r--import/src/plugins/infojson.rs10
-rw-r--r--import/src/plugins/media_info.rs8
-rw-r--r--import/src/plugins/misc.rs6
-rw-r--r--import/src/plugins/mod.rs2
-rw-r--r--import/src/plugins/tags.rs2
-rw-r--r--import/src/plugins/tmdb.rs10
-rw-r--r--import/src/plugins/trakt.rs10
8 files changed, 23 insertions, 31 deletions
diff --git a/import/src/plugins/acoustid.rs b/import/src/plugins/acoustid.rs
index c184468..81bf359 100644
--- a/import/src/plugins/acoustid.rs
+++ b/import/src/plugins/acoustid.rs
@@ -12,7 +12,7 @@ use jellycache::{Cache, HashKey};
use jellycommon::{
IDENT_ACOUST_ID_TRACK, IDENT_MUSICBRAINZ_RECORDING, NO_IDENTIFIERS, jellyobject::Object,
};
-use jellydb::table::RowNum;
+use jellydb::RowNum;
use jellyremuxer::matroska::Segment;
use log::info;
use reqwest::{
@@ -187,7 +187,7 @@ impl ImportPlugin for AcoustID {
if let Some((atid, mbid)) = self.get_atid_mbid(&ct.dba.cache, &fp, &ct.rt)? {
ct.dba.db.transaction(&mut |txn| {
- let ob = ct.dba.nodes.get(txn, node)?.unwrap();
+ let ob = txn.get(node)?.unwrap();
let ob = ob.as_object();
let ob = ob.insert(
NO_IDENTIFIERS,
@@ -198,7 +198,7 @@ impl ImportPlugin for AcoustID {
.insert(IDENT_MUSICBRAINZ_RECORDING, &mbid)
.as_object(),
);
- ct.dba.nodes.update(txn, node, ob)?;
+ txn.update(node, ob)?;
Ok(())
});
};
diff --git a/import/src/plugins/infojson.rs b/import/src/plugins/infojson.rs
index e03a5f7..3a48ce8 100644
--- a/import/src/plugins/infojson.rs
+++ b/import/src/plugins/infojson.rs
@@ -7,7 +7,7 @@ use crate::plugins::{ImportPlugin, PluginContext, PluginInfo};
use anyhow::{Context, Result, anyhow};
use chrono::{Utc, format::Parsed};
use jellycommon::*;
-use jellydb::table::RowNum;
+use jellydb::RowNum;
use jellyremuxer::matroska::{AttachedFile, Segment};
use log::info;
use serde::{Deserialize, Serialize};
@@ -176,7 +176,7 @@ impl ImportPlugin for Infojson {
let title = clean_uploader_name(&data.title);
ct.dba.db.transaction(&mut |txn| {
- let mut node = ct.dba.nodes.get(txn, parent)?.unwrap();
+ let mut node = txn.get(parent)?.unwrap();
node = node.as_object().insert(NO_KIND, KIND_CHANNEL);
node = node.as_object().insert(NO_TITLE, title);
if let Some(cid) = &data.channel_id {
@@ -198,7 +198,7 @@ impl ImportPlugin for Infojson {
});
}
- ct.dba.nodes.update(txn, parent, node)
+ txn.update(parent, node)
})
}
@@ -237,7 +237,7 @@ impl ImportPlugin for Infojson {
};
ct.dba.db.transaction(&mut |txn| {
- let mut node = ct.dba.nodes.get(txn, row)?.unwrap();
+ let mut node = txn.get(row)?.unwrap();
node = node.as_object().insert(NO_KIND, kind);
node = node.as_object().insert(NO_TITLE, &infojson.title);
if let Some(title) = &infojson.alt_title
@@ -290,7 +290,7 @@ impl ImportPlugin for Infojson {
_ => (),
};
- ct.dba.nodes.update(txn, row, node)
+ txn.update(row, node)
})?;
}
Ok(())
diff --git a/import/src/plugins/media_info.rs b/import/src/plugins/media_info.rs
index f1f56bb..05beb8f 100644
--- a/import/src/plugins/media_info.rs
+++ b/import/src/plugins/media_info.rs
@@ -4,13 +4,13 @@
Copyright (C) 2026 metamuffin <metamuffin.org>
*/
-use crate::plugins::{PluginContext, ImportPlugin, PluginInfo};
+use crate::plugins::{ImportPlugin, PluginContext, PluginInfo};
use anyhow::Result;
use jellycommon::{
jellyobject::{Object, ObjectBuffer},
*,
};
-use jellydb::table::RowNum;
+use jellydb::RowNum;
use jellyremuxer::matroska::{Segment, TrackType};
use std::path::Path;
@@ -26,7 +26,7 @@ impl ImportPlugin for MediaInfo {
fn media(&self, ct: &PluginContext, row: RowNum, path: &Path, seg: &Segment) -> Result<()> {
let size = path.metadata()?.len();
ct.dba.db.transaction(&mut |txn| {
- let mut node = ct.dba.nodes.get(txn, row)?.unwrap();
+ let mut node = txn.get(row)?.unwrap();
if let Some(tracks) = &seg.tracks {
node = node.as_object().extend_object(
NO_TRACK,
@@ -109,7 +109,7 @@ impl ImportPlugin for MediaInfo {
);
node = node.as_object().insert(NO_STORAGE_SIZE, size);
- ct.dba.nodes.update(txn, row, node)?;
+ txn.update(row, node)?;
Ok(())
})
diff --git a/import/src/plugins/misc.rs b/import/src/plugins/misc.rs
index 6a8caa6..d929935 100644
--- a/import/src/plugins/misc.rs
+++ b/import/src/plugins/misc.rs
@@ -7,7 +7,7 @@ use crate::plugins::{ImportPlugin, PluginContext, PluginInfo};
use anyhow::{Context, Result, bail};
use jellycache::HashKey;
use jellycommon::{jellyobject::inspect::Inspector, *};
-use jellydb::table::RowNum;
+use jellydb::RowNum;
use jellyremuxer::matroska::{AttachedFile, Segment};
use log::info;
use regex::Regex;
@@ -43,11 +43,11 @@ impl ImportPlugin for ImageFiles {
},
)?;
ct.dba.db.transaction(&mut |txn| {
- let mut node = ct.dba.nodes.get(txn, row)?.unwrap();
+ let mut node = txn.get(row)?.unwrap();
node = node
.as_object()
.update(NO_PICTURES, |picts| picts.insert(slot, &asset));
- ct.dba.nodes.update(txn, row, node)?;
+ txn.update(row, node)?;
Ok(())
})?;
Ok(())
diff --git a/import/src/plugins/mod.rs b/import/src/plugins/mod.rs
index d70c6e1..b351a17 100644
--- a/import/src/plugins/mod.rs
+++ b/import/src/plugins/mod.rs
@@ -17,7 +17,7 @@ pub mod wikimedia_commons;
use crate::{ApiSecrets, ImportConfig, InheritedFlags};
use anyhow::Result;
-use jellydb::table::RowNum;
+use jellydb::RowNum;
use jellyremuxer::matroska::Segment;
use std::{collections::HashSet, path::Path, sync::Mutex};
use tokio::runtime::Handle;
diff --git a/import/src/plugins/tags.rs b/import/src/plugins/tags.rs
index e0652d4..d1e6a81 100644
--- a/import/src/plugins/tags.rs
+++ b/import/src/plugins/tags.rs
@@ -7,7 +7,7 @@
use crate::plugins::{PluginContext, ImportPlugin, PluginInfo};
use anyhow::Result;
use jellycommon::*;
-use jellydb::table::RowNum;
+use jellydb::RowNum;
use jellyremuxer::matroska::Segment;
use std::{collections::HashMap, path::Path};
diff --git a/import/src/plugins/tmdb.rs b/import/src/plugins/tmdb.rs
index ea32c40..e9e92d4 100644
--- a/import/src/plugins/tmdb.rs
+++ b/import/src/plugins/tmdb.rs
@@ -11,7 +11,7 @@ use anyhow::{Context, Result, anyhow, bail};
use chrono::{Utc, format::Parsed};
use jellycache::{Cache, EscapeKey, HashKey};
use jellycommon::*;
-use jellydb::table::RowNum;
+use jellydb::RowNum;
use log::info;
use reqwest::{
Client, ClientBuilder,
@@ -268,13 +268,9 @@ impl Tmdb {
return Ok(());
};
let mut series_id = None;
- ct.dba.db.read_transaction(&mut |txn| {
+ ct.dba.db.transaction(&mut |txn| {
for parent in data.iter(NO_PARENT) {
- let parent_data = ct
- .dba
- .nodes
- .get(txn, parent)?
- .ok_or(anyhow!("parent missing"))?;
+ let parent_data = txn.get(parent)?.ok_or(anyhow!("parent missing"))?;
if let Some(id) = parent_data
.as_object()
.get(NO_IDENTIFIERS)
diff --git a/import/src/plugins/trakt.rs b/import/src/plugins/trakt.rs
index 2cb063d..ebbe879 100644
--- a/import/src/plugins/trakt.rs
+++ b/import/src/plugins/trakt.rs
@@ -10,7 +10,7 @@ use crate::{
use anyhow::{Context, Result, anyhow, bail};
use jellycache::{Cache, HashKey};
use jellycommon::{jellyobject::Tag, *};
-use jellydb::table::RowNum;
+use jellydb::RowNum;
use log::info;
use reqwest::{
Client, ClientBuilder,
@@ -527,13 +527,9 @@ impl Trakt {
return Ok(());
};
let mut show_id = None;
- ct.dba.db.read_transaction(&mut |txn| {
+ ct.dba.db.transaction(&mut |txn| {
for parent in node_data.iter(NO_PARENT) {
- let parent_data = ct
- .dba
- .nodes
- .get(txn, parent)?
- .ok_or(anyhow!("parent missing"))?;
+ let parent_data = txn.get(parent)?.ok_or(anyhow!("parent missing"))?;
if let Some(id) = parent_data
.as_object()
.get(NO_IDENTIFIERS)
generated by cgit v1.3 (git 2.53.0) at 2026-03-20 10:39:18 +0000