fix bug: use default value if blank value was set in configue file

Author: leafee98

README.md

@@ -32,8 +32,8 @@
 
 ## 待办
 
-[ ] 修正转义不完善的问题(针对`\$`等转义字符)
-[ ] 对于可选的留空的配置选项, 使用默认值而不是空字符串作为配置结果
+- [ ] 修正转义不完善的问题(针对`\$`等转义字符)
+- [x] 对于可选的留空的配置选项, 使用默认值而不是空字符串作为配置结果
 
 ## 许可
 

doc/csti-define.md

@@ -39,17 +39,19 @@
 
 此处的值为一个整数, 范围是 `0-7`, 其中 `0` 和 `7` 都代表周日
 
+默认会使用与 `semester-start-date` 相吻合的值.
+
 ### `semester-start-date`
 
 定义学期的第一天, 格式定为 `yyyy-MM-dd`, 注意这一天的与 `first-day-of-week` 应该相吻合
 
 ### `reminder-time`
 
-定义课程的提醒时间, 整数表示延后, 负数表示提前, 单位支持 `s`\`m` 和 `h`, 分别表示提前或者延后的秒\分\时.
+定义课程的提醒时间, 整数表示延后, 负数表示提前, 单位支持 `s`\\`m` 和 `h`, 分别表示提前或者延后的秒\\分\\时.
 
-可以填写多个值, 其间使用逗号分隔, 表示对于同一节课提醒多次
+可以填写多个值, 其间使用逗号分隔, 表示对于同一节课提醒多次.
 
-比如 `-1h,-15m` 表示在上课前1小时和前15分钟提醒两次
+> 比如 `-1h,-15m` 表示在上课前1小时和前15分钟提醒两次.
 
 ### `lesson-ranges`
 

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>com.github.leafee98</groupId>
   <artifactId>class-schedule-to-icalendar-core</artifactId>
-  <version>v0.0.2</version>
+  <version>v0.0.3</version>
 
   <name>class schedule to icalendar core</name>
 

src/main/java/com/github/leafee98/CSTI/core/bean/Configure.java

@@ -28,8 +28,9 @@ public class Configure {
     // default is system default time zone
     private ZoneId timezone = ZoneId.systemDefault();
 
-    // default is 0, means Sunday
-    private int firstDayOfWeek = 0;
+    // default unset, init when loading from configure file
+    // use day of semesterStartDate if not present in configure file
+    private int firstDayOfWeek = -1;
 
     // no default, and must occur in config file
     private LocalDate semesterStartDate;
@@ -50,16 +51,30 @@ public static Configure load(String str) {
         for (String line : lines) {
             if (line.startsWith(KeyWords.eventSummaryFormat)) {
                 // keep white spaces of format description
-                result.setEventSummaryFormat(line.substring(KeyWords.eventSummaryFormat.length() + 1));
+                String tmp = line.substring(KeyWords.eventSummaryFormat.length() + 1);
+                if (tmp.trim().length() != 0) {
+                    result.setEventSummaryFormat(tmp);
+                }
+                // result.setEventSummaryFormat(line.substring(KeyWords.eventSummaryFormat.length() + 1));
             } else if (line.startsWith(KeyWords.eventDescriptionFormat)) {
-                result.setEventDescriptionFormat(line.substring(KeyWords.eventDescriptionFormat.length() + 1));
+                String tmp = line.substring(KeyWords.eventDescriptionFormat.length() + 1);
+                if (tmp.trim().length() != 0) {
+                    result.setEventDescriptionFormat(tmp);
+                }
+                // result.setEventDescriptionFormat(line.substring(KeyWords.eventDescriptionFormat.length() + 1));
             } else if (line.startsWith(KeyWords.firstDayOfWeek)) {
                 // take 0 as Sunday
-                int dow = Integer.parseInt(line.substring(KeyWords.firstDayOfWeek.length() + 1).trim());
-                result.setFirstDayOfWeek(dow % 7);
+                String tmp = line.substring(KeyWords.firstDayOfWeek.length() + 1).trim();
+                if (tmp.length() != 0) {
+                    int dow = Integer.parseInt(tmp);
+                    result.setFirstDayOfWeek(dow % 7);
+                }
             } else if (line.startsWith(KeyWords.semesterStartDate)) {
                 result.setSemesterStartDate(
                         LocalDate.parse(line.substring(KeyWords.semesterStartDate.length() + 1).trim()));
+                if (result.getFirstDayOfWeek() < 0) {
+                    result.setFirstDayOfWeek(result.getSemesterStartDate().getDayOfWeek().getValue());
+                }
             } else if (line.startsWith(KeyWords.reminderTime)) {
                 // get reminder description and remove redundant spaces
                 List<String> reminder = new ArrayList<>();

src/test/java/com/github/leafee98/CSTI/core/ConfigureTest.java

@@ -11,7 +11,7 @@ public class ConfigureTest {
     public void testLoad() {
         String expected =
                 "event-summary-format:lesson${lessonName}location${location}-${schedule}${teacher}\n"
-                + "event-description-format:\n"
+                + "event-description-format:name:${lessonName}\\nlocation:${location}\\nteacher:${teacher}\\ntype:${lessonType}\\nremark:${remark}\\nschedule:${scheduleFull}\n"
                 + "timezone:Asia/Shanghai\n"
                 + "first-day-of-week:5\n"
                 + "semester-start-date:2020-02-21\n"

src/test/java/com/github/leafee98/CSTI/core/ScheduleObjectTest.java

@@ -41,8 +41,40 @@ public void test() {
                 " 4,6-7,9-10|1|1-3;\n" +
                 ">>>\n";
 
+        String expected = "[[[\n" +
+                "event-summary-format:lesson${lessonName}location${location}-${schedule}${teacher}\n" +
+                "event-description-format:name:${lessonName}\\nlocation:${location}\\nteacher:${teacher}\\ntype:${lessonType}\\nremark:${remark}\\nschedule:${scheduleFull}\n" +
+                "timezone:Asia/Shanghai\n" +
+                "first-day-of-week:5\n" +
+                "semester-start-date:2020-02-21\n" +
+                "reminder-time:-15m\n" +
+                "lesson-ranges:\n" +
+                " 1=08:00:00-08:45:00,\n" +
+                " 2=08:50:00-09:35:00,\n" +
+                " 3=09:50:00-10:35:00,\n" +
+                " 4=10:40:00-11:25:00,\n" +
+                " 5=11:30:00-12:15:00,\n" +
+                " 6=13:30:00-14:15:00,\n" +
+                " 7=14:20:00-15:05:00,\n" +
+                " 8=15:20:00-16:05:00,\n" +
+                " 9=16:10:00-16:55:00,\n" +
+                " 10=18:30:00-19:15:00,\n" +
+                " 11=19:20:00-20:05:00,\n" +
+                " 12=20:10:00-20:55:00\n" +
+                "]]]\n" +
+                "<<<\n" +
+                "name:C语言课\n" +
+                "type:专业必修课\n" +
+                "teacher:某某大师\n" +
+                "location:某校区某楼某层某室\n" +
+                "remark:其实暂时没什么其他信息的啦\n" +
+                "schedule:\n" +
+                " 4,7-8,10|1|1,3;\n" +
+                " 4,6-7,9-10|1|1-3;\n" +
+                ">>>\n";
+
         ScheduleObject obj = ScheduleObject.load(BreakLine.recovery(input));
-        Assertions.assertEquals(input, BreakLine.doBreak(obj.toString(), false));
+        Assertions.assertEquals(expected, BreakLine.doBreak(obj.toString(), false));
     }
 
 }