-switch to 14.4

-use sh256 for film hashing
-cleanup

Author: derreisende77

pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>de.mediathekview</groupId>
     <artifactId>MediathekView</artifactId>
-    <version>14.3.0</version>
+    <version>14.4.0</version>
     <packaging>jar</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>

src/main/java/mediathek/config/Daten.java

@@ -233,7 +233,7 @@ private void clearKonfig() {
         listeAbo.clear();
         listeDownloads.clear();
         listeBlacklist.clear();
-        listeBookmarkList.clear();
+        listeBookmarkList.getObervableList().clear();
     }
 
     private boolean load() {

src/main/java/mediathek/config/Konstanten.java

@@ -28,9 +28,9 @@
 public class Konstanten {
     public static final String NEW_SENDER_ACTIVATED_QUESTION_CONFIG_KEY = "newSendersActivated.fourteen.three";
     public static final long MINIMUM_MEMORY_THRESHOLD = 768 * FileUtils.ONE_MB;
-    public static final Version MVVERSION = new Version(14, 3, 0);
+    public static final Version MVVERSION = new Version(14, 4, 0);
 
-    public static final ApplicationType APPLICATION_TYPE = ApplicationType.PRODUCTION;
+    public static final ApplicationType APPLICATION_TYPE = ApplicationType.NIGHTLY;
     public static final String MACOS_OFFICIAL_APP = "OSX_OFFICIAL_APP";
 
     public static final String FORMAT_ZIP = ".zip";

src/main/java/mediathek/daten/DatenFilm.java

@@ -1,5 +1,7 @@
 package mediathek.daten;
 
+import com.google.common.hash.HashCode;
+import com.google.common.hash.Hashing;
 import mediathek.config.Config;
 import mediathek.daten.abo.DatenAbo;
 import mediathek.javafx.bookmark.BookmarkData;
@@ -409,10 +411,15 @@ public String getFileSizeForUrl(@NotNull String url) {
     /**
      * Return a unique index for comparison during updating the filmlist from diff.
      *
-     * @return a unique "hash" string
+     * @return a unique hash
      */
-    public String getUniqueHash() {
-        return (getSender() + getThema()).toLowerCase() + getUrlNormalQuality() + getWebsiteUrl();
+    public HashCode getSha256() {
+        return Hashing.sha256().newHasher()
+                .putUnencodedChars(getSender())
+                .putUnencodedChars(getThema())
+                .putUnencodedChars(getUrlNormalQuality())
+                .putUnencodedChars(getWebsiteUrl())
+                .hash();
     }
 
     /**

src/main/java/mediathek/daten/ListeFilme.java

@@ -1,5 +1,6 @@
 package mediathek.daten;
 
+import com.google.common.hash.HashCode;
 import mediathek.config.Konstanten;
 import mediathek.tool.GermanStringSorter;
 import org.jetbrains.annotations.NotNull;
@@ -84,10 +85,10 @@ public List<String> getThemenUnprocessed(String sender) {
     public synchronized void updateFromFilmList(@NotNull ListeFilme newFilmsList) {
         // In die vorhandene Liste soll eine andere Filmliste einsortiert werden
         // es werden nur Filme, die noch nicht vorhanden sind, einsortiert
-        final HashSet<String> hashNewFilms = new HashSet<>(newFilmsList.size() + 1, 1);
+        var hashNewFilms = new HashSet<HashCode>(newFilmsList.size() + 1, 1);
+        newFilmsList.forEach(newFilm -> hashNewFilms.add(newFilm.getSha256()));
 
-        newFilmsList.forEach(newFilm -> hashNewFilms.add(newFilm.getUniqueHash()));
-        this.removeIf(currentFilm -> hashNewFilms.contains(currentFilm.getUniqueHash()));
+        this.removeIf(currentFilm -> hashNewFilms.contains(currentFilm.getSha256()));
 
         hashNewFilms.clear();
 
@@ -115,7 +116,8 @@ public synchronized DatenFilm getFilmByUrlAndSender(@NotNull String url, @NotNul
      * Find movie with given url
      * @param url    String wiht URL
      * @return DatenFilm object if found or null
-     */public synchronized DatenFilm getFilmByUrl(@NotNull String url) {
+     */
+    public synchronized DatenFilm getFilmByUrl(@NotNull String url) {
         return parallelStream()
                 .filter(f -> f.getUrlNormalQuality().equalsIgnoreCase(url))
                 .findAny()

src/main/java/mediathek/gui/tabs/tab_film/GuiFilme.java

@@ -757,7 +757,7 @@ public void actionPerformed(ActionEvent e) {
                     updateBookmarkListAndRefresh(list);
                 }
                 //delete leftover items which have no corresponding DatenFilm objects anymore -> outdated
-                daten.getListeBookmarkList().clear();
+                daten.getListeBookmarkList().getObervableList().clear();
                 JOptionPane.showMessageDialog(mediathekGui, "Merkliste wurde gelöscht.", Konstanten.PROGRAMMNAME, JOptionPane.INFORMATION_MESSAGE);
             }        }
     }

src/main/java/mediathek/javafx/bookmark/BookmarkDataList.java

@@ -1,7 +1,6 @@
 package mediathek.javafx.bookmark;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import javafx.beans.Observable;
 import javafx.collections.FXCollections;
@@ -54,23 +53,6 @@ public ObservableList<BookmarkData> getObervableList() {
         return bookmarks;
     }
 
-    /**
-     * Get size of bookmark list
-     *
-     * @return number of stored movies
-     */
-    @JsonIgnore
-    public int getNbOfEntries() {
-        return bookmarks.size();
-    }
-
-    /**
-     * Delete Bookmarklist
-     */
-    public void clear() {
-        bookmarks.clear();
-    }
-
     /**
      * Add given film(s) to List if not yet in list
      * otherwise remove them from list

src/main/java/mediathek/javafx/bookmark/BookmarkWindowController.java

@@ -635,7 +635,7 @@ private void scheduleBookmarkSave() {
 
   private void updateDisplay() {
     lblCount.setText(String.format("Einträge: %d / %d", filteredBookmarkList.size(),
-            Daten.getInstance().getListeBookmarkList().getNbOfEntries()));
+            Daten.getInstance().getListeBookmarkList().getObervableList().size()));
     btnSaveList.setDisable(!listUpdated);
     if (listUpdated) {
       scheduleBookmarkSave();

src/main/java/mediathek/tool/cellrenderer/CellRendererFilme.java

@@ -51,7 +51,7 @@ public CellRendererFilme() {
         selectedBookmarkIcon.setColorFilter(whiteColorFilter);
 
         selectedBookmarkIconHighlighted = SVGIconUtilities.createSVGIcon("icons/fontawesome/bookmark.svg");
-        selectedBookmarkIconHighlighted.setColorFilter(new FlatSVGIcon.ColorFilter(color -> Color.ORANGE));
+        selectedBookmarkIconHighlighted.setColorFilter(new FlatSVGIcon.ColorFilter(_ -> Color.ORANGE));
 
         normalBookmarkIcon = SVGIconUtilities.createSVGIcon("icons/fontawesome/bookmark.svg");
     }