backport fix for website url to dev

Author: codingPF

src/main/java/de/mediathekview/mserver/crawler/kika/json/KikaApiTopicPageDeserializer.java

@@ -99,13 +99,20 @@ protected Optional<KikaApiFilmDto> parseFilm(final JsonElement arrayElement) {
     }
     return aFilm;
   }
-  
+
   protected Optional<String> reconstructWebsite(Optional<String> oTeaserImageUrl, Optional<String> oSophoraId) {
     String base = KikaApiConstants.WEBSITE;
+    // host wegschneiden
     int start = oTeaserImageUrl.get().indexOf("/", "https://".length()+1);
-    int stop = oTeaserImageUrl.get().indexOf("/", start+1);
+    // letzter Teil wegschneiden (das Bild vom teaserimage)
+    int stop = oTeaserImageUrl.get().lastIndexOf("/");
+    // neue url mit host und mittelteil
     base += oTeaserImageUrl.get().substring(start, stop);
-    base += "/videos/" + oSophoraId.get() + ".html";
+    // sophora hinzufügen
+    base += "/" + oSophoraId.get();
+    // fix
+    base = base.replace("/sendungen/bilder/","/videos/");
+    base = base.replace("/bilder/","/videos/");
     return Optional.of(base);
   }
 }

src/main/java/de/mediathekview/mserver/crawler/kika/tasks/KikaApiFilmTask.java

@@ -59,7 +59,7 @@ protected JsonDeserializer<KikaApiVideoInfoDto> getParser(KikaApiFilmDto aDTO) {
 
   @Override
   protected Type getType() {
-    return new TypeToken<Set<KikaApiVideoInfoDto>>() {}.getType();
+    return new TypeToken<KikaApiVideoInfoDto>() {}.getType();
   }
 
   @Override

src/main/java/de/mediathekview/mserver/crawler/kika/tasks/KikaApiTopicTask.java

@@ -4,7 +4,6 @@
 import java.net.URI;
 import java.util.Optional;
 import java.util.Queue;
-import java.util.Set;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 import org.apache.logging.log4j.LogManager;
@@ -41,7 +40,7 @@ protected JsonDeserializer<KikaApiTopicDto> getParser(TopicUrlDTO aDTO) {
 
   @Override
   protected Type getType() {
-    return new TypeToken<Set<KikaApiTopicDto>>() {}.getType();
+    return new TypeToken<KikaApiTopicDto>() {}.getType();
   }
 
   @Override