Merge branch 'hotfix/1044' into hotfix/3.1.255

Author: alex1702

src/main/java/mServer/crawler/AddToFilmlist.java

@@ -136,6 +136,7 @@ private void performInitialCleanup() {
     removeTimeFromOrf(listeEinsortieren);
     updateAudioDescriptionOrf(listeEinsortieren);
     updateAudioDescriptionSrf(listeEinsortieren);
+    updateThema(listeEinsortieren);
     updateTitle(listeEinsortieren);
     updateArdWebsite(listeEinsortieren);
     updateSenderTagesschau24(listeEinsortieren);
@@ -179,8 +180,17 @@ private void updateFunkMissingHost(ListeFilme listeEinsortieren) {
     list.forEach(film -> film.arr[DatenFilm.FILM_URL_HD] = film.arr[DatenFilm.FILM_URL_HD].replace("https://", "https://funk-02.akamaized.net/").trim());
   }
 
+  private void updateThema(ListeFilme listeEinsortieren) {
+    listeEinsortieren.parallelStream().forEach(film -> {
+      final String thema = film.arr[DatenFilm.FILM_THEMA].trim();
+      if (thema.contains("–")) {
+        film.arr[DatenFilm.FILM_THEMA] = thema.replace("–", "-").trim();
+      }
+    });
+  }
+
   private void updateTitle(ListeFilme listeEinsortieren) {
-    listeEinsortieren.forEach(film -> {
+    listeEinsortieren.parallelStream().forEach(film -> {
       final String title = film.arr[DatenFilm.FILM_TITEL].trim();
       if (title.endsWith("-")) {
         film.arr[DatenFilm.FILM_TITEL] = title.replaceAll("-+$", "").trim();

src/test/developTest/java/mServer/crawler/AddToFilmlistTest.java

@@ -416,6 +416,23 @@ public void testNotAddArteExtraits() {
     assertEquals(list.size(), 2);
   }
 
+  @Test
+  public void testRefreshThemaWithBindestrich() {
+    final DatenFilm testFilmNotUpdated = createTestFilm(Const.ARD, "My - Topic", "Film with normal", FILM_NAME_ONLINE);
+    final DatenFilm testFilmUpdated = createTestFilm(Const.ARD, "My - Topic", "Film with wrong", FILM_NAME_ONLINE);
+    testFilmUpdated.arr[DatenFilm.FILM_THEMA] = "My – Topic";
+
+    listToAdd.add(testFilmUpdated);
+    listToAdd.add(testFilmNotUpdated);
+
+    AddToFilmlist target = new AddToFilmlist(list, listToAdd);
+    target.addOldList();
+
+    assertEquals(list.size(), 4);
+    assertEquals("My - Topic", testFilmUpdated.arr[DatenFilm.FILM_THEMA]);
+    assertEquals("My - Topic", testFilmNotUpdated.arr[DatenFilm.FILM_THEMA]);
+  }
+
   @Test
   public void testRefreshTitleWithTrailingDash() {
     final DatenFilm testFilmUpdated = createTestFilm(Const.ARD, "My Topic", "Title - ", FILM_NAME_ONLINE);