From 658c148be4541e5a7c836de0bd0ee256fee1ad29 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Sun, 11 Apr 2021 18:04:52 +0000
Subject: [PATCH] URL absielen (unfertig, kompiliert nicht)
---
src/de/uhilger/mediaz/api/ListFileHandler.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 6 deletions(-)
diff --git a/src/de/uhilger/mediaz/api/ListFileHandler.java b/src/de/uhilger/mediaz/api/ListFileHandler.java
index 3b01afe..e31d016 100644
--- a/src/de/uhilger/mediaz/api/ListFileHandler.java
+++ b/src/de/uhilger/mediaz/api/ListFileHandler.java
@@ -17,6 +17,7 @@
*/
package de.uhilger.mediaz.api;
+import com.sun.net.httpserver.Headers;
import com.sun.net.httpserver.HttpExchange;
import de.uhilger.mediaz.App;
import de.uhilger.mediaz.Server;
@@ -27,11 +28,15 @@
import de.uhilger.mediaz.store.StorageFile;
import de.uhilger.mediaz.store.Track;
import java.io.File;
+import java.io.FileFilter;
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.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -44,19 +49,22 @@
/* Der Logger fuer diesen ListFileHandler */
private static final Logger logger = Logger.getLogger(ListFileHandler.class.getName());
+ private static final String[] specialChars = {new String("\u00c4"), new String("\u00d6"),
+ new String("\u00dc"), new String("\u00e4"), new String("\u00f6"), new String("\u00fc"), new String("\u00df")};
+
Map extMap = new HashMap();
public ListFileHandler(String absoluteDirectoryPathAndName) {
super(absoluteDirectoryPathAndName);
/*
- Nachfolgend hart codiert die Ermittlung von Dateifiltern.
+ 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);
+ 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) {
@@ -73,12 +81,22 @@
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();
+ File[] files = dir.listFiles(new FileFilter() {
+ @Override
+ public boolean accept(File pathname) {
+ Set keys = extMap.keySet();
+ String fname = pathname.getName();
+ int pos = fname.lastIndexOf(".");
+ String ext = fname.substring(pos+1);
+ return keys.contains(ext) || pathname.isDirectory();
+ }
+ });
+ Arrays.sort(files);
ArrayList list = new ArrayList();
if(files != null) {
for(File file : files) {
@@ -103,8 +121,12 @@
list.add(sf);
}
}
- String json = jsonWithCustomType(list, "Medialiste");
+ //Collections.sort(list);
+ String json = escapeHtml(jsonWithCustomType(list, "Medialiste"));
+
logger.fine(json);
+ Headers headers = e.getResponseHeaders();
+ headers.add("Content-Type", "application/json; charset=UTF-8");
e.sendResponseHeaders(200, json.length());
OutputStream os = e.getResponseBody();
os.write(json.getBytes());
@@ -114,6 +136,27 @@
}
}
+ public String escapeHtml(String text) {
+ text = text.replace(specialChars[0], "Ae");
+ text = text.replace(specialChars[1], "Oe");
+ text = text.replace(specialChars[2], "Ue");
+ text = text.replace(specialChars[3], "ae");
+ text = text.replace(specialChars[4], "oe");
+ text = text.replace(specialChars[5], "ue");
+ text = text.replace(specialChars[6], "ss");
+
+ /*
+ text = text.replace(specialChars[0], "Ä");
+ text = text.replace(specialChars[1], "Ö");
+ text = text.replace(specialChars[2], "Ü");
+ text = text.replace(specialChars[3], "ä");
+ text = text.replace(specialChars[4], "ö");
+ text = text.replace(specialChars[5], "ü");
+ text = text.replace(specialChars[6], "ß");
+ */
+ return text;
+ }
+
private void getTrack(File file, StorageFile sf) {
if(sf.getTyp().equalsIgnoreCase(StorageFile.TYP_AUDIO)) {
Track track = new Track(file);
--
Gitblit v1.9.3