minor changes

ThePornDatabase · May 12, 2024 · 6989e68 · 6989e68
1 parent 30dc426
commit 6989e68
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 48 deletions.
diff --git a/src/main/java/org/tinymediamanager/scraper/tpdb/TpdbApi.java b/src/main/java/org/tinymediamanager/scraper/tpdb/TpdbApi.java
@@ -29,10 +29,6 @@ public TpdbApi(String apiKey) {
         controller.setApiKey(apiKey);
     }
 
-    public Controller getController() {
-        return this.controller;
-    }
-
     private String getId() {
         return "tpdb";
     }

diff --git a/src/main/java/org/tinymediamanager/scraper/tpdb/TpdbMetadataProvider.java b/src/main/java/org/tinymediamanager/scraper/tpdb/TpdbMetadataProvider.java
@@ -19,8 +19,14 @@ public boolean isActive() {
     }
 
     public MediaProviderInfo createMediaProviderInfo() {
-        return new MediaProviderInfo("tpdb", "movie",
+        MediaProviderInfo info = new MediaProviderInfo("tpdb", "movie",
                 "theporndb.net", "<html><h3>ThePornDB (TPDB)</h3></html>",
                 TpdbMetadataProvider.class.getResource("/org/tinymediamanager/scraper/tpdb/logo.png"));
+
+        info.getConfig().addText("apiKey", "", true);
+        info.getConfig().addSelect("type", new String[] {"Scene", "Movie", "JAV"}, "Scene");
+        info.getConfig().load();
+
+        return info;
     }
 }
diff --git a/src/main/java/org/tinymediamanager/scraper/tpdb/TpdbMovieArtworkProvider.java b/src/main/java/org/tinymediamanager/scraper/tpdb/TpdbMovieArtworkProvider.java
@@ -1,7 +1,6 @@
 package org.tinymediamanager.scraper.tpdb;
 
 import org.tinymediamanager.scraper.ArtworkSearchAndScrapeOptions;
-import org.tinymediamanager.scraper.MediaProviderInfo;
 import org.tinymediamanager.scraper.entities.MediaArtwork;
 import org.tinymediamanager.scraper.exceptions.ScrapeException;
 import org.tinymediamanager.scraper.interfaces.IMovieArtworkProvider;
@@ -11,17 +10,6 @@
 import java.util.List;
 
 public class TpdbMovieArtworkProvider extends TpdbMetadataProvider implements IMovieArtworkProvider {
-    @Override
-    public MediaProviderInfo createMediaProviderInfo() {
-        MediaProviderInfo info = super.createMediaProviderInfo();
-
-        info.getConfig().addText("apiKey", "", true);
-        info.getConfig().addSelect("type", new String[] {"Scene", "Movie", "JAV"}, "Scene");
-        info.getConfig().load();
-
-        return info;
-    }
-
     @Override
     public List<MediaArtwork> getArtwork(ArtworkSearchAndScrapeOptions options) throws ScrapeException {
         String apiKey = getProviderInfo().getConfig().getValue("apiKey");

diff --git a/src/main/java/org/tinymediamanager/scraper/tpdb/TpdbMovieMetadataProvider.java b/src/main/java/org/tinymediamanager/scraper/tpdb/TpdbMovieMetadataProvider.java
@@ -2,32 +2,18 @@
 
 import org.tinymediamanager.core.movie.MovieSearchAndScrapeOptions;
 import org.tinymediamanager.scraper.MediaMetadata;
-import org.tinymediamanager.scraper.MediaProviderInfo;
 import org.tinymediamanager.scraper.MediaSearchResult;
 import org.tinymediamanager.scraper.entities.MediaType;
 import org.tinymediamanager.scraper.exceptions.NothingFoundException;
 import org.tinymediamanager.scraper.exceptions.ScrapeException;
 import org.tinymediamanager.scraper.interfaces.IMovieMetadataProvider;
 import org.tinymediamanager.scraper.tpdb.entities.SceneEntity;
-import org.tinymediamanager.scraper.tpdb.entities.SceneSearch;
-import org.tinymediamanager.scraper.tpdb.service.Controller;
 
 import java.util.List;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
 public class TpdbMovieMetadataProvider extends TpdbMetadataProvider implements IMovieMetadataProvider {
-    @Override
-    public MediaProviderInfo createMediaProviderInfo() {
-        MediaProviderInfo info = super.createMediaProviderInfo();
-
-        info.getConfig().addText("apiKey", "", true);
-        info.getConfig().addSelect("type", new String[] {"Scene", "Movie", "JAV"}, "Scene");
-        info.getConfig().load();
-
-        return info;
-    }
-
     @Override
     public SortedSet<MediaSearchResult> search(MovieSearchAndScrapeOptions options) throws ScrapeException {
         String apiKey = getProviderInfo().getConfig().getValue("apiKey");

diff --git a/src/main/java/org/tinymediamanager/scraper/tpdb/TpdbMovieTrailerProvider.java b/src/main/java/org/tinymediamanager/scraper/tpdb/TpdbMovieTrailerProvider.java
@@ -1,7 +1,6 @@
 package org.tinymediamanager.scraper.tpdb;
 
 import org.tinymediamanager.core.entities.MediaTrailer;
-import org.tinymediamanager.scraper.MediaProviderInfo;
 import org.tinymediamanager.scraper.TrailerSearchAndScrapeOptions;
 import org.tinymediamanager.scraper.exceptions.ScrapeException;
 import org.tinymediamanager.scraper.interfaces.IMovieTrailerProvider;
@@ -11,17 +10,6 @@
 import java.util.List;
 
 public class TpdbMovieTrailerProvider extends TpdbMetadataProvider implements IMovieTrailerProvider {
-    @Override
-    public MediaProviderInfo createMediaProviderInfo() {
-        MediaProviderInfo info = super.createMediaProviderInfo();
-
-        info.getConfig().addText("apiKey", "", true);
-        info.getConfig().addSelect("type", new String[] {"Scene", "Movie", "JAV"}, "Scene");
-        info.getConfig().load();
-
-        return info;
-    }
-
     @Override
     public List<MediaTrailer> getTrailers(TrailerSearchAndScrapeOptions options) throws ScrapeException {
         String apiKey = getProviderInfo().getConfig().getValue("apiKey");
@@ -38,11 +26,13 @@ public List<MediaTrailer> getTrailers(TrailerSearchAndScrapeOptions options) thr
 
         List<MediaTrailer> trailers = new ArrayList<>();
 
-        MediaTrailer trailer = new MediaTrailer();
-        trailer.setName(scene.title);
-        trailer.setProvider(scene.site.name);
-        trailer.setUrl(scene.trailer);
-        trailers.add(trailer);
+        if (scene.trailer != null) {
+            MediaTrailer trailer = new MediaTrailer();
+            trailer.setName(scene.title);
+            trailer.setProvider(scene.site.name);
+            trailer.setUrl(scene.trailer);
+            trailers.add(trailer);
+        }
 
         return trailers;
     }