Skip to content

#1660 first approach to make it faster #2101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Cyber1000 wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

#1660 first approach to make it faster #2101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 24 additions & 16 deletions app/src/main/java/at/techbee/jtx/database/ICalObject.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,14 @@ data class ICalObject(


companion object {
private const val WINDOW_SECONDLY = 1 / 24 / 60
private const val WINDOW_MINUTELY = 1 / 24
private const val WINDOW_HOURLY = 1
private const val WINDOW_DAILY = 14
private const val WINDOW_WEEKLY = 30
private const val WINDOW_MONTHLY = 365
private const val WINDOW_YEARLY = 730
private const val WINDOW_DEFAULT = 30

const val TZ_ALLDAY = "ALLDAY"

Expand Down Expand Up @@ -1106,26 +1114,26 @@ data class ICalObject(

val from = DateTime(props.getProperty<DtStart>(Property.DTSTART).date.time.let {
when (props.getProperty<RRule>(Property.RRULE).recur.frequency) {
Frequency.SECONDLY -> it - (1).hours.inWholeMilliseconds
Frequency.MINUTELY -> it - (1).days.inWholeMilliseconds
Frequency.HOURLY -> it - (30).days.inWholeMilliseconds
Frequency.DAILY -> it - (365).days.inWholeMilliseconds
Frequency.WEEKLY -> it - (365).days.inWholeMilliseconds
Frequency.MONTHLY -> it - (3650).days.inWholeMilliseconds
Frequency.YEARLY -> it - (36500).days.inWholeMilliseconds
else -> it - (365).days.inWholeMilliseconds
Frequency.SECONDLY -> it - (WINDOW_SECONDLY).hours.inWholeMilliseconds
Frequency.MINUTELY -> it - (WINDOW_MINUTELY).days.inWholeMilliseconds
Frequency.HOURLY -> it - (WINDOW_HOURLY).days.inWholeMilliseconds
Frequency.DAILY -> it - (WINDOW_DAILY).days.inWholeMilliseconds
Frequency.WEEKLY -> it - (WINDOW_WEEKLY).days.inWholeMilliseconds
Frequency.MONTHLY -> it - (WINDOW_MONTHLY).days.inWholeMilliseconds
Frequency.YEARLY -> it - (WINDOW_YEARLY).days.inWholeMilliseconds
else -> it - (WINDOW_DEFAULT).days.inWholeMilliseconds
}
})
val to = DateTime(props.getProperty<DtStart>(Property.DTSTART).date.time.let {
when (props.getProperty<RRule>(Property.RRULE).recur.frequency) {
Frequency.SECONDLY -> it + (1).hours.inWholeMilliseconds
Frequency.MINUTELY -> it + (1).days.inWholeMilliseconds
Frequency.HOURLY -> it + (30).days.inWholeMilliseconds
Frequency.DAILY -> it + (365).days.inWholeMilliseconds
Frequency.WEEKLY -> it + (365).days.inWholeMilliseconds
Frequency.MONTHLY -> it + (3650).days.inWholeMilliseconds
Frequency.YEARLY -> it + (36500).days.inWholeMilliseconds
else -> it + (365).days.inWholeMilliseconds
Frequency.SECONDLY -> it + (WINDOW_SECONDLY).hours.inWholeMilliseconds
Frequency.MINUTELY -> it + (WINDOW_MINUTELY).days.inWholeMilliseconds
Frequency.HOURLY -> it + (WINDOW_HOURLY).days.inWholeMilliseconds
Frequency.DAILY -> it + (WINDOW_DAILY).days.inWholeMilliseconds
Frequency.WEEKLY -> it + (WINDOW_WEEKLY).days.inWholeMilliseconds
Frequency.MONTHLY -> it + (WINDOW_MONTHLY).days.inWholeMilliseconds
Frequency.YEARLY -> it + (WINDOW_YEARLY).days.inWholeMilliseconds
else -> it + (WINDOW_DEFAULT).days.inWholeMilliseconds
}
})
val period = Period(from, to)
Expand Down