icloud-cli-tools 0.1.1__tar.gz → 0.1.2__tar.gz

{icloud_cli_tools-0.1.1/src/icloud_cli_tools.egg-info → icloud_cli_tools-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: icloud-cli-tools
-Version: 0.1.1
+Version: 0.1.2
 Summary: Access iCloud Calendar, Reminders, Notes, and Find My from Linux
 Author: alan
 License-Expression: MIT
@@ -18,7 +18,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Utilities
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pyicloud>=2.5.0

{icloud_cli_tools-0.1.1 → icloud_cli_tools-0.1.2}/pyproject.toml

@@ -4,11 +4,11 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "icloud-cli-tools"
-version = "0.1.1"
+version = "0.1.2"
 description = "Access iCloud Calendar, Reminders, Notes, and Find My from Linux"
 readme = "README.md"
 license = "MIT"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 authors = [{ name = "alan" }]
 keywords = [
     "icloud",

{icloud_cli_tools-0.1.1 → icloud_cli_tools-0.1.2}/src/icloud_cli/__init__.py

@@ -1,3 +1,3 @@
 """icloud-cli-tools: Access iCloud services from Linux."""
 
-__version__ = "0.1.0"
+__version__ = "0.1.2"

{icloud_cli_tools-0.1.1 → icloud_cli_tools-0.1.2}/src/icloud_cli/auth.py

@@ -89,7 +89,26 @@ class AuthManager:
     def _handle_2fa(self) -> bool:
         """Handle two-factor authentication (trusted device code)."""
         info("Two-factor authentication required.")
-        info("A verification code has been sent to your trusted devices.")
+
+        try:
+            self._api.request_2fa_code()
+        except Exception as e:
+            error(f"Failed to trigger 2FA delivery: {e}")
+            return False
+
+        method = self._api.two_factor_delivery_method
+        notice = self._api.two_factor_delivery_notice
+
+        if method == "trusted_device":
+            info("Approve the sign-in request on your trusted device.")
+            info("Enter the 6-digit code shown after you approve.")
+        elif method == "sms":
+            info("A verification code has been sent via SMS.")
+        else:
+            info("A verification code has been sent to your trusted devices.")
+
+        if notice:
+            warning(notice)
 
         code = click.prompt("Enter 2FA code")
 
@@ -99,7 +118,6 @@ class AuthManager:
                 error("Invalid 2FA code.")
                 return False
 
-            # Trust this session
             if not self._api.is_trusted_session:
                 info("Trusting this session...")
                 self._api.trust_session()

{icloud_cli_tools-0.1.1 → icloud_cli_tools-0.1.2}/src/icloud_cli/main.py

@@ -227,6 +227,62 @@ def reminders_add(
         error("Failed to create reminder.")
 
 
+@reminders.group("lists")
+def reminders_lists():
+    """Manage reminder lists."""
+    pass
+
+
+@reminders_lists.command("list")
+@pass_context
+def reminders_lists_list(ctx: AppContext):
+    """List reminder lists."""
+    from icloud_cli.services.reminders import RemindersService
+
+    service = RemindersService(ctx.auth.api, ctx.config)
+    items = service.list_reminder_lists()
+    render(items, format=ctx.format, title="Reminder Lists",
+           columns=["title", "count", "color", "id"])
+
+
+@reminders_lists.command("create")
+@click.argument("name")
+@click.option("--color", default="blue", help="List color.")
+@pass_context
+def reminders_lists_create(ctx: AppContext, name: str, color: str):
+    """Create a reminder list."""
+    from icloud_cli.services.reminders import RemindersService
+
+    service = RemindersService(ctx.auth.api, ctx.config)
+    list_id = service.create_list(name, color=color)
+    if list_id:
+        success(f"Reminder list '{name}' created.")
+    else:
+        error(f"Failed to create reminder list '{name}'.")
+
+
+@reminders.group("sections")
+def reminders_sections():
+    """Manage reminder list sections."""
+    pass
+
+
+@reminders_sections.command("create")
+@click.argument("list_name")
+@click.argument("section_name")
+@pass_context
+def reminders_sections_create(ctx: AppContext, list_name: str, section_name: str):
+    """Create a section in a reminder list."""
+    from icloud_cli.services.reminders import RemindersService
+
+    service = RemindersService(ctx.auth.api, ctx.config)
+    section_id = service.create_section(list_name=list_name, section_name=section_name)
+    if section_id:
+        success(f"Reminder section '{section_name}' created.")
+    else:
+        error(f"Failed to create reminder section '{section_name}'.")
+
+
 @reminders.command("complete")
 @click.argument("reminder_id")
 @pass_context

{icloud_cli_tools-0.1.1 → icloud_cli_tools-0.1.2}/src/icloud_cli/services/calendar.py

@@ -10,6 +10,7 @@ from typing import Any
 
 from dateutil import parser as dateutil_parser
 from pyicloud import PyiCloudService
+from pyicloud.services.calendar import EventObject
 
 from icloud_cli.config import Config
 
@@ -47,6 +48,23 @@ def _format_datetime(dt: Any) -> str:
             return dt
     if isinstance(dt, datetime):
         return dt.strftime("%Y-%m-%d %H:%M")
+    if isinstance(dt, list) and len(dt) >= 4:
+        # Calendar events come back as Apple's raw, packed-first list
+        # (pyicloud's get_events passes the response through untransformed):
+        #   [packed_str, year, month, day, hour, minute, tz_offset_minutes]
+        # (Reminders use pyicloud's typed API and return datetimes, not lists,
+        # so this function only ever sees the packed-first calendar shape.)
+        try:
+            parsed = datetime(
+                dt[1],
+                dt[2],
+                dt[3],
+                dt[4] if len(dt) > 4 else 0,
+                dt[5] if len(dt) > 5 else 0,
+            )
+            return parsed.strftime("%Y-%m-%d %H:%M")
+        except (IndexError, TypeError, ValueError):
+            return str(dt)
     if isinstance(dt, (int, float)):
         # Unix timestamp in milliseconds
         try:
@@ -80,7 +98,11 @@ class CalendarService:
         end = _parse_date(to_date, default=start + timedelta(days=7))
 
         try:
-            events = self.api.calendar.events(from_dt=start, to_dt=end)
+            cal_name = {
+                cal.get("guid"): cal.get("title", "")
+                for cal in self.api.calendar.get_calendars()
+            }
+            events = self.api.calendar.get_events(from_dt=start, to_dt=end)
         except Exception as e:
             from icloud_cli.output import error
             error(f"Failed to fetch events: {e}")
@@ -88,6 +110,7 @@ class CalendarService:
 
         result = []
         for event in events:
+            pguid = event.get("pGuid", "")
             result.append({
                 "id": event.get("guid", ""),
                 "title": event.get("title", "Untitled"),
@@ -97,7 +120,7 @@ class CalendarService:
                 "end": _format_datetime(
                     event.get("endDate") or event.get("localEndDate")
                 ),
-                "calendar": event.get("pGuid", ""),
+                "calendar": cal_name.get(pguid, pguid),
                 "location": event.get("location", ""),
                 "all_day": event.get("allDay", False),
             })
@@ -120,7 +143,7 @@ class CalendarService:
         end = now + timedelta(days=365)
 
         try:
-            events = self.api.calendar.events(from_dt=start, to_dt=end)
+            events = self.api.calendar.get_events(from_dt=start, to_dt=end)
         except Exception:
             return None
 
@@ -175,19 +198,33 @@ class CalendarService:
             return False
 
         try:
-            # Build event payload
-            event_data = {
-                "title": title,
-                "startDate": _datetime_to_icloud(start_dt),
-                "endDate": _datetime_to_icloud(end_dt),
-            }
-
-            if location:
-                event_data["location"] = location
+            calendars = self.api.calendar.get_calendars()
+            cal_guid = None
+            if calendar_name:
+                for cal in calendars:
+                    if cal.get("title", "").lower() == calendar_name.lower():
+                        cal_guid = cal.get("guid")
+                        break
+            if not cal_guid and calendars:
+                cal_guid = calendars[0].get("guid")
+            if not cal_guid:
+                from icloud_cli.output import error
+                error("No calendars found.")
+                return False
+
+            event_obj = EventObject(
+                pguid=cal_guid,
+                title=title,
+                start_date=start_dt,
+                end_date=end_dt,
+                location=location or "",
+            )
             if description:
-                event_data["description"] = description
-
-            self.api.calendar.create_event(**event_data)
+                # pyicloud's EventObject has no notes/description field, so notes
+                # cannot be persisted. Warn rather than dropping them silently.
+                from icloud_cli.output import warning
+                warning("Event notes are not supported by the backend and were not saved.")
+            self.api.calendar.add_event(event_obj)
             return True
         except Exception as e:
             from icloud_cli.output import error
@@ -204,14 +241,25 @@ class CalendarService:
             True if event was deleted successfully.
         """
         try:
-            self.api.calendar.delete_event(event_id)
+            now = datetime.now()
+            events = self.api.calendar.get_events(
+                from_dt=now - timedelta(days=365),
+                to_dt=now + timedelta(days=365),
+            )
+            pguid = None
+            for ev in events:
+                if ev.get("guid") == event_id:
+                    pguid = ev.get("pGuid")
+                    break
+            if not pguid:
+                from icloud_cli.output import error
+                error(f"Event '{event_id}' not found.")
+                return False
+
+            event_obj = self.api.calendar.get_event_detail(pguid, event_id, as_obj=True)
+            self.api.calendar.remove_event(event_obj)
             return True
         except Exception as e:
             from icloud_cli.output import error
             error(f"Failed to delete event: {e}")
             return False
-
-
-def _datetime_to_icloud(dt: datetime) -> list[int]:
-    """Convert a datetime to iCloud's date format [year, month, day, hour, minute]."""
-    return [dt.year, dt.month, dt.day, dt.hour, dt.minute]

{icloud_cli_tools-0.1.1 → icloud_cli_tools-0.1.2}/src/icloud_cli/services/findmy.py

@@ -30,9 +30,9 @@ class FindMyService:
             return []
 
         result = []
-        for device in devices:
+        for device in devices.values():
             status_data = device.status()
-            location = device.location()
+            location = device.location
 
             loc_str = ""
             if location and location.get("latitude") and location.get("longitude"):
@@ -69,7 +69,7 @@ class FindMyService:
             return None
 
         status_data = device.status()
-        location = device.location()
+        location = device.location
 
         if not location:
             from icloud_cli.output import warning
@@ -157,13 +157,13 @@ class FindMyService:
         name_lower = name.lower()
 
         # Exact match first
-        for device in devices:
+        for device in devices.values():
             status = device.status()
             if status.get("name", "").lower() == name_lower:
                 return device
 
         # Partial match
-        for device in devices:
+        for device in devices.values():
             status = device.status()
             if name_lower in status.get("name", "").lower():
                 return device