Merge pull request #5 from dapper91/dev

Dev

Author: dapper91

.github/workflows/release.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
+    - name: Set up Python
       uses: actions/setup-python@v2
       with:
         python-version: '3.x'

CHANGELOG.rst

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.1.3 (2021-03-18)
+------------------
+
+- performance fixes
+
 0.1.2 (2021-03-16)
 ------------------
 

crontools/__about__.py

@@ -2,7 +2,7 @@
 __description__ = 'Python cron tools'
 __url__ = 'https://github.com/dapper91/crontools'
 
-__version__ = '0.1.2'
+__version__ = '0.1.3'
 
 __author__ = 'Dmitry Pershin'
 __email__ = '[email protected]'

crontools/crontab.py

@@ -2,11 +2,12 @@
 import dataclasses as dc
 import datetime as dt
 import heapq
-import itertools as it
 import operator as op
 import tzlocal
 from typing import Any, ClassVar, Dict, Generic, Iterator, Iterable, Optional, Type, TypeVar, Tuple
 
+SENTINEL = object()
+
 
 def unique(iterable: Iterable[Any]) -> Iterator[Any]:
     """
@@ -18,7 +19,7 @@ def unique(iterable: Iterable[Any]) -> Iterator[Any]:
 
     it = iter(iterable)
 
-    prev = None
+    prev = SENTINEL
     for val in it:
         if val == prev:
             continue
@@ -296,7 +297,7 @@ def __init__(self, monthday_field: Field[MonthdayRange], weekday_field:  Field[W
     def __iter__(self) -> Iterator[int]:
         return self.iter()
 
-    def iter(self, year: Optional[int] = None, month: Optional[int] = None, start_from: Optional[int] = None) -> Iterator[int]:
+    def iter(self, year: Optional[int] = None, month: Optional[int] = None, start_from: int = 1) -> Iterator[int]:
         """
         Returns iterator over month days and week days values of a particular month and year starting from `start_from`.
 
@@ -311,21 +312,18 @@ def iter(self, year: Optional[int] = None, month: Optional[int] = None, start_fr
         month = now.month if month is None else month
 
         if self._weekday_field.is_default:
-            day_iter = self._monthday_iter(year, month)
+            day_iter = self._monthday_iter(year, month, start_from)
         elif self._monthday_field.is_default:
-            day_iter = self._weekday_iter(year, month)
+            day_iter = self._weekday_iter(year, month, start_from)
         else:
-            day_iter = heapq.merge(self._monthday_iter(year, month), self._weekday_iter(year, month))
-
-        if start_from is not None:
-            day_iter = it.dropwhile(lambda value: value < start_from, day_iter)
+            day_iter = heapq.merge(self._monthday_iter(year, month, start_from), self._weekday_iter(year, month, start_from))
 
         return unique(day_iter)
 
-    def _monthday_iter(self, year: int, month: int) -> Iterator[int]:
-        for day in self._monthday_field:
+    def _monthday_iter(self, year: int, month: int, start_from: int = 1) -> Iterator[int]:
+        for day in self._monthday_field.iter(start_from=start_from):
             if day > calendar.monthrange(year, month)[1]:
-                continue
+                break
 
             yield day
 
@@ -334,7 +332,8 @@ def _weekday_iter(self, year: int, month: int, start_day: int = 1) -> Iterator[i
         curr_weekday = calendar.weekday(year, month, curr_day) + 1
         weekday_iter = self._weekday_field.iter(start_from=curr_weekday)
 
-        for _ in range(6):
+        max_weeks_in_month = 6
+        for _ in range(max_weeks_in_month):
             for weekday in weekday_iter:
                 curr_day += (weekday - curr_weekday)
                 curr_weekday += (weekday - curr_weekday)