allow to set caching time for pictures seperately

Author: tillsteinbach

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 ## [Unreleased]
 - Currently no unreleased changes
 
+## [0.19.0] - 2021-08-15
+### Added
+- Possibility to set caching time for picture downloads seperately
+
 ## [0.18.3] - 2021-08-14
 ### Fixed
 - Bug with failing picture download
@@ -217,7 +221,8 @@ Minor fix in observer interface
 ## [0.1.0] - 2021-05-26
 Initial release
 
-[unreleased]: https://github.com/tillsteinbach/WeConnect-python/compare/v0.18.3...HEAD
+[unreleased]: https://github.com/tillsteinbach/WeConnect-python/compare/v0.19.0...HEAD
+[0.19.0]: https://github.com/tillsteinbach/WeConnect-python/releases/tag/v0.19.0
 [0.18.3]: https://github.com/tillsteinbach/WeConnect-python/releases/tag/v0.18.3
 [0.18.2]: https://github.com/tillsteinbach/WeConnect-python/releases/tag/v0.18.2
 [0.18.1]: https://github.com/tillsteinbach/WeConnect-python/releases/tag/v0.18.1

weconnect/elements/vehicle.py

@@ -351,12 +351,12 @@ def updatePictures(self):  # noqa: C901
                 img = None
                 cacheDate = None
                 url = image['url']
-                if self.weConnect.maxAge is not None and self.weConnect.cache is not None and url in self.weConnect.cache:
+                if self.weConnect.maxAgePictures is not None and self.weConnect.cache is not None and url in self.weConnect.cache:
                     img, cacheDateString = self.weConnect.cache[url]
                     img = base64.b64decode(img)
                     img = Image.open(io.BytesIO(img))
                     cacheDate = datetime.fromisoformat(cacheDateString)
-                if img is None or self.weConnect.maxAge is None \
+                if img is None or self.weConnect.maxAgePictures is None \
                         or (cacheDate is not None and cacheDate < (datetime.utcnow() - timedelta(days=1))):
                     imageDownloadResponse = self.weConnect.session.get(url, stream=True)
                     if imageDownloadResponse.status_code == requests.codes['ok']:
@@ -382,7 +382,8 @@ def updatePictures(self):  # noqa: C901
                                                  f' Status Code was: {imageDownloadResponse.status_code}')
                         raise RetrievalError(f'Could not retrieve data. Status Code was: {imageDownloadResponse.status_code}')
                     else:
-                        LOG.warning('Failed downloading picture %s with status code %d', image['id'], imageDownloadResponse.status_code)
+                        LOG.warning('Failed downloading picture %s with status code %d will try again in next update', image['id'],
+                                    imageDownloadResponse.status_code)
 
                 if img is not None:
                     self.__carImages[image['id']] = img

weconnect/weconnect.py

@@ -68,6 +68,7 @@ def __init__(  # noqa: C901 # pylint: disable=too-many-arguments
         refreshTokens=True,
         fixAPI=True,
         maxAge=None,
+        maxAgePictures=None,
         updateCapabilities=True,
         updatePictures=True
     ):
@@ -85,6 +86,7 @@ def __init__(  # noqa: C901 # pylint: disable=too-many-arguments
         self.__cache = dict()
         self.fixAPI = fixAPI
         self.maxAge = maxAge
+        self.maxAgePictures = maxAgePictures
         self.latitude = None
         self.longitude = None
         self.searchRadius = None
@@ -164,19 +166,28 @@ def persistCacheAsJson(self, filename):
             json.dump(self.__cache, file, cls=DateTimeEncoder)
         LOG.info('Writing cachefile %s', filename)
 
-    def fillCacheFromJson(self, filename, maxAge):
+    def fillCacheFromJson(self, filename, maxAge, maxAgePictures=None):
         self.maxAge = maxAge
+        if maxAgePictures is None:
+            self.maxAgePictures = maxAge
+        else:
+            self.maxAgePictures = maxAgePictures
+
         with open(filename, 'r') as file:
             self.__cache = json.load(file)
         LOG.info('Reading cachefile %s', filename)
 
-    def fillCacheFromJsonString(self, jsonString, maxAge):
+    def fillCacheFromJsonString(self, jsonString, maxAge, maxAgePictures=None):
         self.maxAge = maxAge
+        if maxAgePictures is None:
+            self.maxAgePictures = maxAge
+        else:
+            self.maxAgePictures = maxAgePictures
+
         self.__cache = json.loads(jsonString)
         LOG.info('Reading cache from string')
 
-    def clearCache(self, maxAge):
-        self.maxAge = maxAge
+    def clearCache(self):
         self.__cache.clear()
         LOG.info('Clearing cache')