SRSoftware/OpenCloudCal
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

made jarWatchdog configurable

Browse Source 
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
Stephan Richter
2025-01-03 22:05:07 +01:00
parent f111d77b9b
commit bf977ec886
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
de.srsoftware.cal.app/src/main/java/de/srsoftware/cal/app/Application.java
View File

@@ -20,6 +20,7 @@ import java.net.InetSocketAddress;
import java.sql.SQLException; import java.sql.SQLException;
import java.time.Duration; import java.time.Duration;
import java.util.Optional; import java.util.Optional;
import org.json.JSONArray;
import org.json.JSONObject; import org.json.JSONObject;
/** /**
@@ -67,15 +68,18 @@ public class Application {
server.start(); server.start();
LOG.log(INFO,"Started webserver on port {0,number,#} …",port); LOG.log(INFO,"Started webserver on port {0,number,#} …",port);
var jarDir = new File("/home/srichter/workspace/de.srsoftware.cal/de.srsoftware.cal.importer/build/libs");
var autoImport = new AutoImporter(db); var autoImport = new AutoImporter(db);
new JarWatchdog() var watchDog = new JarWatchdog()
.setContext(BaseImporter.class.getClassLoader()) .setContext(BaseImporter.class.getClassLoader())
.addDirectory(jarDir)
.frequency(Duration.ofSeconds(30)) .frequency(Duration.ofSeconds(30))
.addListener(autoImport) .addListener(autoImport)
.afterScan(autoImport) .afterScan(autoImport);
.start();
var importers = jsonConfig.get("opencloudcal.importers").orElse(null);
if (importers instanceof JSONArray arr) arr.toList().stream()
.map(Object::toString).map(File::new).forEach(watchDog::addDirectory);
watchDog.start();
} }
private static void configureLogging(JsonConfig jsonConfig) { private static void configureLogging(JsonConfig jsonConfig) {

2
de.srsoftware.cal.importer/src/main/java/de/srsoftware/cal/importer/gera/AtParty.java
View File

@@ -170,7 +170,7 @@ public class AtParty extends BaseImporter {
if (lower.contains("seven")) tags.add("SevenClub"); if (lower.contains("seven")) tags.add("SevenClub");
if (lower.contains("music hall")) tags.add("MusicHall"); if (lower.contains("music hall")) tags.add("MusicHall");
if (lower.contains("partyhaus")||lower.contains("qui")) tags.add("Qui"); if (lower.contains("partyhaus")||lower.contains("qui")) tags.add("Qui");
if (lower.contains("hofwiesenpark")) tags.add("Hofwiesenpark") if (lower.contains("hofwiesenpark")) tags.add("Hofwiesenpark");
return tags; return tags;
} }