From ca9872be43938cf03f23ca9ac05a2acd69429cf3 Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed@undiclosed>
Date: Tue, 06 Apr 2021 14:49:30 +0000
Subject: [PATCH] Katalog (in Arbeit)

---
 src/de/uhilger/mediaz/store/FileStorage.java |   38 ++++++++++++++++++++++----------------
 1 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/de/uhilger/mediaz/store/FileStorage.java b/src/de/uhilger/mediaz/store/FileStorage.java
index 90a99a1..524e4d2 100644
--- a/src/de/uhilger/mediaz/store/FileStorage.java
+++ b/src/de/uhilger/mediaz/store/FileStorage.java
@@ -80,21 +80,25 @@
    * 
    * @param entity 
    */
-  public File writeToFile(Entity entity) throws IOException {
+  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, entity.getName());
-    if(file.exists()) {
-      file.delete();
+    //if(file.exists()) {
+    //  file.delete();
+    //}
+    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(entity));
-    fw.flush();
-    fw.close();
-    return file;
   }
   
   public String readFromFile(File file) throws IOException {
@@ -121,9 +125,9 @@
   }
 
   @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;
@@ -144,10 +148,14 @@
   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;
   }
@@ -182,7 +190,5 @@
       return false;
     }
   }
-
-  
   
 }

--
Gitblit v1.9.3