Browse Source

made jarWatchdog configurable

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
main
Stephan Richter 4 months ago
parent
commit
bf977ec886
  1. 14
      de.srsoftware.cal.app/src/main/java/de/srsoftware/cal/app/Application.java
  2. 2
      de.srsoftware.cal.importer/src/main/java/de/srsoftware/cal/importer/gera/AtParty.java

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

@ -20,6 +20,7 @@ import java.net.InetSocketAddress; @@ -20,6 +20,7 @@ import java.net.InetSocketAddress;
import java.sql.SQLException;
import java.time.Duration;
import java.util.Optional;
import org.json.JSONArray;
import org.json.JSONObject;
/**
@ -67,15 +68,18 @@ public class Application { @@ -67,15 +68,18 @@ public class Application {
server.start();
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);
new JarWatchdog()
var watchDog = new JarWatchdog()
.setContext(BaseImporter.class.getClassLoader())
.addDirectory(jarDir)
.frequency(Duration.ofSeconds(30))
.addListener(autoImport)
.afterScan(autoImport)
.start();
.afterScan(autoImport);
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) {

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

@ -170,7 +170,7 @@ public class AtParty extends BaseImporter { @@ -170,7 +170,7 @@ public class AtParty extends BaseImporter {
if (lower.contains("seven")) tags.add("SevenClub");
if (lower.contains("music hall")) tags.add("MusicHall");
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;
}

Loading…
Cancel
Save