WIP: uploading of modified events

Locally modified events don't get overwritten anymore and or uploaded.
Might actually be working properly now, needs more testing

Also: made _create_timezone take pytz.tzinfo

Author: geier

khal/backend.py

@@ -217,6 +217,9 @@ def needs_update(self, account_name, href_etag_list):
     def update(self, vevent, account_name, href='', etag='', status=OK):
         """insert a new or update an existing card in the db
 
+        This is mostly a wrapper around two SQL statements, doing some cleanup
+        before.
+
         :param vcard: vcard to be inserted or updated
         :type vcard: unicode
         :param href: href of the card on the server, if this href already
@@ -343,7 +346,7 @@ def update_href(self, oldhref, newhref, account_name, etag='', status=OK):
             self.sql_ex(sql_s, (newhref, oldhref))
 
     def href_exists(self, href, account_name):
-        """returns True if href already exist in db
+        """returns True if href already exists in db
 
         :param href: href
         :type href: str()
@@ -493,8 +496,11 @@ def get_vevent_from_db(self, href, account_name, start=None, end=None,
         """returns the Event matching href, if start and end are given, a
         specific Event from a Recursion set is returned, the Event as saved in
         the db
+
+        All other parameters given to this function are handed over to the
+        Event.
         """
-        sql_s = 'SELECT vevent, status FROM {0} WHERE href=(?)'.format(account_name)
+        sql_s = 'SELECT vevent, status, etag FROM {0} WHERE href=(?)'.format(account_name)
         result = self.sql_ex(sql_s, (href, ))
         return Event(result[0][0],
                      local_tz =self.conf.default.local_timezone,
@@ -506,10 +512,11 @@ def get_vevent_from_db(self, href, account_name, start=None, end=None,
                      account=account_name,
                      status=result[0][1],
                      readonly=readonly,
+                     etag=result[0][2],
                      unicode_symbols=unicode_symbols)
 
     def get_changed(self, account_name):
-        """returns list of hrefs of locally edited vcards
+        """returns list of hrefs of locally edited vevents
         """
         sql_s = 'SELECT href FROM {0} WHERE status == (?)'.format(account_name)
         result = self.sql_ex(sql_s, (CHANGED, ))

khal/caldav.py

@@ -349,20 +349,20 @@ def _create_calendar(self):
 
         return calendar
 
-
-    def _create_timezone(self,conf):
+    def _create_timezone(self, tz):
         """
-        create the timezone information
+        create an icalendar timezone from a pytz.tzinfo
 
-        :param conf: the configuration settings
-        :type conf: Namespace()
+        :param tz: the timezone
+        :type conf: pytz.tzinfo
         :returns: timezone information set
         :rtype: icalendar.Timezone()
         """
         timezone = icalendar.Timezone()
-        tz = conf.default.default_timezone
         timezone.add('TZID', tz)
-        daylight, standard = [(num, dt) for num,dt in enumerate(tz._utc_transition_times) if dt.year == datetime.datetime.today().year]
+
+        # FIXME should match year of the event, not this year
+        daylight, standard = [(num, dt) for num, dt in enumerate(tz._utc_transition_times) if dt.year == datetime.datetime.today().year]
 
         timezone_daylight = icalendar.TimezoneDaylight()
         timezone_daylight.add('TZNAME', tz._transition_info[daylight[0]][2])
@@ -395,7 +395,7 @@ def upload(self, conf, vevent):
         """
         self._check_write_support()
         calendar = self._create_calendar()
-        timezone = self._create_timezone(conf)
+        timezone = self._create_timezone(conf.default.default_timezone)  # FIXME
         calendar.add_component(timezone)
         calendar.add_component(vevent)
 
@@ -420,3 +420,38 @@ def upload(self, conf, vevent):
 
                 return (parsed_url.path, etag)
         response.raise_for_status()
+
+    def update(self, vevent, href, etag):
+        """
+        updates a modified event on the server
+
+        :param vevent: the event to upload
+        :type vevent: icalendar.cal.Event
+        :param href: the href of the event
+        :type href: str
+        :param etag: etag of the event
+        :type etag: str
+        :returns: new etag (if the server returns it)
+        :rtype: str or None
+        """
+        self._check_write_support()
+        calendar = self._create_calendar()
+        if (vevent['DTSTART'].dt, 'tzinfo'):  # FIXME as most other timezone related stuff
+            timezone = self._create_timezone(vevent['DTSTART'].dt.tzinfo)
+            calendar.add_component(timezone)
+        calendar.add_component(vevent)
+
+        remotepath = str(self.url.base + href)
+        headers = self.headers
+        headers['content-type'] = 'text/calendar'
+        headers['If-Match'] = etag
+        response = requests.put(remotepath,
+                                data=calendar.to_ical(),
+                                headers=headers,
+                                **self._settings)
+        response.raise_for_status()
+
+        if 'etag' in response.headers.keys():
+            return response.headers['etag']
+        else:
+            return None

khal/controllers.py

@@ -137,6 +137,12 @@ def __init__(self, conf, sync_account_name):
                          'you need to enable write support to use this feature'
                          ', see the documentation.')
 
+        # syncing locally modified events
+        hrefs = self.dbtool.get_changed(sync_account.name)
+        for href in hrefs:
+            event = self.dbtool.get_vevent_from_db(href, sync_account.name)
+            etag = self.syncer.update(event.vevent, event.href, event.etag)
+
         # looking for events deleted on the server but still in the local db
         locale_hrefs = self.dbtool.hrefs_by_time_range(start_utc,
                                                        end_utc,

khal/model.py

@@ -33,7 +33,7 @@
 class Event(object):
     def __init__(self, ical, status=0, href=None, account=None, local_tz=None,
                  default_tz=None, start=None, end=None, color=None,
-                 readonly=False, unicode_symbols=True, dbtool=None):
+                 readonly=False, unicode_symbols=True, dbtool=None, etag=None):
         self.vevent = icalendar.Event.from_ical(ical)
         if account is None:
             raise TypeError('account must not be None')
@@ -45,6 +45,7 @@ def __init__(self, ical, status=0, href=None, account=None, local_tz=None,
         self.readonly = readonly
         self.unicode_symbols = unicode_symbols
         self.dbtool = dbtool
+        self.etag = etag
 
         if unicode_symbols:
             self.recurstr = u' ⟳'
@@ -110,6 +111,8 @@ def compact(self, day, timeformat='%H:%M'):
             status = 'X '
         elif self.status == NEW:
             status = 'N '
+        elif self.status == CHANGED:
+            status = 'M '
         else:
             status = ''
         if self.allday:

khal/ui/__init__.py

@@ -804,6 +804,7 @@ def save(self, button):
             self.dbtool.update(self.event.vevent.to_ical(),
                                self.event.account,
                                self.event.href,
+                               etag=self.event.etag,
                                status=status)
         self.cancel(refresh=True)