icalcli 1.1__tar.gz → 1.1.3__tar.gz

{icalcli-1.1 → icalcli-1.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: icalcli
-Version: 1.1
+Version: 1.1.3
 Summary: Icalendar Calendar Command Line Interface
 Home-page: https://github.com/jrvarma/icalcli
 Maintainer: Jayanth R. Varma

{icalcli-1.1 → icalcli-1.1.3}/icalcli/etesync_backend/etebase_crud.py

@@ -3,8 +3,9 @@
 # this is part of the etesync 2.0 backend
 # for etesync 1.0 backend see etesync_crud.py
 
-from etebase import Client, Account, FetchOptions
+from etebase import Client, Account, FetchOptions, Base64Url
 from time import sleep, time
+import json
 
 # The EtesyncCRUD class exposes methods for each of the CRUD operations
 # (Create, Retrieve, Update and Delete) and for sync with the server.
@@ -31,7 +32,9 @@ from time import sleep, time
 
 
 class EtebaseCRUD:
-    def __init__(self, user, server_url, password, calendar_uid, silent=True):
+
+    def __init__(self, user, server_url, password, calendar_uid,
+                 cache_file=None, silent=True):
         """Initialize
 
         Parameters
@@ -40,77 +43,95 @@ class EtebaseCRUD:
         password : etebase password
         server_url : url of etebase server
         calendar_uid : uid of calendar
+        cache_file: path to the cache file or None
         """
         client = Client(user, server_url)
         etebase = Account.login(client, user, password)
         col_mgr = etebase.get_collection_manager()
         collection = col_mgr.fetch(calendar_uid)
         self.item_mgr = col_mgr.get_item_manager(collection)
+        self.items = {}
+        self.stoken = None
+        self.raw_events = []
+        self.cache_file = cache_file
+        self.load_cache()
         self.sync(silent)
+        print("Reading all events")
+        self.get_all_events()
 
-    def create_event(self, event, uid):
+    def create_event(self, event, event_uid):
         """Create event
 
         Parameters
         ----------
         event : iCalendar file as bytes
         (calendar containing one event to be added)
+        event_uid : uid of event to be updated
         """
         item = self.item_mgr.create(
             {
-                "name": uid,
+                "name": event_uid,
                 "mtime": int(round(time() * 1000))
             },
             event
         )
         self.item_mgr.batch([item])
 
-    def update_event(self, event, uid):
+    def update_event(self, event, event_uid):
         """Edit event
 
         Parameters
         ----------
         event : iCalendar file as bytes
         (calendar containing one event to be updated)
-        uid : uid of event to be updated
+        event_uid : uid of event to be updated
         """
-        item = self.item_mgr.fetch(uid)
+        item = self.item_mgr.fetch(self.event_uid_to_item_uid[event_uid])
+        assert item.meta['name'] == event_uid
         item.content = event
+        # item.meta["mtime"] = int(round(time() * 1000))
         self.item_mgr.batch([item])
 
-    def retrieve_event(self, uid):
+    def retrieve_event(self, event_uid):
         r"""Retrieve event by uid
 
         Parameters
         ----------
-        uid : uid of event to be retrieved
+        event_uid : uid of event to be retrieved
 
         Returns
         -------
         iCalendar file (as a string)
         """
-        return self.item_mgr.fetch(uid).content.decode()
-
-    def all_events(self):
-        """Retrieve all events in calendar
-
-        Returns
-        -------
-        List of iCalendar files (as strings)
-        """
-        return [e.content.decode() for e in self.items.data if not e.deleted]
+        item = self.item_mgr.fetch(self.event_uid_to_item_uid[event_uid])
+        assert item.meta['name'] == event_uid
+        return item.content.decode()
 
-    def delete_event(self, uid):
+    def delete_event(self, event_uid):
         """Delete event and sync calendar
 
         Parameters
         ----------
         uid : uid of event to be deleted
         """
-        item = self.item_mgr.fetch(uid)
+        item = self.item_mgr.fetch(self.event_uid_to_item_uid[event_uid])
+        assert item.meta['name'] == event_uid
+        item.meta["mtime"] = int(round(time() * 1000))
         item.delete()
         self.item_mgr.batch([item])
 
+    def get_all_events(self):
+        """Retrieve all events in calendar
+
+        Returns
+        -------
+        List of iCalendar files (as strings)
+        """
+        self.event_uid_to_item_uid = {
+            e.meta['name']: e.uid for e in self.items.values()}
+        self.raw_events = [e.content.decode()
+                           for e in self.items.values() if not e.deleted]
+
     def sync(self, silent=False):
         """Initialize
 
@@ -121,17 +142,44 @@ class EtebaseCRUD:
         silent or print("Syncing with server. Please wait")
         msg = "etebase fetch attempt {:} failed. Will retry after {:} seconds"
         delay = 5
-        synced = False
+        done = False
+        chunk = 100
         for i in range(5):
             try:
-                self.items = self.item_mgr.list(FetchOptions().limit(10**6))
-                synced = True
+                while not done:
+                    items = self.item_mgr.list(
+                        FetchOptions().stoken(self.stoken).limit(chunk))
+                    self.items.update(
+                        {item.uid: item for item in items.data})
+                    self.stoken = items.stoken
+                    done = items.done
+                    # silent or print(".", end='')
                 break
             except Exception:
                 silent or print(msg.format(i+1, delay))
                 sleep(delay)
-        if synced:
+        if done:
             silent or print("Syncing completed.")
-            self.all_events()
+            self.save_cache()
         else:
             print("Syncing with server failed after 5 attempts")
+        return
+
+    def load_cache(self):
+        if self.cache_file:
+            d = json.load(open(self.cache_file))
+            if 'stoken' in d:
+                self.stoken = d['stoken']
+            if 'blobs' in d:
+                for cache_blob in d['blobs']:
+                    item = self.item_mgr.cache_load(
+                        Base64Url.from_base64(cache_blob))
+                    self.items[item.uid] = item
+
+    def save_cache(self):
+        if self.cache_file:
+            cache = dict(
+                stoken=self.stoken,
+                blobs=[Base64Url.to_base64(self.item_mgr.cache_save(item))
+                       for item in self.items.values()])
+            json.dump(cache, open(self.cache_file, 'w'))

{icalcli-1.1 → icalcli-1.1.3}/icalcli/etesync_backend/etebase_interface.py

@@ -26,15 +26,16 @@ from icalendar import Calendar
 # etes.create_event, etes.retrieve_event,
 # etes.update_event and etes.delete_event
 
-# The calling program must explicitly call etes.sync when needed. For example:
-# (a) if the server has been updated from another device
-# (b) after any CRUD operation other than Retrieve
+# The calling program must explicitly call sync() when the server
+# has been updated from another device
+# sync() is not needed after any CRUD operation
 
 # No exception handling is done. That is left to the calling program.
 
 
 class EtebaseInterface (EtebaseCRUD):
-    def __init__(self, user, server_url, password, calendar_uid, silent=True):
+    def __init__(self, user, server_url, password, calendar_uid,
+                 cache_file=None, silent=True):
         r"""Initialize EtebaseInterface
 
         Parameters
@@ -45,12 +46,14 @@ class EtebaseInterface (EtebaseCRUD):
         calendar_uid : uid of calendar
         """
         super(EtebaseInterface, self).__init__(
-            user, server_url, password, calendar_uid, silent)
+            user=user, server_url=server_url, password=password,
+            calendar_uid=calendar_uid, cache_file=cache_file, silent=silent)
+        print("Parsing all events")
         self.all_events()
 
     def all_events(self):
         self.events = [Calendar.from_ical(ev).walk('VEVENT')[0]
-                       for ev in EtebaseCRUD.all_events(self)]
+                       for ev in self.raw_events]
 
     def create_event(self, event, vtimezone=None):
         r"""Create event
@@ -60,7 +63,8 @@ class EtebaseInterface (EtebaseCRUD):
         event : event to be added (iCalendar object)
         """
         ics = self.event_to_ics(event, vtimezone)
-        EtebaseCRUD.create_event(self, ics)
+        uid = event.decoded('uid').decode()
+        EtebaseCRUD.create_event(self, ics, uid)
 
     def update_event(self, event, vtimezone=None):
         r"""Update event

{icalcli-1.1 → icalcli-1.1.3}/icalcli/icalcli.py

@@ -1317,7 +1317,8 @@ class IcalendarInterface:
                         continue
                 self.backend_interface.delete_event(self.uid(event))
                 self.printer.msg("Event deleted\n")
-                self.backend_cache_dirty = True
+                if self.backend_interface.sync_after_edit:
+                    self.backend_cache_dirty = True
                 deleted += 1
             self.printer.msg(f'{deleted} events deleted\n')
 
@@ -1454,6 +1455,8 @@ class IcalendarInterface:
             return self.raw_ics(original)
         default_event_duration = timedelta(minutes=30)
         old = None
+        if args.summary:
+            summary = args.summary
         if original:
             # simulate old = original.deepcopy()
             old = Calendar.from_ical(original.to_ical().decode())
@@ -1463,7 +1466,7 @@ class IcalendarInterface:
                 ('duration' in old and old.Decoded('duration')) or
                 (old.Decoded('dtend') - old.Decoded('dtstart')))
             if not args.summary:
-                args.summary = old.Decoded('summary').decode()
+                summary = old.Decoded('summary').decode()
             if (
                     not args.time and not (args.start and 'T' in args.start)
                     and self.isallday(old)
@@ -1477,7 +1480,7 @@ class IcalendarInterface:
                                gethostname())
             # old_start = self.now
             # old_duration = None
-            if not args.summary:
+            if not summary:
                 raise Exception('Summary must be specified')
             day = args.day or self.now.day
             month = args.month or self.now.month + (
@@ -1563,7 +1566,7 @@ class IcalendarInterface:
             add_or_change(event, field, parsed_value)
 
         add_or_change(event, 'last-modified', dtstamp)
-        add_or_change(event, 'summary', args.summary)
+        add_or_change(event, 'summary', summary)
         add_or_change(event, 'dtstart', self.calendar_timezone(start))
         add_or_change(event, 'dtend', self.calendar_timezone(end))
         if args.free:
@@ -1606,7 +1609,8 @@ class IcalendarInterface:
         self.printer.msg("Event %s\n" % ("updated" if old
                                          else "added"))
         self.iterate_events(None, [event], print_count=False)
-        self.backend_cache_dirty = True
+        if self.backend_interface.sync_after_edit:
+            self.backend_cache_dirty = True
         return True
 
     def raw_ics(self, original=None):
@@ -1721,6 +1725,14 @@ def repl(ecal=None):
             add_parser=get_add_parser(),
             backend_interface=config.backend_interface,
             printer=printer, **vars(FLAGS))
+        if not hasattr(ecal.backend_interface, "sync_after_edit"):
+            ecal.backend_interface.sync_after_edit = True
+            # The file and etesync 1.0 backends operate on the cache and
+            # they sync to server only when sync() is called
+            # Some backends may work directly on server
+            # and may require sync() only if server updated from another device
+            # Such backends can set the attribute sync_after_edit = False
+            # If attribute is missing, we assume it is True
         if hasattr(config, 'timezones') and 'tz' in config.timezones:
             IcalendarInterface.calendar_tz = config.timezones['tz']
         else:

{icalcli-1.1 → icalcli-1.1.3}/icalcli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: icalcli
-Version: 1.1
+Version: 1.1.3
 Summary: Icalendar Calendar Command Line Interface
 Home-page: https://github.com/jrvarma/icalcli
 Maintainer: Jayanth R. Varma

{icalcli-1.1 → icalcli-1.1.3}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
     long_description = fh.read()
 
 setup(name='icalcli',
-      version='1.1',
+      version='1.1.3',
       maintainer='Jayanth R. Varma',
       maintainer_email='jrvarma@gmail.com',
       description='Icalendar Calendar Command Line Interface',