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

refactored Rosenkeller importer

Browse Source 
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
StephanRichter
2025-01-01 18:21:12 +01:00
parent 3c7313fc01
commit af4a06afc0
6 changed files with 117 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
de.srsoftware.cal.base/build.gradle.kts
+1 -1
View File
@@ -5,6 +5,6 @@ dependencies {
implementation("de.srsoftware:tools.optionals:1.0.0")
implementation("de.srsoftware:tools.util:1.3.0")
implementation("de.srsoftware:tools.web:1.3.10")
implementation("de.srsoftware:tools.web:1.3.11")
implementation("org.json:json:20240303")
}
de.srsoftware.cal.base/src/main/java/de/srsoftware/cal/BaseImporter.java
+5 -5
View File
@@ -77,7 +77,7 @@ public abstract class BaseImporter implements Importer {
protected Result<Tag> extractDescriptionTag(Tag eventTag){
var list = eventTag.find(extractDescriptionFilter());
if (list.isEmpty()) return error("Failed to find attachments tag");
if (list.isEmpty()) return error("Failed to find description tag");
return Payload.of(list.getFirst());
}
@@ -97,7 +97,7 @@ public abstract class BaseImporter implements Importer {
return parseEndDate(opt.get().strip());
}
private Result<Tag> extractEndDateTag(Tag eventTag) {
protected Result<Tag> extractEndDateTag(Tag eventTag) {
var list = eventTag.find(extractEndDateFilter());
if (list.isEmpty()) return error("Failed to find end date tag");
return Payload.of(list.getFirst());
@@ -112,7 +112,7 @@ public abstract class BaseImporter implements Importer {
return parseEndTime(opt.get().strip());
}
private Result<Tag> extractEndTimeTag(Tag eventTag) {
protected Result<Tag> extractEndTimeTag(Tag eventTag) {
var list = eventTag.find(extractEndTimeFilter());
if (list.isEmpty()) return error("Failed to find end time tag");
return Payload.of(list.getFirst());
@@ -232,7 +232,7 @@ public abstract class BaseImporter implements Importer {
return parseStartDate(opt.get().strip());
}
private Result<Tag> extractStartDateTag(Tag eventTag) {
protected Result<Tag> extractStartDateTag(Tag eventTag) {
var list = eventTag.find(extractStartDateFilter());
if (list.isEmpty()) return error("Failed to find start date tag");
return Payload.of(list.getFirst());
@@ -247,7 +247,7 @@ public abstract class BaseImporter implements Importer {
return parseStartTime(opt.get().strip());
}
private Result<Tag> extractStartTimeTag(Tag eventTag) {
protected Result<Tag> extractStartTimeTag(Tag eventTag) {
var list = eventTag.find(extractStartTimeFilter());
if (list.isEmpty()) return error("Failed to find start time tag");
return Payload.of(list.getFirst());
de.srsoftware.cal.base/src/main/java/de/srsoftware/cal/Util.java
+1 -1
View File
@@ -111,7 +111,7 @@ public class Util {
var second = sec == null ? 0 : Integer.parseInt(sec);
return Payload.of(LocalTime.of(hour,minute,second));
}
return error("Failed to find date");
return error("Failed to find time");
}
/**