Merge pull request #168 from bdrung/use-timestamp

Let _calc take a datetime object instead of a timestamp

Author: potiuk

src/croniter/croniter.py

@@ -358,6 +358,7 @@ def _get_next(
             raise TypeError("Invalid ret_type, only 'float' or 'datetime' is acceptable.")
 
         result = self._calc_next(is_prev)
+        result = self.datetime_to_timestamp(result)
 
         # DST Handling for cron job spanning across days
         dtstarttime = self._timestamp_to_datetime(self.dst_start_time)
@@ -440,7 +441,8 @@ def __iter__(self):
 
     __next__ = next = _get_next
 
-    def _calc_next(self, is_prev: bool) -> float:
+    def _calc_next(self, is_prev: bool) -> datetime.datetime:
+        current = self.timestamp_to_datetime(self.cur)
         expanded = self.expanded[:]
         nth_weekday_of_month = self.nth_weekday_of_month.copy()
 
@@ -458,33 +460,32 @@ def _calc_next(self, is_prev: bool) -> float:
             else:
                 bak = expanded[DOW_FIELD]
                 expanded[DOW_FIELD] = ["*"]
-                t1 = self._calc(self.cur, expanded, nth_weekday_of_month, is_prev)
+                t1 = self._calc(current, expanded, nth_weekday_of_month, is_prev)
                 expanded[DOW_FIELD] = bak
                 expanded[DAY_FIELD] = ["*"]
 
-                t2 = self._calc(self.cur, expanded, nth_weekday_of_month, is_prev)
+                t2 = self._calc(current, expanded, nth_weekday_of_month, is_prev)
                 if is_prev:
                     return t1 if t1 > t2 else t2
                 return t1 if t1 < t2 else t2
 
-        return self._calc(self.cur, expanded, nth_weekday_of_month, is_prev)
+        return self._calc(current, expanded, nth_weekday_of_month, is_prev)
 
     def _calc(self, now, expanded, nth_weekday_of_month, is_prev):
         if is_prev:
-            now = math.ceil(now)
             nearest_diff_method = self._get_prev_nearest_diff
-            sign = -1
-            offset = 1 if (len(expanded) > UNIX_CRON_LEN or now % 60 > 0) else 60
+            offset = relativedelta(microseconds=-1)
         else:
-            now = math.floor(now)
             nearest_diff_method = self._get_next_nearest_diff
-            sign = 1
-            offset = 1 if (len(expanded) > UNIX_CRON_LEN) else 60
-
-        dst = now = self.timestamp_to_datetime(now + sign * offset)
+            offset = relativedelta(seconds=1) if len(expanded) > UNIX_CRON_LEN else relativedelta(minutes=1)
+        dst = now + offset
+        if len(expanded) > UNIX_CRON_LEN:
+            dst = dst.replace(microsecond=0)
+        else:
+            dst = dst.replace(second=0, microsecond=0)
 
-        month, year = dst.month, dst.year
-        current_year = now.year
+        month = dst.month
+        year = current_year = dst.year
 
         def proc_year(d):
             if len(expanded) == YEAR_CRON_LEN:
@@ -677,7 +678,7 @@ def proc_second(d):
                 break
             if next:
                 continue
-            return self.datetime_to_timestamp(dst.replace(microsecond=0))
+            return dst.replace(microsecond=0)
 
         if is_prev:
             raise CroniterBadDateError("failed to find prev date")