From ab8b2496218f49f49d2602987481e2dd7a3e7293 Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed@undiclosed>
Date: Sat, 10 Apr 2021 17:59:27 +0000
Subject: [PATCH] UI-Anpassungen

---
 src/de/uhilger/mediaz/api/ListFileHandler.java |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/src/de/uhilger/mediaz/api/ListFileHandler.java b/src/de/uhilger/mediaz/api/ListFileHandler.java
index cda66b7..e6452eb 100644
--- a/src/de/uhilger/mediaz/api/ListFileHandler.java
+++ b/src/de/uhilger/mediaz/api/ListFileHandler.java
@@ -20,11 +20,21 @@
 import com.sun.net.httpserver.HttpExchange;
 import de.uhilger.mediaz.App;
 import de.uhilger.mediaz.Server;
+import de.uhilger.mediaz.entity.Einstellung;
+import de.uhilger.mediaz.entity.Entity;
+import de.uhilger.mediaz.store.FileStorage;
+import de.uhilger.mediaz.store.Storage;
 import de.uhilger.mediaz.store.StorageFile;
+import de.uhilger.mediaz.store.Track;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
@@ -36,33 +46,59 @@
   /* Der Logger fuer diesen ListFileHandler */
   private static final Logger logger = Logger.getLogger(ListFileHandler.class.getName());
   
+  Map extMap = new HashMap();
+  
   public ListFileHandler(String absoluteDirectoryPathAndName) {
     super(absoluteDirectoryPathAndName);
+    /*
+      Ermittlung von Dateifiltern. 
+      Sie werden erwartet in den Einstellungen 'audioexts' und 'videoexts'
+      jeweils als Dateierweiterungen mit Komma getrennt
+      z.B. "mp4,m4v"
+    */
+    FileStorage fs = new FileStorage(App.getInitParameter(App.getRs(App.RB_AP_CONF)));
+    initMap(fs, App.getRs(App.RB_AUDIOEXTS), StorageFile.TYP_AUDIO);
+    initMap(fs, App.getRs(App.RB_VIDEOEXTS), StorageFile.TYP_VIDEO);
   }
 
+  private void initMap(Storage s, String key, String typ) {
+    Entity e = s.read(Einstellung.class.getSimpleName(), key);
+    if(e instanceof Einstellung) {
+      String[] exts = ((Einstellung) e).getValue().split(",");
+      for(String ext : exts) {
+        extMap.put(ext, typ);
+      }
+    }
+  }
+  
   @Override
   public void handle(HttpExchange e) throws IOException {
     String path = e.getRequestURI().toString();
     logger.fine(path);
-    if(path.endsWith(App.getRs(Server.RB_SLASH))) {
+    if(path.endsWith(Server.SLASH)) {
       String fName = getFileName(e);
       logger.fine(fName);
       File dir = new File(fileBase, fName);
       logger.fine(dir.getAbsolutePath());
       File[] files = dir.listFiles();
+      Arrays.sort(files);      
       ArrayList list = new ArrayList();
       if(files != null) {
         for(File file : files) {
           StorageFile sf = new StorageFile();
           String fname = file.getName();
           sf.setName(fname);
+          sf.setTitelAnzName(fname);
           if(file.isDirectory()) {
             sf.setTyp(StorageFile.TYP_FOLDER);
           } else {
-            if(fname.endsWith(".mp3")) {
-              sf.setTyp(StorageFile.TYP_AUDIO);              
-            } else if(fname.endsWith(".mp4") || fname.endsWith(".m4v")) {
-              sf.setTyp(StorageFile.TYP_VIDEO);                            
+            int pos = fname.lastIndexOf(".");
+            String ext = fname.substring(pos+1);
+            logger.log(Level.FINE, "ext: {0}", ext);
+            Object o = extMap.get(ext);
+            if(o instanceof String) {
+              sf.setTyp(o.toString());
+              getTrack(file, sf);
             } else {
               sf.setTyp(StorageFile.TYP_FILE);
             }
@@ -70,6 +106,7 @@
           list.add(sf);
         }
       }
+      //Collections.sort(list);
       String json = jsonWithCustomType(list, "Medialiste");
       logger.fine(json);
       e.sendResponseHeaders(200, json.length());
@@ -81,5 +118,16 @@
     }
   }
   
+  private void getTrack(File file, StorageFile sf) {
+    if(sf.getTyp().equalsIgnoreCase(StorageFile.TYP_AUDIO)) {
+      Track track = new Track(file);
+      sf.setInterpret(track.getArtist());
+      String trackTitel = track.getTitle();
+      if(trackTitel != null && trackTitel.length() > 0) {
+        sf.setTitelAnzName(trackTitel);
+      }
+      sf.setAlbum(track.getAlbum());
+    }
+  }
   
 }

--
Gitblit v1.9.3