pycupra 0.0.3__py3-none-any.whl → 0.0.5__py3-none-any.whl

pycupra/__version__.py

@@ -3,4 +3,4 @@ pycupra - A Python 3 library for interacting with the My Cupra/My Seat portal.
 
 For more details and documentation, visit the github page at https://github.com/WulfgarW/pycupra
 """
-__version__ = "0.0.3"
+__version__ = "0.0.5"

pycupra/connection.py

@@ -15,6 +15,8 @@ import string
 import secrets
 import xmltodict
 
+from PIL import Image
+from io import BytesIO
 from sys import version_info, argv
 from datetime import timedelta, datetime, timezone
 from urllib.parse import urljoin, parse_qs, urlparse, urlencode
@@ -153,6 +155,7 @@ class Connection:
             if os.path.isfile(self._tokenFile):
                 with open(self._tokenFile, "r") as f:
                     tokenString=f.read()
+                f.close()
                 tokens=json.loads(tokenString)
                 self._session_tokens[brand]=tokens
                 self._user_id=tokens['user_id']
@@ -171,6 +174,7 @@ class Connection:
         try:
             with open(self._tokenFile, "w") as f:
                 f.write(json.dumps(self._session_tokens[brand]))
+            f.close()
             return True
         except Exception as e:
             _LOGGER.warning(f'writeTokenFile() not successful. Error: {e}')
@@ -193,6 +197,7 @@ class Connection:
             with open(f'./www/image_{imageName}.png', "wb") as f:
                 f.write(imageData)
             imageDict[imageName]=f'/local/image_{imageName}.png'
+            f.close()
             return True
         except:
             _LOGGER.warning('writeImageFile() not successful. Ignoring this problem.')
@@ -937,6 +942,26 @@ class Connection:
                             if len(pic)>0:
                                 loop = asyncio.get_running_loop()
                                 await loop.run_in_executor(None, self.writeImageFile, pos,pic, images)
+                            if pos=='front':
+                                # Crop the front image to a square format
+                                try:
+                                    im= Image.open(BytesIO(pic))
+                                    width, height = im.size
+                                    if height>width:
+                                        width, height = height, width
+                                    # Setting the points for cropped image
+                                    left = (width-height)/2
+                                    top = 0
+                                    right = height+(width-height)/2
+                                    bottom = height
+                                    # Cropped image of above dimension
+                                    im1 = im.crop((left, top, right, bottom))
+                                    byteIO = BytesIO()
+                                    im1.save(byteIO, format='PNG')
+                                    await loop.run_in_executor(None, self.writeImageFile, pos+'_cropped',byteIO.getvalue(), images)
+                                except:
+                                    _LOGGER.warning('Cropping front image to square format failed.')
+ 
                     _LOGGER.debug('Read images from web site and wrote them to file.')
                     response['images']=images
                     return response

pycupra/dashboard.py

@@ -711,8 +711,8 @@ class DepartureTimer1(Switch):
 
     @property
     def state(self):
-        status = self.vehicle.departure1.get("timerProgrammedStatus", "")
-        if status == "programmed":
+        status = self.vehicle.departure1.get("enabled", "")
+        if status:
             return True
         else:
             return False
@@ -743,8 +743,8 @@ class DepartureTimer2(Switch):
 
     @property
     def state(self):
-        status = self.vehicle.departure2.get("timerProgrammedStatus", "")
-        if status == "programmed":
+        status = self.vehicle.departure2.get("enabled", "")
+        if status:
             return True
         else:
             return False
@@ -774,8 +774,8 @@ class DepartureTimer3(Switch):
 
     @property
     def state(self):
-        status = self.vehicle.departure3.get("timerProgrammedStatus", "")
-        if status == "programmed":
+        status = self.vehicle.departure3.get("enabled", "")
+        if status:
             return True
         else:
             return False

pycupra/vehicle.py

@@ -122,7 +122,7 @@ class Vehicle:
                     self.get_charger(),
                     self.get_timerprogramming(),
                     self.get_basiccardata(),
-                    self.get_modelimageurl(),
+                    #self.get_modelimageurl(), #commented out because getting the images once in discover() should be sufficient
                     return_exceptions=True
                 )
             except:
@@ -147,16 +147,15 @@ class Vehicle:
     async def get_preheater(self):
         """Fetch pre-heater data if function is enabled."""
         _LOGGER.info('get_preheater() not implemented yet')
-        raise
-        if self._relevantCapabilties.get('#dont know the name for the preheater capability', {}).get('active', False):
-            if not await self.expired('rheating_v1'):
-                data = await self._connection.getPreHeater(self.vin, self._apibase)
-                if data:
-                    self._states.update(data)
-                else:
-                    _LOGGER.debug('Could not fetch preheater data')
-        else:
-            self._requests.pop('preheater', None)
+        #if self._relevantCapabilties.get('#dont know the name for the preheater capability', {}).get('active', False):
+        #    if not await self.expired('rheating_v1'):
+        #        data = await self._connection.getPreHeater(self.vin, self._apibase)
+        #        if data:
+        #            self._states.update(data)
+        #        else:
+        #            _LOGGER.debug('Could not fetch preheater data')
+        #else:
+        #    self._requests.pop('preheater', None)
 
     async def get_climater(self):
         """Fetch climater data if function is enabled."""
@@ -913,7 +912,7 @@ class Vehicle:
             if expired > timestamp:
                 self._requests.get('refresh', {}).pop('id')
             else:
-                raise SeatRequestInProgressException('A data refresh request is already in progress')
+                raise SeatRequestInProgressException('Last data refresh request less than 3 minutes ago')
         try:
             self._requests['latest'] = 'Refresh'
             response = await self._connection.setRefresh(self.vin, self._apibase)
@@ -1028,18 +1027,19 @@ class Vehicle:
     @property
     def model_image_small(self):
         """Return URL for model image"""
-        return self._modelimages.get('images','').get('front','')
+        return self._modelimages.get('images','').get('front_cropped','')
 
     @property
     def is_model_image_small_supported(self):
         """Return true if model image url is not None."""
         if self._modelimages is not None:
-            return True
+            if self._modelimages.get('images','').get('front_cropped','')!='':
+                return True
 
     @property
     def model_image_large(self):
         """Return URL for model image"""
-        return self._modelimages.get('images','').get('side', '')
+        return self._modelimages.get('images','').get('front', '')
 
     @property
     def is_model_image_large_supported(self):
@@ -2452,11 +2452,12 @@ class Vehicle:
     @property
     def refresh_data(self):
         """Get state of data refresh"""
-        if self._requests.get('refresh', {}).get('id', False):
-            timestamp = self._requests.get('refresh', {}).get('timestamp', DATEZERO)
-            expired = datetime.now() - timedelta(minutes=2)
-            if expired < timestamp:
-                return True
+        #if self._requests.get('refresh', {}).get('id', False):
+        #    timestamp = self._requests.get('refresh', {}).get('timestamp', DATEZERO)
+        #    expired = datetime.now() - timedelta(minutes=2)
+        #    if expired < timestamp:
+        #        return True
+        #State is always false
         return False
 
     @property

{pycupra-0.0.3.dist-info → pycupra-0.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycupra
-Version: 0.0.3
+Version: 0.0.5
 Summary: A library to read and send vehicle data via Cupra/Seat portal using the same API calls as the MyCupra/MySeat mobile app.
 Home-page: https://github.com/WulfgarW/pycupra
 Author: WulfgarW

pycupra-0.0.5.dist-info/RECORD

@@ -0,0 +1,13 @@
+pycupra/__init__.py,sha256=VPzUfKd5mBFD1UERNV61FbGHih5dQPupLgIfYtmIUi4,230
+pycupra/__version__.py,sha256=pbFZ_GKa38mHgdQKZpGKVzHcmF4OGZEi3EgIrJ-6wRo,207
+pycupra/connection.py,sha256=9Ha_zlAi6Cw6gNI1OA8roCoIJOEa1ZYgnRVO_Uk5c8s,77628
+pycupra/const.py,sha256=Mx9pPZifQBpn9lTsLH8R7xkUHrXRvul8w_b6LLLD7gE,10038
+pycupra/dashboard.py,sha256=7sVQI10lMspAOfVOlMEvMlndiNlUxjpWoNobUU9CZrw,37636
+pycupra/exceptions.py,sha256=Nq_F79GP8wjHf5lpvPy9TbSIrRHAJrFMo0T1N9TcgSQ,2917
+pycupra/utilities.py,sha256=cH4MiIzT2WlHgmnl_E7rR0R5LvCXfDNvirJolct50V8,2563
+pycupra/vehicle.py,sha256=ea2InLdtWV1NNKG6V3VgYj-VJPe4IDVapB7aB14IKDQ,108646
+pycupra-0.0.5.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+pycupra-0.0.5.dist-info/METADATA,sha256=xjH9t2ZtKIuMSPUTt4y_a9pD_jKRP25UZsEccpIoY4s,2578
+pycupra-0.0.5.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+pycupra-0.0.5.dist-info/top_level.txt,sha256=9Lbj_jG4JvpGwt6K3AwhWFc0XieDnuHFOP4x44wSXSQ,8
+pycupra-0.0.5.dist-info/RECORD,,

pycupra-0.0.3.dist-info/RECORD

@@ -1,13 +0,0 @@
-pycupra/__init__.py,sha256=VPzUfKd5mBFD1UERNV61FbGHih5dQPupLgIfYtmIUi4,230
-pycupra/__version__.py,sha256=vOTajmv3IRptr-g9nG6y6xUN06JYKI_30Dty1N88ekk,207
-pycupra/connection.py,sha256=9EXvTbBZJTcCAef5mYuvldAxBcNnxxxCdPZfi2_TtdM,76264
-pycupra/const.py,sha256=Mx9pPZifQBpn9lTsLH8R7xkUHrXRvul8w_b6LLLD7gE,10038
-pycupra/dashboard.py,sha256=a62F3Zsw2UyBUjYFOrhnqdSk2o2cSkSvmj67FwO8taw,37726
-pycupra/exceptions.py,sha256=Nq_F79GP8wjHf5lpvPy9TbSIrRHAJrFMo0T1N9TcgSQ,2917
-pycupra/utilities.py,sha256=cH4MiIzT2WlHgmnl_E7rR0R5LvCXfDNvirJolct50V8,2563
-pycupra/vehicle.py,sha256=v9U_cBQGXwa8dsmqyfQZm2WGOZ9uKqWW7FoiO4JsAw0,108436
-pycupra-0.0.3.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-pycupra-0.0.3.dist-info/METADATA,sha256=scTdNoBQznv8WlxbYmU0MDLOEpYkyp_j9EFaeLr8tkM,2578
-pycupra-0.0.3.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-pycupra-0.0.3.dist-info/top_level.txt,sha256=9Lbj_jG4JvpGwt6K3AwhWFc0XieDnuHFOP4x44wSXSQ,8
-pycupra-0.0.3.dist-info/RECORD,,