Merge remote-tracking branch 'origin/main' into remove-sync-apis

Author: Review

nc_py_api/_version.py

@@ -1,3 +1,3 @@
 """Version of nc_py_api."""
 
-__version__ = "0.30.0.dev0"
+__version__ = "0.30.0"

nc_py_api/files/__init__.py

@@ -442,6 +442,12 @@ def path(self) -> str:
         """Share path relative to the user's root directory."""
         return self._raw_data.get("path", "").lstrip("/")
 
+    @property
+    def token(self) -> str:
+        """Token for the Shared object."""
+        # Nextcloud pre-initializes token to null and overwrites it for types that have it.
+        return self._raw_data.get("token") or ""
+
     @property
     def label(self) -> str:
         """Label for the Shared object."""

tests/actual_tests/calendar_test.py

@@ -13,9 +13,13 @@ async def test_create_delete_async(anc):
         calendars = principal.calendars()
         assert calendars
         all_events_before = calendar.events()
+        # Use a past date so the event isn't picked up by Nextcloud's
+        # calendar-status automation (which scans events in [now, now+5m]
+        # and caches the result for 5 minutes, breaking user_status tests).
+        past = datetime.datetime.now() - datetime.timedelta(days=400)
         event = calendar.save_event(
-            dtstart=datetime.datetime.now(),
-            dtend=datetime.datetime.now() + datetime.timedelta(hours=1),
+            dtstart=past,
+            dtend=past + datetime.timedelta(hours=1),
             summary="NcPyApi + CalDAV test",
         )
         all_events_after = calendar.events()
@@ -71,7 +75,9 @@ async def test_event_full_lifecycle_async(anc):
     calendar = principal.make_calendar("test_ncpyapi_ops")
     try:
         # --- Event lifecycle ---
-        now = datetime.datetime.now()
+        # Use a past anchor so these events don't trigger Nextcloud's
+        # calendar-status automation (see test_create_delete for details).
+        now = datetime.datetime.now() - datetime.timedelta(days=400)
         calendar.save_event(
             dtstart=now,
             dtend=now + datetime.timedelta(hours=2),
@@ -114,21 +120,26 @@ async def test_event_date_range_search_async(anc):
     principal = anc.cal.principal()
     calendar = principal.make_calendar("test_ncpyapi_search")
     try:
-        base = datetime.datetime.now().replace(hour=12, minute=0, second=0, microsecond=0)
+        # Anchor the search range in the past so none of these events fall
+        # into Nextcloud's calendar-status window ([now, now+5m]); the
+        # date-range search logic under test doesn't depend on "today".
+        base = (datetime.datetime.now() - datetime.timedelta(days=400)).replace(
+            hour=12, minute=0, second=0, microsecond=0
+        )
         calendar.save_event(
             dtstart=base,
             dtend=base + datetime.timedelta(hours=1),
-            summary="Today Event",
+            summary="Day 0 Event",
         )
         calendar.save_event(
             dtstart=base + datetime.timedelta(days=1),
             dtend=base + datetime.timedelta(days=1, hours=1),
-            summary="Tomorrow Event",
+            summary="Day +1 Event",
         )
         calendar.save_event(
             dtstart=base + datetime.timedelta(days=7),
             dtend=base + datetime.timedelta(days=7, hours=1),
-            summary="Next Week Event",
+            summary="Day +7 Event",
         )
         assert len(calendar.events()) == 3
 
@@ -139,19 +150,19 @@ async def test_event_date_range_search_async(anc):
             event=True,
         )
         summaries = {str(e.icalendar_component.get("SUMMARY")) for e in results}
-        assert "Today Event" in summaries
-        assert "Tomorrow Event" not in summaries
+        assert "Day 0 Event" in summaries
+        assert "Day +1 Event" not in summaries
 
-        # Search for today + tomorrow
+        # Search for day 0 + day +1
         results = calendar.search(
             start=base - datetime.timedelta(hours=1),
             end=base + datetime.timedelta(days=1, hours=2),
             event=True,
         )
         summaries = {str(e.icalendar_component.get("SUMMARY")) for e in results}
-        assert "Today Event" in summaries
-        assert "Tomorrow Event" in summaries
-        assert "Next Week Event" not in summaries
+        assert "Day 0 Event" in summaries
+        assert "Day +1 Event" in summaries
+        assert "Day +7 Event" not in summaries
     finally:
         calendar.delete()
 

tests/actual_tests/files_sharing_test.py

@@ -35,6 +35,8 @@ def _test_share_fields(new_share: Share, get_by_id: Share, shared_file: FsNode):
     assert new_share.permissions & FilePermissions.PERMISSION_READ
     assert new_share.url
     assert new_share.path == shared_file.user_path
+    assert new_share.token
+    assert get_by_id.token == new_share.token
     assert get_by_id.share_id == new_share.share_id
     assert get_by_id.path == new_share.path
     assert get_by_id.mimetype == new_share.mimetype