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

fixed minor bugs, added import for From-Hell in Erfurt

Browse Source 
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
StephanRichter
2025-01-03 11:41:07 +01:00
parent 0d1215558e
commit 0102ba9f11
5 changed files with 225 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
de.srsoftware.cal.base/src/main/java/de/srsoftware/cal/BaseImporter.java
+2 -2
View File
@@ -278,7 +278,7 @@ public abstract class BaseImporter implements Importer {
var url = Payload.of(programURL());
Stream<Result<String>> urls = url(url)
.map(Util::open) //
.map(Util::preload)
.map(this::preload)
.map(Util::parseXML)
.map(this::extractEventUrls)
.stream();
@@ -305,7 +305,7 @@ public abstract class BaseImporter implements Importer {
.orElse(null);
return urlResult //
.map(Util::open)
.map(Util::preload)
.map(this::preload)
.map(Util::parseXML)
.map(this::extractEventTag)
.map(tagResult -> extractEvent(tagResult, link));
de.srsoftware.cal.base/src/main/java/de/srsoftware/cal/Util.java
+1 -1
View File
@@ -41,7 +41,7 @@ public class Util {
public static final String VCALENDAR = "VCALENDAR";
public static final Pattern GERMAN_DATE_PATTERN = Pattern.compile("^\\D*(\\d\\d?)\\.(\\d\\d?)\\.(\\d{4})\\D");
public static final Pattern GERMAN_DATE_PATTERN_LONG = Pattern.compile("(\\d\\d?)\\.\\s*(\\w+)\\s+(\\d{4})\\D");
public static final Pattern GERMAN_DATE_PATTERN_LONG = Pattern.compile("(\\d\\d?)\\.?\\s*(\\w+)\\s+(\\d{4})\\D");
public static final Pattern GERMAN_TIME_PATTERN = Pattern.compile("(\\d\\d?):(\\d\\d?)(:(\\d\\d?))?\\D");
private static final Pattern BG_IMAGE_URL = Pattern.compile("background(-image)?:\\surl\\('?([^)]+)'?\\)");
private static final System.Logger LOG = System.getLogger(Util.class.getSimpleName());