From e44ed0d9811b0c53b3288c54d15e2f68b8d650ed Mon Sep 17 00:00:00 2001
From: ulrich
Date: Fri, 09 Apr 2021 14:09:45 +0000
Subject: [PATCH] Entitaetslisten vereinheitlicht

---
 src/de/uhilger/mediaz/api/ListFileHandler.java |   68 +++++++++++++++++++++++++++++----
 1 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/src/de/uhilger/mediaz/api/ListFileHandler.java b/src/de/uhilger/mediaz/api/ListFileHandler.java
index ac53618..cb9e9b4 100644
--- a/src/de/uhilger/mediaz/api/ListFileHandler.java
+++ b/src/de/uhilger/mediaz/api/ListFileHandler.java
@@ -1,18 +1,38 @@
 /*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+  Mediazentrale - Personal Media Center
+  Copyright (C) 2021  Ulrich Hilger
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as
+  published by the Free Software Foundation, either version 3 of the
+  License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License
+  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package de.uhilger.mediaz.api;
 
 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.HashMap;
+import java.util.Map;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
@@ -24,10 +44,31 @@
   /* 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);
+    /*
+      Nachfolgend hart codiert die 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, "audioexts", StorageFile.TYP_AUDIO);
+    initMap(fs, "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();
@@ -47,10 +88,13 @@
           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);
             }
@@ -58,8 +102,6 @@
           list.add(sf);
         }
       }
-      //Gson gson = new Gson();
-      //String json = gson.toJson(fileNames);
       String json = jsonWithCustomType(list, "Medialiste");
       logger.fine(json);
       e.sendResponseHeaders(200, json.length());
@@ -71,5 +113,13 @@
     }
   }
   
+  private void getTrack(File file, StorageFile sf) {
+    if(sf.getTyp().equalsIgnoreCase(StorageFile.TYP_AUDIO)) {
+      Track track = new Track(file);
+      sf.setInterpret(track.getArtist());
+      sf.setTitelAnzName(track.getTitle());
+      sf.setAlbum(track.getAlbum());
+    }
+  }
   
 }

--
Gitblit v1.9.3