wip

Author: derreisende77

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

@@ -16,10 +16,8 @@
 import java.util.stream.Stream;
 
 public class ListeFilme extends ArrayList<DatenFilm> {
-    public static final String FILMLISTE = "Filmliste";
     private static final String PCS_METADATA = "metaData";
     protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
-    public boolean neueFilme;
     private FilmListMetaData metaData = new FilmListMetaData();
 
     public FilmListMetaData getMetaData() {
@@ -99,12 +97,6 @@ public synchronized void updateFromFilmList(@NotNull ListeFilme newFilmsList) {
         });
     }
 
-    @Override
-    public synchronized void clear() {
-        super.clear();
-        neueFilme = false;
-    }
-
     /**
      * Find movie with given url and sendername
      * @param url    String wiht URL

src/main/java/mediathek/daten/blacklist/ListeBlacklist.java

@@ -122,8 +122,6 @@ public synchronized void filterListe() {
             }
 
             stream.filter(createPredicate()).forEachOrdered(filteredList::add);
-
-            setupNewEntries();
         }
     }
 
@@ -159,24 +157,12 @@ private Predicate<DatenFilm> createPredicate() {
 
         }
 
-        final Predicate<DatenFilm> pred = filterList.stream().reduce(Predicate::and).orElse(f -> true);
+        final Predicate<DatenFilm> pred = filterList.stream().reduce(Predicate::and).orElse(_ -> true);
         filterList.clear();
 
         return pred;
     }
 
-    /**
-     * Detect if there are new entried in the blacklist filtered film list.
-     */
-    private void setupNewEntries() {
-        //are there new film entries?
-        final Daten daten = Daten.getInstance();
-        daten.getListeFilmeNachBlackList().stream()
-                .filter(DatenFilm::isNew)
-                .findAny()
-                .ifPresent(ignored -> daten.getListeFilmeNachBlackList().neueFilme = true);
-    }
-
     /**
      * Filterfunction for Abos dialog.
      *

src/main/java/mediathek/filmlisten/FilmeLaden.java

@@ -359,15 +359,10 @@ private void fillHash(ListeFilme listeFilme) {
      * Search through history and mark new films.
      */
     private void findAndMarkNewFilms(ListeFilme listeFilme) {
-        listeFilme.neueFilme = false;
-
         listeFilme.parallelStream()
                 .peek(film -> film.setNew(false))
                 .filter(film -> !hashSet.contains(film.getUrlNormalQuality()))
-                .forEach(film -> {
-                    film.setNew(true);
-                    listeFilme.neueFilme = true;
-                });
+                .forEach(film -> film.setNew(true));
 
         hashSet.clear();
     }

src/main/java/mediathek/filmlisten/writer/FilmListWriter.java

@@ -28,13 +28,15 @@
 
 public class FilmListWriter {
 
-    private static final Logger logger = LogManager.getLogger(FilmListWriter.class);
+    private static final String FILMLISTE = "Filmliste";
+    private static final Logger logger = LogManager.getLogger();
     private static final String TAG_JSON_LIST = "X";
     private final boolean readable;
     private String sender = "";
     private String thema = "";
     private boolean compressSenderTag = true;
     private boolean compressThemaTag = true;
+    private boolean decompressUrls;
 
     public FilmListWriter(boolean readable) {
         this.readable = readable;
@@ -63,7 +65,7 @@ private void checkOsxCacheDirectory() {
     private void writeFormatHeader(JsonGenerator jg, ListeFilme listeFilme) throws IOException {
         final var meta = listeFilme.getMetaData();
 
-        jg.writeArrayFieldStart(ListeFilme.FILMLISTE);
+        jg.writeArrayFieldStart(FILMLISTE);
         jg.writeString(""); //ListeFilme.FILMLISTE_DATUM_NR unused in newer versions
         jg.writeString(meta.getDatum());
         jg.writeString(meta.getVersion());
@@ -72,7 +74,7 @@ private void writeFormatHeader(JsonGenerator jg, ListeFilme listeFilme) throws I
         jg.writeEndArray();
     }
 
-    public void writeFilmList(String datei, ListeFilme listeFilme, IProgressListener listener) {
+    public void writeFilmList(String datei, ListeFilme listeFilme, IProgressListener progressListener) {
         MessageBus.getMessageBus().publishAsync(new FilmListWriteStartEvent());
 
         try {
@@ -116,15 +118,15 @@ public void writeFilmList(String datei, ListeFilme listeFilme, IProgressListener
 
                 for (DatenFilm datenFilm : listeFilme) {
                     writeEntry(datenFilm, jg);
-                    if (listener != null) {
-                        listener.progress(curEntry / filmEntries);
+                    if (progressListener != null) {
+                        progressListener.progress(curEntry / filmEntries);
                         curEntry++;
                     }
                 }
                 jg.writeEndObject();
 
-                if (listener != null)
-                    listener.progress(1d);
+                if (progressListener != null)
+                    progressListener.progress(1d);
 
                 long end = System.nanoTime();
 
@@ -210,8 +212,6 @@ public void setDecompressUrls(boolean decompressUrls) {
         this.decompressUrls = decompressUrls;
     }
 
-    private boolean decompressUrls;
-
     private void skipEntry(JsonGenerator jg) throws IOException {
         jg.writeString("");
     }
@@ -273,7 +273,7 @@ private void writeZeit(JsonGenerator jg, DatenFilm datenFilm) throws IOException
      * Is not used anywhere but necessary for compatibility
      */
     private void writeFormatDescription(JsonGenerator jg) throws IOException {
-        jg.writeArrayFieldStart(ListeFilme.FILMLISTE);
+        jg.writeArrayFieldStart(FILMLISTE);
         jg.writeString("");
         jg.writeEndArray();
     }