moat-kv-cal 0.1.2__py3-none-any.whl → 0.1.4__py3-none-any.whl

moat/kv/cal/_main.py

@@ -7,7 +7,7 @@ from moat.util import P, Path
 from moat.kv.data import data_get
 from .model import CalRoot
 from .util import find_next_alarm
-from datetime import datetime, timezone, timedelta
+from datetime import datetime, timedelta, UTC
 import pytz
 
 import anyio
@@ -17,7 +17,7 @@ import logging
 
 logger = logging.getLogger(__name__)
 
-utc = timezone.utc
+utc = UTC
 now = partial(datetime.now, utc)
 
 
@@ -82,7 +82,7 @@ async def run_(obj):
             if ev is None:
                 logger.warning("NO EVT")
                 continue
-            if evt <= t_now:
+            if ev_t <= t_now:
                 if t_al != ev_t:
                     # set alarm message
                     logger.warning("ALARM %s %s", v.summary.value, ev_t)
@@ -114,7 +114,7 @@ async def list_(obj):
         elif len(p) == 1:
             return Path("%02x" % p[0])
         else:
-            return Path("%02x.%12x" % (p[0], p[1])) + p[2:]
+            return Path(f"{p[0]:02x}.{p[1]:12x}") + p[2:]
 
     if obj.meta:
 

moat/kv/cal/util.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from datetime import datetime, timedelta, timezone, date, time
+from datetime import datetime, timedelta, date, time, UTC
 from dateutil.rrule import rrulestr
 from vobject.icalendar import VAlarm, VEvent
 
@@ -9,7 +9,7 @@ import logging
 logger = logging.getLogger(__name__)
 
 
-async def find_next_alarm(calendar, future=10, now=None, zone=timezone.utc) -> Tuple(
+async def find_next_alarm(calendar, future=10, now=None, zone=UTC) -> Tuple(
     VAlarm,
     datetime,
 ):
@@ -31,7 +31,7 @@ async def find_next_alarm(calendar, future=10, now=None, zone=timezone.utc) -> T
     )
 
     if now is None:
-        now = datetime.now(timezone.utc)
+        now = datetime.now(UTC)
     ev = None
     ev_v = None
     ev_t = None
@@ -91,8 +91,10 @@ async def find_next_alarm(calendar, future=10, now=None, zone=timezone.utc) -> T
     return ev, ev_v, ev_t
 
 
-def next_start(v, now):
+def next_start(v, now, zone=UTC):
     st = v.dtstart.value
+    if isinstance(st,date):
+        st=datetime.combine(st,time(0,0,0)).astimezone(zone)
     try:
         rule = rrulestr(v.rrule.value, dtstart=st)
     except AttributeError:

{moat_kv_cal-0.1.2.dist-info → moat_kv_cal-0.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moat-kv-cal
-Version: 0.1.2
+Version: 0.1.4
 Summary: Calendar management for MoaT-KV
 Author-email: Matthias Urlichs <matthias@urlichs.de>
 Project-URL: homepage, https://m-o-a-t.org
@@ -13,8 +13,9 @@ Classifier: Topic :: Database
 Classifier: Topic :: Home Automation
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
+License-File: LICENSE
 License-File: LICENSE.txt
-Requires-Dist: moat-kv~=0.70.23
+Requires-Dist: moat-kv~=0.70.24
 Requires-Dist: moat-util~=0.56.4
 Requires-Dist: aiocaldav
 Dynamic: license-file

moat_kv_cal-0.1.4.dist-info/RECORD

@@ -0,0 +1,11 @@
+moat/kv/cal/__init__.py,sha256=ZBoFcXbv35djD599Vo_PKTqDjvQXYYXTcPUs5RcQZrs,101
+moat/kv/cal/_cfg.yaml,sha256=UrczyUBlF7NIPt26pUu0CFdM67xC5TcPmSoVrg79tyQ,31
+moat/kv/cal/_main.py,sha256=DJ2cgFK0ObC9C1sVUyMcroivtI_1mR4aDNPvYJ1eqCs,8341
+moat/kv/cal/model.py,sha256=-n0yMEYImoHVDuNWibFJ4-LIpYsx3SmCo6hmAc8rsZU,2355
+moat/kv/cal/util.py,sha256=GI7KoSZeRDDtEMcjp_kvPP7Hd6phLHZPft4oNMzcRfI,3521
+moat_kv_cal-0.1.4.dist-info/licenses/LICENSE,sha256=ZSyHhIjRRWNh4Iw_hgf9e6WYkqFBA9Fczk_5PIW1zIs,185
+moat_kv_cal-0.1.4.dist-info/licenses/LICENSE.txt,sha256=L5vKJLVOg5t0CEEPpW9-O_0vzbP0PEjEF06tLvnIDuk,541
+moat_kv_cal-0.1.4.dist-info/METADATA,sha256=hNeKvkVJ7CJC8yV5A6JMG6p0cHvkjn4NQNn-fTf23Kw,951
+moat_kv_cal-0.1.4.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+moat_kv_cal-0.1.4.dist-info/top_level.txt,sha256=pcs9fl5w5AB5GVi4SvBqIVmFrkRwQkVw_dEvW0Q0cSA,5
+moat_kv_cal-0.1.4.dist-info/RECORD,,

{moat_kv_cal-0.1.2.dist-info → moat_kv_cal-0.1.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (77.0.3.post20250321)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

moat_kv_cal-0.1.4.dist-info/licenses/LICENSE

@@ -0,0 +1,3 @@
+This software is made available under the terms of *either* of the
+licenses found in LICENSE.APACHE2 or LICENSE.MIT. Contributions to are
+made under the terms of *both* these licenses.

moat_kv_cal-0.1.2.dist-info/RECORD

@@ -1,10 +0,0 @@
-moat/kv/cal/__init__.py,sha256=ZBoFcXbv35djD599Vo_PKTqDjvQXYYXTcPUs5RcQZrs,101
-moat/kv/cal/_cfg.yaml,sha256=UrczyUBlF7NIPt26pUu0CFdM67xC5TcPmSoVrg79tyQ,31
-moat/kv/cal/_main.py,sha256=VN_Dn3Oz25HZIWYBZQvXb_P3Yh2rtHSADUBCLoudL0k,8356
-moat/kv/cal/model.py,sha256=-n0yMEYImoHVDuNWibFJ4-LIpYsx3SmCo6hmAc8rsZU,2355
-moat/kv/cal/util.py,sha256=zPuj6zlAug2Q6GS8K0_Zd1k6A_Ci3hK4SkRg8yQ4QFg,3445
-moat_kv_cal-0.1.2.dist-info/licenses/LICENSE.txt,sha256=L5vKJLVOg5t0CEEPpW9-O_0vzbP0PEjEF06tLvnIDuk,541
-moat_kv_cal-0.1.2.dist-info/METADATA,sha256=6w2eC98kQbfUEut6cBSWtxy0I2zTLckpX6RZc1N767Q,929
-moat_kv_cal-0.1.2.dist-info/WHEEL,sha256=xcaH6rP_nCxh1LBIPM7Q0uOnzSGjsIye-Q44j_zbzw8,104
-moat_kv_cal-0.1.2.dist-info/top_level.txt,sha256=pcs9fl5w5AB5GVi4SvBqIVmFrkRwQkVw_dEvW0Q0cSA,5
-moat_kv_cal-0.1.2.dist-info/RECORD,,