make jellytool work again; dummy cache driver

3 files changed, 9 insertions, 23 deletions

diff --git a/import/src/lib.rs b/import/src/lib.rs
index 8e4c702..44f87f7 100644
--- a/import/src/lib.rs
+++ b/import/src/lib.rs
@@ -9,10 +9,7 @@ pub mod plugins;
 pub mod reporting;
 
 use crate::{
-    plugins::{
-        ImportContext, ImportPlugin, infojson::is_info_json, init_plugins, misc::is_cover,
-        trakt::Trakt,
-    },
+    plugins::{ImportContext, ImportPlugin, infojson::is_info_json, init_plugins, misc::is_cover},
     reporting::IMPORT_PROGRESS,
 };
 use anyhow::{Context, Result, anyhow};
@@ -79,15 +76,6 @@ pub fn is_importing() -> bool {
     IMPORT_SEM.available_permits() == 0
 }
 
-pub fn get_trakt() -> Result<Trakt> {
-    Ok(Trakt::new(
-        CONF.api
-            .trakt
-            .as_ref()
-            .ok_or(anyhow!("no trakt api key configured"))?,
-    ))
-}
-
 pub async fn import_wrap(db: Database, incremental: bool) -> Result<()> {
     let _sem = IMPORT_SEM.try_acquire().context("already importing")?;
 
diff --git a/import/src/plugins/mod.rs b/import/src/plugins/mod.rs
index 20c3529..5a5334e 100644
--- a/import/src/plugins/mod.rs
+++ b/import/src/plugins/mod.rs
@@ -70,16 +70,14 @@ pub fn init_plugins(secrets: &ApiSecrets) -> Vec<Box<dyn ImportPlugin>> {
     plugins.push(Box::new(tags::Tags));
     plugins.push(Box::new(media_info::MediaInfo));
     plugins.push(Box::new(infojson::Infojson));
-
-    if let Some(s) = &secrets.trakt {
-        plugins.push(Box::new(trakt::Trakt::new(&s)));
+    if let Some(api_key) = &secrets.trakt {
+        plugins.push(Box::new(trakt::Trakt::new(&api_key)));
     }
-    if let Some(s) = &secrets.tmdb {
-        plugins.push(Box::new(tmdb::Tmdb::new(&s))); // deps: trakt
+    if let Some(api_key) = &secrets.tmdb {
+        plugins.push(Box::new(tmdb::Tmdb::new(&api_key))); // deps: trakt
     }
-
-    if let Some(s) = &secrets.acoustid {
-        plugins.push(Box::new(acoustid::AcoustID::new(&s)));
+    if let Some(api_key) = &secrets.acoustid {
+        plugins.push(Box::new(acoustid::AcoustID::new(&api_key)));
     }
     plugins.push(Box::new(musicbrainz::MusicBrainz::new())); // deps: acoustid
     plugins.push(Box::new(wikidata::Wikidata::new())); // deps: musicbrainz
diff --git a/import/src/plugins/trakt.rs b/import/src/plugins/trakt.rs
index 1268e56..8dc5bdc 100644
--- a/import/src/plugins/trakt.rs
+++ b/import/src/plugins/trakt.rs
@@ -314,11 +314,11 @@ pub struct TraktIds {
 impl Display for TraktSearchResult {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.write_fmt(format_args!(
-            "{} ({}) \x1b[2m{} [{:?}]\x1b[0m",
+            "{} ({}) \x1b[2m{} {}\x1b[0m",
             self.inner.inner().title,
             self.inner.inner().year.unwrap_or(0),
             self.r#type,
-            self.inner.inner().ids
+            self.inner.inner().ids.trakt.unwrap_or_default()
         ))
     }
 }