Skip to content

1.3.15.1: new DateTime should keep Kind of original value #32

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

Open
ArieSLV wants to merge 1 commit into
base: master
Choose a base branch
from
Open

1.3.15.1: new DateTime should keep Kind of original value #32

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
13 changes: 7 additions & 6 deletions NCrontab.Advanced/CrontabSchedule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,35 +97,36 @@ private DateTime InternalGetNextOccurence(DateTime baseValue, DateTime endValue)
var secondFilters = Filters[CrontabFieldKind.Second].Where(x => x is ITimeFilter).Cast<ITimeFilter>().ToList();
firstSecondValue = secondFilters.Select(x => x.First()).Min();
newSeconds = Increment(secondFilters, newValue.Second, firstSecondValue, out overflow);
newValue = new DateTime(newValue.Year, newValue.Month, newValue.Day, newValue.Hour, newValue.Minute, newSeconds);
newValue = new DateTime(newValue.Year, newValue.Month, newValue.Day, newValue.Hour, newValue.Minute, newSeconds, newValue.Kind);
if (!overflow && !IsMatch(newValue))
{
newSeconds = firstSecondValue;
newValue = new DateTime(newValue.Year, newValue.Month, newValue.Day, newValue.Hour, newValue.Minute, newSeconds);
newValue = new DateTime(newValue.Year, newValue.Month, newValue.Day, newValue.Hour, newValue.Minute, newSeconds, newValue.Kind);
overflow = true;
}
if (!overflow) return MinDate(newValue, endValue);
}

var newMinutes = Increment(minuteFilters, newValue.Minute + (overflow ? 0 : -1), firstMinuteValue, out overflow);
newValue = new DateTime(newValue.Year, newValue.Month, newValue.Day, newValue.Hour, newMinutes, overflow ? firstSecondValue : newSeconds);
newValue = new DateTime(newValue.Year, newValue.Month, newValue.Day, newValue.Hour, newMinutes, overflow ? firstSecondValue : newSeconds, newValue.Kind);
if (!overflow && !IsMatch(newValue))
{
newSeconds = firstSecondValue;
newMinutes = firstMinuteValue;
newValue = new DateTime(newValue.Year, newValue.Month, newValue.Day, newValue.Hour, newMinutes, firstSecondValue);
newValue = new DateTime(newValue.Year, newValue.Month, newValue.Day, newValue.Hour, newMinutes, firstSecondValue, newValue.Kind);
overflow = true;
}
if (!overflow) return MinDate(newValue, endValue);

var newHours = Increment(hourFilters, newValue.Hour + (overflow ? 0 : -1), firstHourValue, out overflow);
newValue = new DateTime(newValue.Year, newValue.Month, newValue.Day, newHours,
overflow ? firstMinuteValue : newMinutes,
overflow ? firstSecondValue : newSeconds);
overflow ? firstSecondValue : newSeconds,
newValue.Kind);

if (!overflow && !IsMatch(newValue))
{
newValue = new DateTime(newValue.Year, newValue.Month, newValue.Day, firstHourValue, firstMinuteValue, firstSecondValue);
newValue = new DateTime(newValue.Year, newValue.Month, newValue.Day, firstHourValue, firstMinuteValue, firstSecondValue, newValue.Kind);
overflow = true;
}

Expand Down