More hacks to ignore errors from Google Calendar

Author: telotortium

vdirsyncer/http.py

@@ -143,7 +143,9 @@ async def request(
 
     logger.debug(response.status)
     logger.debug(response.headers)
-    logger.debug(response.content)
+    if (response.status >= 400 and hasattr(response, 'content')
+            and hasattr(response.content, '_buffer')):
+        logger.debug(response.content._buffer)
 
     if response.status == 412:
         raise exceptions.PreconditionFailed(response.reason)

vdirsyncer/storage/dav.py

@@ -597,11 +597,22 @@ async def update(self, href, item, etag):
         except aiohttp.ClientResponseError as e:
             if e.status == 409:
                 dav_logger.debug("Conflict, will delete old event and recreate it.")
-                await self.delete(self._normalize_href(href), None)
-                dav_logger.debug("Now trying again")
-                href, etag = await self._put(self._normalize_href(href), item, None)
+                try:
+                    await self.delete(self._normalize_href(href), None)
+                    dav_logger.debug("Now trying again")
+                    rv = await self._put(self._normalize_href(href), item, None)
+                except aiohttp.ClientResponseError as delerr:
+                    dav_logger.debug(f"delerr.status = {delerr.status}")
+                    if delerr.status == 404:
+                        dav_logger("Old event not found, ignoring")
+                        rv = None, None
+                    else:
+                        raise
+            elif e.status == 403:
+                dav_logger.debug("Google Calendar refusing update, ignore")
+                rv = None, None
             else:
-                raise e
+                raise
         return etag
 
     async def upload(self, item: Item):
@@ -611,11 +622,22 @@ async def upload(self, item: Item):
         except aiohttp.ClientResponseError as e:
             if e.status == 409:
                 dav_logger.debug("Conflict, will delete old event and recreate it.")
-                await self.delete(href, None)
-                dav_logger.debug("Now trying again")
-                rv = await self._put(href, item, None)
+                try:
+                    await self.delete(href, None)
+                    dav_logger.debug("Now trying again")
+                    rv = await self._put(href, item, None)
+                except aiohttp.ClientResponseError as delerr:
+                    dav_logger.debug(f"delerr.status = {delerr.status}")
+                    if delerr.status == 404:
+                        dav_logger.debug("Old event not found, ignoring")
+                        rv = None, None
+                    else:
+                        raise
+            elif e.status == 403:
+                dav_logger.debug("Google Calendar refusing update, ignore")
+                rv = None, None
             else:
-                raise e
+                raise
         return rv
 
     async def delete(self, href, etag):

vdirsyncer/sync/__init__.py

@@ -209,7 +209,6 @@ async def _run_impl(self, a, b):
                 )
             )
             href, etag = await self.dest.storage.upload(self.item)
-            assert href is not None
 
         self.dest.status.insert_ident(
             self.ident, ItemMetadata(href=href, hash=self.item.hash, etag=etag)