From b4dc4bc91064e504e5f97cb82bd44e9417f1fa8d Mon Sep 17 00:00:00 2001 From: TudbuT Date: Mon, 4 Jul 2022 02:28:37 +0200 Subject: [PATCH] minor convenience improvements --- .gitignore | 1 + src/de/tudbut/tryumph/config/TryConfig.java | 9 +++++++-- src/de/tudbut/tryumph/server/BrowserContext.java | 6 ++++-- src/de/tudbut/tryumph/server/HTMLParsing.java | 2 ++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e488659..3486ec8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /build/ /javadoc/ /run.sh +/*.jar diff --git a/src/de/tudbut/tryumph/config/TryConfig.java b/src/de/tudbut/tryumph/config/TryConfig.java index 028961e..ec24ae9 100644 --- a/src/de/tudbut/tryumph/config/TryConfig.java +++ b/src/de/tudbut/tryumph/config/TryConfig.java @@ -13,8 +13,9 @@ import de.tudbut.tryumph.err.ProjectException; public class TryConfig { - private TCN configHolder; - private String[] arguments; + private static TCN configHolder; + private static String[] arguments; + public static boolean nocache; public TryConfig(String[] appArguments, InputStream config) throws IOException, ProjectException { String file = ""; @@ -33,6 +34,10 @@ public class TryConfig { throw new ProjectException("Error reading config: Config formatting is invalid", e); } arguments = appArguments; + for(String arg : arguments) { + if(arg.equals("--nocache")) + nocache = true; + } } public Task getCatchers() { diff --git a/src/de/tudbut/tryumph/server/BrowserContext.java b/src/de/tudbut/tryumph/server/BrowserContext.java index 5953f33..6e091bb 100644 --- a/src/de/tudbut/tryumph/server/BrowserContext.java +++ b/src/de/tudbut/tryumph/server/BrowserContext.java @@ -13,6 +13,7 @@ import org.w3c.dom.Node; import de.tudbut.async.Task; import de.tudbut.tryumph.config.IRequestCatcher; +import de.tudbut.tryumph.config.TryConfig; import tudbut.parsing.AsyncJSON; import tudbut.parsing.TCN; @@ -123,7 +124,7 @@ public class BrowserContext { needsChange = true; } - private final HashMap cache = new HashMap<>(); + private static final HashMap cache = new HashMap<>(); public String file(String file) { if(cache.containsKey(file)) return cache.get(file); @@ -137,7 +138,8 @@ public class BrowserContext { } stream.close(); - cache.put(file, builder.toString()); + if(!TryConfig.nocache) + cache.put(file, builder.toString()); } catch (IOException e) { builder.append("\n

---CUT---


\n"); builder.append("Error reading rest of file! Sorry."); diff --git a/src/de/tudbut/tryumph/server/HTMLParsing.java b/src/de/tudbut/tryumph/server/HTMLParsing.java index dc823a3..41104e1 100644 --- a/src/de/tudbut/tryumph/server/HTMLParsing.java +++ b/src/de/tudbut/tryumph/server/HTMLParsing.java @@ -32,6 +32,8 @@ public class HTMLParsing { // do nothing. we dont want output! } })); + tidy.setDropEmptyParas(false); + tidy.setTrimEmptyElements(false); }