From f61a32dab54add0f23e10a98ffe18d06f882c063 Mon Sep 17 00:00:00 2001 From: ulrich Date: Wed, 07 Apr 2021 22:08:38 +0000 Subject: [PATCH] Nachbesserungen --- src/de/uhilger/mediaz/store/FileStorage.java | 114 ++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 84 insertions(+), 30 deletions(-) diff --git a/src/de/uhilger/mediaz/store/FileStorage.java b/src/de/uhilger/mediaz/store/FileStorage.java index 3819699..217420c 100644 --- a/src/de/uhilger/mediaz/store/FileStorage.java +++ b/src/de/uhilger/mediaz/store/FileStorage.java @@ -1,7 +1,19 @@ /* - * 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.store; @@ -10,6 +22,8 @@ import de.uhilger.mediaz.App; import de.uhilger.mediaz.Server; import de.uhilger.mediaz.entity.Ablageort; +import de.uhilger.mediaz.entity.Abspieler; +import de.uhilger.mediaz.entity.Einstellung; import java.io.BufferedReader; import java.io.File; import java.io.FileNotFoundException; @@ -25,7 +39,7 @@ import java.util.logging.Level; /** - * Ablage fuer Dateien + * Ablage fuer Dateien der Mediazentrale * * [Basispfad]/[Typ]/[Name] * @@ -41,18 +55,24 @@ /** StorageType Ablageort */ public static final String ST_ABLAGEORT = "Ablageort"; + public static final String ST_EINSTELLUNG = "Einstellung"; + public static final String ST_ABSPIELER = "Abspieler"; - private String fileBase; + private final String fileBase; - private Map<String, TypeToken> types; + private final Map<String, TypeToken> types; public FileStorage(String base) { this.fileBase = base; // Beispiel: TypeToken<List<String>> list = new TypeToken<List<String>>() {}; TypeToken<Ablageort> ttAblageort = new TypeToken<Ablageort>() {}; + TypeToken<Einstellung> ttEinstellung = new TypeToken<Einstellung>() {}; + TypeToken<Abspieler> ttAbspieler = new TypeToken<Abspieler>() {}; types = new HashMap(); types.put(Ablageort.class.getSimpleName(), ttAblageort); + types.put(Einstellung.class.getSimpleName(), ttEinstellung); + types.put(Abspieler.class.getSimpleName(), ttAbspieler); } /** @@ -60,29 +80,34 @@ * * Es wird in den Ordner geschrieben, der von conf angegeben ist * - * Wenn es z.B. ein Ablage-Objekt ist, wird das Objekt in die Datei - * [conf]/Ablage/[name der Ablage].json geschrieben - * - * Der Name der Ablage muss eindeutig sein + * Wenn es z.B.ein Ablage-Objekt ist, wird das Objekt in die Datei + [conf]/Ablage/[name der Ablage].json geschrieben + + Der Name der Ablage muss eindeutig sein * * - * @param o + * @param entity das Objekt, das geschrieben werden soll + * @param overwrite true, wenn Aenderung, false fuer neue Elemente + * @return die Datei oder null, wenn die Datei existiert und ein + * neues Element (overwrite=false) uebergeben wurde + * @throws java.io.IOException */ - public File writeToFile(Entity o) throws IOException { - String className = o.getClass().getSimpleName(); + public File writeToFile(Entity entity, boolean overwrite) throws IOException { + String className = entity.getClass().getSimpleName(); logger.finer(className); File dir = new File(fileBase, className); dir.mkdirs(); - File file = new File(dir, o.getName()); - if(file.exists()) { - file.delete(); + File file = new File(dir, entity.getName()); + if(file.exists() && !overwrite) { + return null; + } else { + FileWriter fw = new FileWriter(file); + Gson gson = new Gson(); + fw.write(gson.toJson(entity)); + fw.flush(); + fw.close(); + return file; } - FileWriter fw = new FileWriter(file); - Gson gson = new Gson(); - fw.write(gson.toJson(o)); - fw.flush(); - fw.close(); - return file; } public String readFromFile(File file) throws IOException { @@ -105,14 +130,13 @@ private String typeNameFromPath(File file) { String[] parts = file.getPath().split(App.getRs(Server.RB_SLASH)); - logger.info(parts[parts.length-2]); return parts[parts.length-2]; } @Override - public Object write(Entity e) { + public Object write(Entity e, boolean overwrite) { try { - return writeToFile(e); + return writeToFile(e, overwrite); } catch (IOException ex) { logger.log(Level.SEVERE, null, ex); return null; @@ -133,14 +157,18 @@ public List<String> list(String typ) { File base = new File(fileBase); File dir = new File(base, typ); - File[] files = dir.listFiles(); List<String> list = new ArrayList(); - for(File file : files) { - list.add(file.getName()); + File[] files = dir.listFiles(); + if(files != null) { + for(File file : files) { + //NamedItem n = new NamedItem(); + //n.setLabel(file.getName()); + list.add(file.getName()); + } } return list; } - + @Override public TypeToken typeFromName(String name) { return types.get(name); @@ -162,6 +190,32 @@ return new File(dir, name); } - + @Override + public boolean delete(String typ, String name) { + File file = getFile(typ, name); + if(file.exists()) { + return file.delete(); + } else { + return false; + } + } + + @Override + public List<Entity> listObjects(String typ) { + File base = new File(fileBase); + File dir = new File(base, typ); + List<Entity> list = new ArrayList(); + File[] files = dir.listFiles(); + if(files != null) { + for(File file : files) { + try { + list.add(entityFromFile(file)); + } catch (ClassNotFoundException | IOException ex) { + logger.log(Level.SEVERE, null, ex); + } + } + } + return list; + } } -- Gitblit v1.9.3