TudbuT/Tryumph
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor convenience improvements

Browse source
This commit is contained in:
Daniella / Tove 2022-07-04 02:28:37 +02:00
parent c183565d4b
commit b4dc4bc910
4 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -2,3 +2,4 @@
/build/ /build/
/javadoc/ /javadoc/
/run.sh /run.sh
/*.jar

9
src/de/tudbut/tryumph/config/TryConfig.java
View file

@ -13,8 +13,9 @@ import de.tudbut.tryumph.err.ProjectException;
public class TryConfig { public class TryConfig {
private TCN configHolder; private static TCN configHolder;
private String[] arguments; private static String[] arguments;
public static boolean nocache;
public TryConfig(String[] appArguments, InputStream config) throws IOException, ProjectException { public TryConfig(String[] appArguments, InputStream config) throws IOException, ProjectException {
String file = ""; String file = "";
@ -33,6 +34,10 @@ public class TryConfig {
throw new ProjectException("Error reading config: Config formatting is invalid", e); throw new ProjectException("Error reading config: Config formatting is invalid", e);
} }
arguments = appArguments; arguments = appArguments;
for(String arg : arguments) {
if(arg.equals("--nocache"))
nocache = true;
}
} }
public Task<RequestCatcherConfig[]> getCatchers() { public Task<RequestCatcherConfig[]> getCatchers() {

6
src/de/tudbut/tryumph/server/BrowserContext.java
View file

@ -13,6 +13,7 @@ import org.w3c.dom.Node;
import de.tudbut.async.Task; import de.tudbut.async.Task;
import de.tudbut.tryumph.config.IRequestCatcher; import de.tudbut.tryumph.config.IRequestCatcher;
import de.tudbut.tryumph.config.TryConfig;
import tudbut.parsing.AsyncJSON; import tudbut.parsing.AsyncJSON;
import tudbut.parsing.TCN; import tudbut.parsing.TCN;
@ -123,7 +124,7 @@ public class BrowserContext {
needsChange = true; needsChange = true;
} }
private final HashMap<String, String> cache = new HashMap<>(); private static final HashMap<String, String> cache = new HashMap<>();
public String file(String file) { public String file(String file) {
if(cache.containsKey(file)) if(cache.containsKey(file))
return cache.get(file); return cache.get(file);
@ -137,7 +138,8 @@ public class BrowserContext {
} }
stream.close(); stream.close();
cache.put(file, builder.toString()); if(!TryConfig.nocache)
cache.put(file, builder.toString());
} catch (IOException e) { } catch (IOException e) {
builder.append("\n<br/><h1>---CUT---</h1><br/>\n"); builder.append("\n<br/><h1>---CUT---</h1><br/>\n");
builder.append("Error reading rest of file! Sorry."); builder.append("Error reading rest of file! Sorry.");

2
src/de/tudbut/tryumph/server/HTMLParsing.java
View file

@ -32,6 +32,8 @@ public class HTMLParsing {
// do nothing. we dont want output! // do nothing. we dont want output!
} }
})); }));
tidy.setDropEmptyParas(false);
tidy.setTrimEmptyElements(false);
} }