fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-02-02 11:46:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

create a RepeatRule model for parsing event repetition rules

Browse Source
This commit is contained in:
tibbi 2017-07-12 21:24:46 +02:00
parent e135b37b0b
commit 424e6894d3
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/kotlin/com/simplemobiletools/calendar/helpers/IcsImporter.kt
View File

@ -9,6 +9,7 @@ import com.simplemobiletools.calendar.extensions.seconds
import com.simplemobiletools.calendar.helpers.IcsImporter.ImportResult.* import com.simplemobiletools.calendar.helpers.IcsImporter.ImportResult.*
import com.simplemobiletools.calendar.models.Event import com.simplemobiletools.calendar.models.Event
import com.simplemobiletools.calendar.models.EventType import com.simplemobiletools.calendar.models.EventType
import com.simplemobiletools.calendar.models.RepeatRule
import org.joda.time.DateTimeZone import org.joda.time.DateTimeZone
import org.joda.time.format.DateTimeFormat import org.joda.time.format.DateTimeFormat
import java.io.File import java.io.File
@ -76,7 +77,10 @@ class IcsImporter {
} else if (line.startsWith(UID)) { } else if (line.startsWith(UID)) {
curImportId = line.substring(UID.length) curImportId = line.substring(UID.length)
} else if (line.startsWith(RRULE)) { } else if (line.startsWith(RRULE)) {
curRepeatInterval = parseRepeatInterval(line.substring(RRULE.length)) val repeatRule = parseRepeatInterval(line.substring(RRULE.length), curStart)
curRepeatRule = repeatRule.repeatRule
curRepeatInterval = repeatRule.repeatInterval
curRepeatLimit = repeatRule.repeatLimit
} else if (line.startsWith(ACTION)) { } else if (line.startsWith(ACTION)) {
isNotificationDescription = true isNotificationDescription = true
lastReminderAction = line.substring(ACTION.length) lastReminderAction = line.substring(ACTION.length)
@ -202,38 +206,40 @@ class IcsImporter {
return dateTimeFormat.parseDateTime(digitString).withZoneRetainFields(dateTimeZone).seconds() return dateTimeFormat.parseDateTime(digitString).withZoneRetainFields(dateTimeZone).seconds()
} }
private fun parseRepeatInterval(fullString: String): Int { private fun parseRepeatInterval(fullString: String, startTS: Int): RepeatRule {
val parts = fullString.split(";") val parts = fullString.split(";")
var frequencySeconds = 0 var repeatInterval = 0
var repeatRule = 0
var repeatLimit = 0
for (part in parts) { for (part in parts) {
val keyValue = part.split("=") val keyValue = part.split("=")
val key = keyValue[0] val key = keyValue[0]
val value = keyValue[1] val value = keyValue[1]
if (key == FREQ) { if (key == FREQ) {
frequencySeconds = getFrequencySeconds(value) repeatInterval = getFrequencySeconds(value)
if (value == WEEKLY) { if (value == WEEKLY) {
val start = Formatter.getDateTimeFromTS(curStart) val start = Formatter.getDateTimeFromTS(startTS)
curRepeatRule = Math.pow(2.0, (start.dayOfWeek - 1).toDouble()).toInt() repeatRule = Math.pow(2.0, (start.dayOfWeek - 1).toDouble()).toInt()
} else if (value == MONTHLY) { } else if (value == MONTHLY) {
curRepeatRule = REPEAT_MONTH_SAME_DAY repeatRule = REPEAT_MONTH_SAME_DAY
} }
} else if (key == COUNT) { } else if (key == COUNT) {
curRepeatLimit = -value.toInt() repeatLimit = -value.toInt()
} else if (key == UNTIL) { } else if (key == UNTIL) {
curRepeatLimit = parseDateTimeValue(value) repeatLimit = parseDateTimeValue(value)
} else if (key == INTERVAL) { } else if (key == INTERVAL) {
frequencySeconds *= value.toInt() repeatInterval *= value.toInt()
} else if (key == BYDAY) { } else if (key == BYDAY) {
if (frequencySeconds.isXWeeklyRepetition()) { if (repeatInterval.isXWeeklyRepetition()) {
handleRepeatRule(value) handleRepeatRule(value)
} else if (frequencySeconds.isXMonthlyRepetition()) { } else if (repeatInterval.isXMonthlyRepetition()) {
curRepeatRule = REPEAT_MONTH_EVERY_XTH_DAY repeatRule = REPEAT_MONTH_EVERY_XTH_DAY
} }
} else if (key == BYMONTHDAY && value.toInt() == -1) { } else if (key == BYMONTHDAY && value.toInt() == -1) {
curRepeatRule = REPEAT_MONTH_LAST_DAY repeatRule = REPEAT_MONTH_LAST_DAY
} }
} }
return frequencySeconds return RepeatRule(repeatInterval, repeatRule, repeatLimit)
} }
private fun getFrequencySeconds(interval: String): Int { private fun getFrequencySeconds(interval: String): Int {

3
app/src/main/kotlin/com/simplemobiletools/calendar/models/RepeatRule.kt Normal file
View File

@ -0,0 +1,3 @@
package com.simplemobiletools.calendar.models
data class RepeatRule(val repeatInterval: Int, val repeatRule: Int, val repeatLimit: Int)