split base into asset_token and db

4 files changed, 12 insertions, 12 deletions

diff --git a/import/src/infojson.rs b/import/src/infojson.rs
index 1efbae9..e0ebc43 100644
--- a/import/src/infojson.rs
+++ b/import/src/infojson.rs
@@ -5,7 +5,7 @@
 */
 use anyhow::Context;
 use bincode::{Decode, Encode};
-use jellybase::common::chrono::{format::Parsed, Utc};
+use jellycommon::chrono::{format::Parsed, Utc};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
diff --git a/import/src/lib.rs b/import/src/lib.rs
index 784b717..426a96a 100644
--- a/import/src/lib.rs
+++ b/import/src/lib.rs
@@ -14,18 +14,18 @@ pub mod vgmdb;
 pub mod wikidata;
 pub mod wikimedia_commons;
 
+use jellydb::Database;
+pub use jellyimport_asset_token as asset_token;
+use jellyimport_asset_token::AssetInner;
+
 use acoustid::{acoustid_fingerprint, AcoustID};
 use anyhow::{anyhow, bail, Context, Result};
 use infojson::YVideo;
-use jellybase::{
-    assetfed::AssetInner,
-    common::{
-        Appearance, Chapter, LocalTrack, MediaInfo, Node, NodeID, NodeKind, ObjectIds, PeopleGroup,
-        Person, Rating, SourceTrack, SourceTrackKind, TmdbKind, TrackSource, TraktKind, Visibility,
-    },
-    database::Database,
-};
 use jellycache::cache_file;
+use jellycommon::{
+    Appearance, Chapter, LocalTrack, MediaInfo, Node, NodeID, NodeKind, ObjectIds, PeopleGroup,
+    Person, Rating, SourceTrack, SourceTrackKind, TmdbKind, TrackSource, TraktKind, Visibility,
+};
 use jellyimport_fallback_generator::generate_fallback;
 use jellyremuxer::metadata::checked_matroska_metadata;
 use log::info;
diff --git a/import/src/tmdb.rs b/import/src/tmdb.rs
index dff0e95..ceb1650 100644
--- a/import/src/tmdb.rs
+++ b/import/src/tmdb.rs
@@ -6,11 +6,11 @@
 use crate::USER_AGENT;
 use anyhow::{anyhow, bail, Context};
 use bincode::{Decode, Encode};
-use jellybase::common::{
+use jellycache::{async_cache_file, async_cache_memory, CachePath};
+use jellycommon::{
     chrono::{format::Parsed, Utc},
     TmdbKind,
 };
-use jellycache::{async_cache_file, async_cache_memory, CachePath};
 use log::info;
 use reqwest::{
     header::{HeaderMap, HeaderName, HeaderValue},
diff --git a/import/src/trakt.rs b/import/src/trakt.rs
index 434a3a0..f25fa9e 100644
--- a/import/src/trakt.rs
+++ b/import/src/trakt.rs
@@ -6,8 +6,8 @@
 use crate::USER_AGENT;
 use anyhow::Context;
 use bincode::{Decode, Encode};
-use jellybase::common::{Appearance, ObjectIds, PeopleGroup, Person, TraktKind};
 use jellycache::async_cache_memory;
+use jellycommon::{Appearance, ObjectIds, PeopleGroup, Person, TraktKind};
 use log::info;
 use reqwest::{
     header::{HeaderMap, HeaderName, HeaderValue},