QA file handler

Author: Katsute

src/ktt/lib/httpserver/SimpleHttpExchangeImpl.java

@@ -138,7 +138,6 @@ static SimpleHttpExchange createSimpleHttpExchange(final HttpExchange exchange){
 
                 hasPost = (rawPost = OUT) != null;
 
-                // region todo: optimize this
                 if(hasPost){
                     final String content_type = requestHeaders.getFirst("Content-type");
                     if(content_type != null && content_type.startsWith("multipart/form-data")){
@@ -189,7 +188,6 @@ static SimpleHttpExchange createSimpleHttpExchange(final HttpExchange exchange){
                 }else{
                     postMap = new HashMap();
                 }
-                // endregion
 
                 final String rawCookie = requestHeaders.getFirst("Cookie");
                 cookies = new HashMap<>();

src/ktt/lib/httpserver/handler/DirectoryEntry.java

@@ -52,12 +52,12 @@ class DirectoryEntry {
         if(isFilesPreloaded){
             if(!isWalkthrough){
                 final File[] listFiles = directory.listFiles();
-                for(final File file : (listFiles == null) ? new File[0] : listFiles){
-                    files.put(
-                        getContext(adapter.getName(file)),
-                        new FileEntry(file, true, adapter)
-                    );
-                }
+                for(final File file : (listFiles == null) ? new File[0] : listFiles)
+                    if(!file.isDirectory())
+                        files.put(
+                            getContext(adapter.getName(file)),
+                            new FileEntry(file, true, adapter)
+                        );
             }else{
                 final Path dirPath = directory.toPath();
 
@@ -68,8 +68,8 @@ class DirectoryEntry {
                     final File[] listFiles = pathFile.listFiles();
                     for(final File file : (listFiles == null) ? new File[0] : listFiles){
                         try{
-                            DirectoryEntry.this.files.put(
-                                getContext(rel + "/" + adapter.getName(file)),
+                            files.put(
+                                (rel.isEmpty() || rel.equals("/") || rel.equals("\\") ? "" : getContext(rel)) + getContext(adapter.getName(file)),
                                 new FileEntry(file, true, adapter)
                             );
                         }catch(final FileNotFoundException ignored){
@@ -178,7 +178,7 @@ public final File getFile(final String path){
     }
 
     /**
-     * Returns the file's bytes after the {@link FileHandlerAdapter} was used or null if it was not found or failed to read.
+     * Returns the file's bytes after the {@link FileHandlerAdapter} was used or null if it was not found or failed to read. <b>Preload only.</b>
      *
      * @param path context to check
      * @return processed file bytes
@@ -226,11 +226,11 @@ private static String getContext(final String path){
     public String toString(){
         final StringBuilder OUT = new StringBuilder();
         OUT.append("DirectoryEntry")    .append("{");
-        OUT.append("isWalkthrough")     .append("= ")   .append(isWalkthrough)          .append(", ");
-        OUT.append("isFilePreloaded")   .append("= ")   .append(isFilesPreloaded)       .append(", ");
-        OUT.append("directory")         .append("= ")   .append(directory.toString())   .append(", ");
-        OUT.append("(preloaded) files") .append("= ")   .append(files.toString())       .append(", ");
-        OUT.append("adapter")           .append("= ")   .append(adapter.toString());
+        OUT.append("isWalkthrough")     .append("= ")   .append(isWalkthrough)      .append(", ");
+        OUT.append("isFilePreloaded")   .append("= ")   .append(isFilesPreloaded)   .append(", ");
+        OUT.append("directory")         .append("= ")   .append(directory)          .append(", ");
+        OUT.append("(preloaded) files") .append("= ")   .append(files)              .append(", ");
+        OUT.append("adapter")           .append("= ")   .append(adapter);
         OUT.append("}");
         return OUT.toString();
     }

src/ktt/lib/httpserver/handler/FileEntry.java

@@ -85,11 +85,11 @@ public final File getFile(){
      */
     public final byte[] getBytes(){
         if(isPreloaded)
-            return preloadedBytes;
+            return preloadedBytes; // adapter determined preloaded bytes
         else
             try{
-                return Files.readAllBytes(file.toPath());
-            }catch(final IOException ignored){
+                return Files.readAllBytes(file.toPath()); // return literal bytes (no preload); adapt bytes in next part
+            }catch(final IOException e){
                 return null;
             }
     }

src/ktt/lib/httpserver/handler/FileHandler.java

@@ -5,6 +5,7 @@
 import ktt.lib.httpserver.SimpleHttpHandler;
 
 import java.io.*;
+import java.nio.file.Files;
 import java.util.*;
 
 /**
@@ -14,7 +15,7 @@
  * The <code>directoryName</code> parameter determines the directory's name. Add the files at the top level by keeping this field empty. <br>
  * The <code>preload</code> parameter determines if the handler should read the bytes when they are added or read the file at the exchange. <br>
  * The <code>walk</code> parameter determines if all the inner directories should be used.
- * The handler will not add any null files.
+ * The handler will not add any null files and will always use the latest file added for a particular context.
  *
  * @see FileHandlerAdapter
  * @see SimpleHttpHandler
@@ -235,7 +236,10 @@ public final void addFile(final String context, final File file, final String fi
      */
     public final void addFile(final String context, final File file, final String fileName, final boolean preload){
         try{
-            files.put(getContext(context) + getContext(fileName),new FileEntry(file,preload,adapter));
+            files.put(
+                (context.isEmpty() || context.equals("/") || context.equals("\\") ? "" : getContext(context)) + getContext(fileName),
+                new FileEntry(file,preload,adapter)
+            );
         }catch(final FileNotFoundException ignored){ }
     }
 
@@ -625,8 +629,12 @@ public final void addDirectory(final String context, final File directory, final
      */
     public final void addDirectory(final String context, final File directory, final String directoryName, final boolean preload, final boolean walk){
         try{
-            directories.put(getContext(context) + (directoryName.isEmpty() ? "" : getContext(directoryName)), new DirectoryEntry(directory, preload, adapter, walk));
-        }catch(final IOException ignored){ }
+            final String target = (context.isEmpty() || context.equals("/") || context.equals("\\") ? "" : getContext(context)) + (directoryName.isEmpty() ? "" : getContext(directoryName));
+            directories.put(
+                target.isEmpty() ? "/" : target,
+                new DirectoryEntry(directory, preload, adapter, walk)
+            );
+        }catch(final Exception ignored){ }
     }
 
 //
@@ -640,10 +648,10 @@ public final void handle(final SimpleHttpExchange exchange) throws IOException{
             if(rel.startsWith(key) && key.startsWith(match))
                 match = key;
 
-        if(!match.isEmpty() && files.containsKey(match)){
-            final FileEntry entry = files.get(match);
-            handle(exchange,entry.getFile(),entry.getBytes());
-        }else{
+        if(!match.isEmpty() && files.containsKey(match)){ // exact match
+            final FileEntry entry = files.get(match); // preloaded ? use preloaded bytes : adapt bytes now
+            handle(exchange,entry.getFile(),entry.isPreloaded() ? entry.getBytes() : adapter.getBytes(entry.getFile(),entry.getBytes()));
+        }else{ // beginning match
             match = "";
             for(final String key : directories.keySet())
                 if(rel.startsWith(key) && key.startsWith(match))
@@ -653,15 +661,20 @@ public final void handle(final SimpleHttpExchange exchange) throws IOException{
                 final DirectoryEntry entry = directories.get(match);
                 final String rel2;
                 try{
-                    rel2 = rel.substring(match.length()+1);
-
-                    final File file;
-                    if((file = entry.getFile(rel2)) != null){
-                        handle(exchange, file, entry.getBytes(rel2)); return;
+                    rel2 = rel.substring(match.length());
+
+                    if(entry.isFilesPreloaded()){
+                        final File file;
+                        if((file = entry.getFile(rel2)) != null){
+                            handle(exchange, file, entry.getBytes(rel2)); // use adapted preload
+                        }
+                    }else{
+                        final File file = new File(entry.getDirectory().getAbsolutePath() + "\\" + rel2);
+                        handle(exchange,file,adapter.getBytes(file, Files.readAllBytes(file.toPath()))); // use adapted now
                     }
                 }catch(final IndexOutOfBoundsException ignored){ }
             }
-            handle(exchange,null,null);
+            handle(exchange,null,null); // not found
         }
     }