diff options
Diffstat (limited to 'import/src')
| -rw-r--r-- | import/src/lib.rs | 10 | ||||
| -rw-r--r-- | import/src/plugins/acoustid.rs | 2 | ||||
| -rw-r--r-- | import/src/plugins/infojson.rs | 4 | ||||
| -rw-r--r-- | import/src/plugins/media_info.rs | 2 | ||||
| -rw-r--r-- | import/src/plugins/misc.rs | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/import/src/lib.rs b/import/src/lib.rs index 2e36c58..bb401d3 100644 --- a/import/src/lib.rs +++ b/import/src/lib.rs @@ -19,7 +19,7 @@ use jellycommon::{ *, }; use jellydb::{ - kv::Database, + kv::Store, query::{Filter, Query, Sort}, table::{RowNum, Table}, }; @@ -86,7 +86,7 @@ pub fn is_importing() -> bool { #[derive(Clone)] pub struct ImportConfig { pub cache: Arc<Cache>, - pub db: Arc<dyn Database>, + pub db: Arc<dyn Store>, pub nodes: Arc<Table>, pub import_meta: Arc<Table>, } @@ -109,7 +109,7 @@ impl ImportConfig { node: RowNum, mut update: impl FnMut(ObjectBuffer) -> ObjectBuffer, ) -> Result<()> { - self.db.write_transaction(&mut |txn| { + self.db.transaction(&mut |txn| { let ob_before = self.nodes.get(txn, node)?.unwrap(); let ob_after = update(ob_before); self.nodes.update(txn, node, ob_after)?; @@ -123,7 +123,7 @@ impl ImportConfig { mut update: impl FnMut(ObjectBuffer) -> ObjectBuffer, ) -> Result<RowNum> { let mut row = 0; - self.db.write_transaction(&mut |txn| { + self.db.transaction(&mut |txn| { row = match self.nodes.query_single(txn, node_slug_query(slug))? { Some(r) => r, None => self @@ -478,7 +478,7 @@ fn compare_mtime(dba: &ImportConfig, path: &Path) -> Result<bool> { fn update_mtime(dba: &ImportConfig, path: &Path) -> Result<()> { let meta = path.metadata()?; let mtime = meta.modified()?.duration_since(UNIX_EPOCH)?.as_secs(); - dba.db.write_transaction(&mut |txn| { + dba.db.transaction(&mut |txn| { let row = match dba.import_meta.query_single( txn, Query { diff --git a/import/src/plugins/acoustid.rs b/import/src/plugins/acoustid.rs index 0e16670..c184468 100644 --- a/import/src/plugins/acoustid.rs +++ b/import/src/plugins/acoustid.rs @@ -186,7 +186,7 @@ impl ImportPlugin for AcoustID { let fp = acoustid_fingerprint(&ct.dba.cache, path)?; if let Some((atid, mbid)) = self.get_atid_mbid(&ct.dba.cache, &fp, &ct.rt)? { - ct.dba.db.write_transaction(&mut |txn| { + ct.dba.db.transaction(&mut |txn| { let ob = ct.dba.nodes.get(txn, node)?.unwrap(); let ob = ob.as_object(); let ob = ob.insert( diff --git a/import/src/plugins/infojson.rs b/import/src/plugins/infojson.rs index 3426679..e03a5f7 100644 --- a/import/src/plugins/infojson.rs +++ b/import/src/plugins/infojson.rs @@ -175,7 +175,7 @@ impl ImportPlugin for Infojson { let data = serde_json::from_reader::<_, YVideo>(BufReader::new(File::open(path)?))?; let title = clean_uploader_name(&data.title); - ct.dba.db.write_transaction(&mut |txn| { + ct.dba.db.transaction(&mut |txn| { let mut node = ct.dba.nodes.get(txn, parent)?.unwrap(); node = node.as_object().insert(NO_KIND, KIND_CHANNEL); node = node.as_object().insert(NO_TITLE, title); @@ -236,7 +236,7 @@ impl ImportPlugin for Infojson { KIND_VIDEO }; - ct.dba.db.write_transaction(&mut |txn| { + ct.dba.db.transaction(&mut |txn| { let mut node = ct.dba.nodes.get(txn, row)?.unwrap(); node = node.as_object().insert(NO_KIND, kind); node = node.as_object().insert(NO_TITLE, &infojson.title); diff --git a/import/src/plugins/media_info.rs b/import/src/plugins/media_info.rs index 9b79efa..f1f56bb 100644 --- a/import/src/plugins/media_info.rs +++ b/import/src/plugins/media_info.rs @@ -25,7 +25,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.write_transaction(&mut |txn| { + ct.dba.db.transaction(&mut |txn| { let mut node = ct.dba.nodes.get(txn, row)?.unwrap(); if let Some(tracks) = &seg.tracks { node = node.as_object().extend_object( diff --git a/import/src/plugins/misc.rs b/import/src/plugins/misc.rs index 554f473..6a8caa6 100644 --- a/import/src/plugins/misc.rs +++ b/import/src/plugins/misc.rs @@ -42,7 +42,7 @@ impl ImportPlugin for ImageFiles { Ok(data) }, )?; - ct.dba.db.write_transaction(&mut |txn| { + ct.dba.db.transaction(&mut |txn| { let mut node = ct.dba.nodes.get(txn, row)?.unwrap(); node = node .as_object() |