From 938b6be92e6b3fd75cdbcf1fc6c051973779b988 Mon Sep 17 00:00:00 2001 From: ulrich Date: Wed, 21 Apr 2021 11:23:44 +0000 Subject: [PATCH] Kleine Anpassungen an Bedienelementen --- src/de/uhilger/mediaz/api/ListFileHandler.java | 30 +++++++++++++++++++++++++++--- 1 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/de/uhilger/mediaz/api/ListFileHandler.java b/src/de/uhilger/mediaz/api/ListFileHandler.java index 0b780aa..c54c9c7 100644 --- a/src/de/uhilger/mediaz/api/ListFileHandler.java +++ b/src/de/uhilger/mediaz/api/ListFileHandler.java @@ -33,7 +33,6 @@ 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; @@ -48,6 +47,9 @@ /* 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(); @@ -119,10 +121,11 @@ } } //Collections.sort(list); - String json = jsonWithCustomType(list, "Medialiste"); + String json = escapeHtml(jsonWithCustomType(list, "Medialiste")); + logger.fine(json); Headers headers = e.getResponseHeaders(); - headers.add("Content-Type", "application/json"); + headers.add("Content-Type", "application/json; charset=UTF-8"); e.sendResponseHeaders(200, json.length()); OutputStream os = e.getResponseBody(); os.write(json.getBytes()); @@ -132,6 +135,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