Merge pull request #62 from dvklopfenstein/dev

New release

Author: dvklopfenstein

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 # Summary
 * [**Unreleased**](#unreleased)
+* **Release 2025-06-30 v0.8.1** Software release
 * [**Release 2025-06-28 v0.8a1**](#release-2025-06-28-v08a1) Added the command `trk running`
 * [**Release 2025-06-28 v0.8a0**](#release-2025-06-28-v08a0) Documentation; minor speed; simplify stop defaults
 * [**Release 2025-06-21 v0.7a0**](#release-2025-06-21-v07a0) Much added functionality for invoicing

pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "timetracker-csv"
 description = "Pandas-friendly time tracking from the CLI"
-version = "0.8a1"
+version = "0.8.1"
 license = "AGPL-3.0-or-later"
 authors = [
   {name = 'DV Klopfenstein, PhD', email = 'dvklopfenstein@protonmail.com'},

tests/test_tt_getdt.py

@@ -3,6 +3,7 @@
 
 from collections import namedtuple
 from datetime import timedelta
+from datetime import datetime
 from csv import writer
 from timeit import default_timer
 from re import compile as re_compile
@@ -26,22 +27,20 @@ def _run(nto):
     # pylint: disable=too-many-locals
     timedata = []
     #cmp_time = re_compile(r'((\d{1,2}):){0,2}(\d{1,2})\s*(?P<AM_PM>[aApP][mM])')
-    # pylint: disable=line-too-long
-    cmp_time = re_compile(r'((?P<hour>\d{1,2})(:(?P<minute>\d{1,2}))?(:(?P<second>\d{1,2}))?\s*(?P<AM_PM>[aApP][mM])?)')
-    cmp_date = re_compile(r'((?P<year>\d{4})[-/_]?)?(?P<month>\d{1,2})[-/_](?P<day>\d{1,2})')
+    reobj = _ReDatetime()
     print(f'NOW: {NOW}')
     for timestr, expdct in TIMESTRS.items():
         # pylint: disable=too-many-locals
         print(f'\nTIMESTR({timestr})')
         tic = default_timer()
-        print("SEARCH FOR TIME:", (m := cmp_time.search(timestr)), m.groupdict() if m else '')
-        print("SEARCH FOR DATE:", cmp_date.search(timestr))
+        dtre = reobj.search(timestr)
         tt0 = timedelta(seconds=default_timer()-tic)
-        print(f'{tt0}    re          ({timestr})')  # {dta}')
+        print(f'{tt0}    re          ({timestr}) {dtre}')
 
         tic = default_timer()
         dta = _get_dt_ampm(timestr, NOW)
         assert dta == expdct['dt'], f'ACT != EXP\nTXT({timestr})\nACT({dta})\nEXP({expdct["dt"]})'
+        #assert dta == dtre, f'RE != ME\nTXT({timestr})\nRE({dtre})\nME({dta})'
         tta = timedelta(seconds=default_timer()-tic)
         print(f'{tta}    _get_dt_ampm({timestr}) {dta}')
 
@@ -82,5 +81,79 @@ def _wr_timedata(fcsv, timedata, nto):
             wrobj.writerow(ntd)
         print(f'  WROTE: {fcsv}')
 
+
+class _ReDatetime:
+    """Compare custom solution to Python re solution"""
+    # pylint: disable=too-few-public-methods
+
+    # pylint: disable=line-too-long
+    cmp_time = re_compile(r'((?<![-\d/])(?P<hour>\d{1,2})(?![-\d/])(:(?P<minute>\d{1,2}))?(:(?P<second>\d{1,2}))?\s*(?P<AM_PM>[aApP][mM])?)')
+    cmp_date = re_compile(r'((?P<year>\d{4})[-/_]?)?(?P<month>\d{1,2})[-/_](?P<day>\d{1,2})')
+
+    def search(self, timestr):
+        """Use Python `re` to search for date and time"""
+        mtch_time = self._search_time(timestr)
+        mtch_date = self._search_date(timestr)
+        print("SEARCH FOR TIME:", mtch_time, mtch_time.groupdict() if mtch_time else '')
+        print("SEARCH FOR DATE:", mtch_date, mtch_date.groupdict() if mtch_date else '')
+        if mtch_time is None or mtch_time.group('hour') is None:
+            return None
+        dct_hms = self._get_hms(mtch_time)
+        dct_ymd = self._get_ymd(mtch_date)
+        dct = {**dct_ymd, **dct_hms}
+        if (m := mtch_time.group('AM_PM')) is not None:
+            if not self._ampm(dct, m):
+                return None
+        print("SEARCH DATETIME:", dct)
+        if dct:
+            try:
+                ret = datetime(year=dct['year'], month=dct['month'], day=dct['day'],
+                               hour=dct['hour'],
+                               minute=dct['minute'],
+                               second=dct['second'])
+            except ValueError:
+                print(f'BAD datetime INPUT: {dct}')
+            else:
+                return ret
+        return None
+
+    def _get_hms(self, mtch):
+        return {'hour':  int(mtch.group('hour')),
+                'minute': int(m) if (m := mtch.group('minute'))   else 0,
+                'second':   int(m) if (m := mtch.group('second')) else 0}
+
+
+    def _ampm(self, dct, ampm):
+        if ampm is None:
+            return True
+        ampm = ampm.upper()
+        if ampm == 'PM':
+            if 0 <= (hour := dct['hour']) < 12:
+                dct['hour'] = hour + 12
+            elif hour != 12:
+                return False
+        else:
+            assert ampm == 'AM', dct
+            if dct['hour'] == 12:
+                dct['hour'] = 0
+        return True
+
+    def _get_ymd(self, mtch):
+        if mtch:
+            return {'year':  int(m) if (m := mtch.group('year'))  else NOW.year,
+                    'month': int(m) if (m := mtch.group('month')) else NOW.month,
+                    'day':   int(m) if (m := mtch.group('day'))   else NOW.day}
+        return {'year':  NOW.year,
+                'month': NOW.month,
+                'day':   NOW.day}
+
+    def _search_time(self, timestr):
+        """Use Python re to search for time"""
+        return self.cmp_time.search(timestr)
+
+    def _search_date(self, timestr):
+        """Use Python re to search for time"""
+        return self.cmp_date.search(timestr)
+
 if __name__ == '__main__':
     test_tt_getdt()

timetracker/__init__.py

@@ -2,6 +2,6 @@
 
 __copyright__ = 'Copyright (C) 2025-present, DV Klopfenstein, PhD. All rights reserved'
 __author__ = 'DV Klopfenstein, PhD'
-__version__ = '0.8a1'
+__version__ = '0.8.1'
 
 # Copyright (C) 2025-present, DV Klopfenstein, PhD. All rights reserved