- add wochentag to lucene index

Author: derreisende77

src/main/java/mediathek/gui/tasks/LuceneIndexKeys.java

@@ -50,6 +50,10 @@ public class LuceneIndexKeys {
      * Nicht existente Werte sind "19000101".
      */
     public static final String SENDE_DATUM = "sendedatum";
+    /**
+     * Wochentag (Montag, Dienstag,...) des Sendedatums. String.
+     */
+    public static final String SENDE_WOCHENTAG = "wochentag";
     /**
      * Boolean Key ist nur vorhanden, wenn Bedingung erfüllt. Dann "true".
      */

src/main/java/mediathek/gui/tasks/LuceneIndexWorker.java

@@ -28,6 +28,7 @@
 import mediathek.tool.LuceneDefaultAnalyzer;
 import mediathek.tool.SwingErrorDialog;
 import mediathek.tool.datum.DateUtil;
+import mediathek.tool.datum.DatumFilm;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.lucene.document.*;
@@ -39,11 +40,15 @@
 import javax.swing.*;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Locale;
 
 public class LuceneIndexWorker extends SwingWorker<Void, Void> {
     private static final Logger logger = LogManager.getLogger();
     private final JProgressBar progressBar;
     private final JLabel progLabel;
+    private final DateFormat weekdayFormatter = new SimpleDateFormat("EEEE", Locale.GERMAN);
     private int oldProgress;
 
     public LuceneIndexWorker(@NotNull JLabel progLabel, @NotNull JProgressBar progressBar) {
@@ -82,10 +87,19 @@ private void indexFilm(@NotNull IndexWriter writer, @NotNull DatenFilm film) thr
         doc.add(new StringField(LuceneIndexKeys.DUPLICATE, Boolean.toString(film.isDuplicate()), Field.Store.NO));
 
         addSendeDatum(doc, film);
+        addWochentag(doc, film);
 
         writer.addDocument(doc);
     }
 
+    private void addWochentag(@NotNull Document doc, @NotNull DatenFilm film) {
+        var date = film.getDatumFilm();
+        if (date != DatumFilm.UNDEFINED_FILM_DATE) {
+            String strDate = weekdayFormatter.format(date);
+            doc.add(new TextField(LuceneIndexKeys.SENDE_WOCHENTAG, strDate, Field.Store.NO));
+        }
+    }
+
     private void addSendeDatum(@NotNull Document doc, @NotNull DatenFilm film) {
         String sendeDatumStr = DateTools.timeToString(DateUtil.convertFilmDateToLuceneDate(film),
                 DateTools.Resolution.DAY);
@@ -135,14 +149,16 @@ protected Void doInBackground() {
             }
             reader = DirectoryReader.open(filmListe.getLuceneDirectory());
             filmListe.setReader(reader);
-        } catch (Exception ex) {
+        }
+        catch (Exception ex) {
             logger.error("Lucene film index most probably damaged, deleting it.");
             try {
                 var indexPath = StandardLocations.getFilmIndexPath();
                 if (Files.exists(indexPath)) {
                     FileUtils.deletePathRecursively(indexPath);
                 }
-            } catch (IOException e) {
+            }
+            catch (IOException e) {
                 logger.error("Unable to delete lucene index path", e);
             }
             SwingUtilities.invokeLater(() -> {