pytolino 1.6__py3-none-any.whl → 1.7__py3-none-any.whl

pytolino/tolino_cloud.py

@@ -29,7 +29,7 @@ servers_settings = configparser.ConfigParser()
 servers_settings.read(SERVERS_SETTINGS_FILE_PATH)
 
 PARTNERS = servers_settings.sections()
-TOTAL_RETRY =5
+TOTAL_RETRY = 5
 STATUS_FORCELIST = [404]
 
 
@@ -42,23 +42,41 @@ class Client(object):
 
     """create a client to communicate with a tolino partner (login, etc..)"""
 
-    def _log_requests(self, host_response):
-        logging.info('-------------------- HTTP response --------------------')
-        logging.info(f'status code: {host_response.status_code}')
-        logging.info(f'cookies: {host_response.cookies}')
-        logging.info(f'headers: {host_response.headers}')
+    def _log_requests(self, host_response, error: True or None=None):
+        if host_response.status_code >= 400 or error is True:
+            logger = logging.error
+        else:
+            logger = logging.debug
+        logger('log request')
+        logger('---------------- HTTP response (requests)----------')
+        logger(f'status code: {host_response.status_code}')
+        logger(f'cookies: {host_response.cookies}')
+        logger(f'headers: {host_response.headers}')
         try:
             j = host_response.json()
-            logging.debug(f'json: {j}')
+            logger(f'json: {j}')
         except requests.JSONDecodeError:
-            logging.debug(f'text: {host_response.text}')
-        logging.info('-------------------------------------------------------')
+            logger(f'text: {host_response.text}')
+        logger('-------------------------------------------------------')
+
+        try:
+            host_response.raise_for_status()
+        except requests.exceptions.HTTPError as e:
+            raise PytolinoException
+        except requests.exceptions.RequestException as e:
+            raise PytolinoException
 
     def _log_mechanize(self, host_response):
-        logging.info('-------------------- HTTP response --------------------')
-        logging.info(f'status code: {host_response.code}')
-        logging.info(f'headers: {host_response.info()}')
-        logging.info('-------------------------------------------------------')
+        logging.debug('-------------- HTTP response (mechanize)--------------')
+        logging.debug(f'status code: {host_response.code}')
+        logging.debug(f'headers: {host_response.info()}')
+        logging.debug('-------------------------------------------------------')
+        if host_response.code >= 400:
+            logging.error('-------------- HTTP response (mechanize)----------')
+            logging.error(f'status code: {host_response.code}')
+            logging.error(f'headers: {host_response.info()}')
+            logging.error('--------------------------------------------------')
+            raise PytolinoException('http error')
 
     def _hardware_id():
 
@@ -159,7 +177,7 @@ class Client(object):
         for cookie in self.browser.cookiejar:
             self.session.cookies.set(cookie.name, cookie.value)
 
-        logging.info(self.server_settings['login_cookie'])
+        logging.debug(self.server_settings['login_cookie'])
         self._log_mechanize(host_response)
         if not self.server_settings['login_cookie'] in self.session.cookies:
             raise PytolinoException(f'login to {self.server_name} failed.')
@@ -191,7 +209,8 @@ class Client(object):
                 host_response.headers['Location']
                 ).query)
             auth_code = params['code'][0]
-        except ValueError:
+        except KeyError:
+            self._log_requests(host_response, error=True)
             raise PytolinoException('oauth code request failed.')
 
         # Fetch OAUTH access token
@@ -510,7 +529,8 @@ class Client(object):
 
         :book_id: id of the book on the serveer
         :filepath: path to the cover file
-        :file_ext: png, jpg or jpeg. only necessary if the filepath has no extension
+        :file_ext: png, jpg or jpeg. only necessary if the
+        filepath has no extension
 
         """
 
@@ -525,8 +545,8 @@ class Client(object):
 
         host_response = self.session.post(
                 self.server_settings['cover_url'],
-                files = [('file', ('1092560016', open(filepath, 'rb'), mime))],
-                data = {'deliverableId': book_id},
+                files=[('file', ('1092560016', open(filepath, 'rb'), mime))],
+                data={'deliverableId': book_id},
                 headers={
                     't_auth_token': self.access_token,
                     'hardware_id': self.hardware_id,

{pytolino-1.6.dist-info → pytolino-1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytolino
-Version: 1.6
+Version: 1.7
 Summary: client for tolino cloud
 Author: Imam Usmani
 Project-URL: Source Code, https://github.com/ImamAzim/pytolino

pytolino-1.7.dist-info/RECORD

@@ -0,0 +1,8 @@
+pytolino/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pytolino/servers_settings.ini,sha256=IDhstCWbLHaMj3qEOYcbDABaIUKHIz1jEBke3uSE8bI,1473
+pytolino/tolino_cloud.py,sha256=K3eeV2Zj6IgyoGEhCerTnawBJkOm8aUhz4ZrojQUayQ,20072
+pytolino-1.7.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pytolino-1.7.dist-info/METADATA,sha256=UsWaJ9s46hClOr2k6rKSwNPjCUTmEJ6nF82JAvVC1r4,3725
+pytolino-1.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pytolino-1.7.dist-info/top_level.txt,sha256=3stGCqihEMMqlWGkME45OTJ0Prg-FO_kl554rtYNeuU,9
+pytolino-1.7.dist-info/RECORD,,

pytolino-1.6.dist-info/RECORD

@@ -1,8 +0,0 @@
-pytolino/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pytolino/servers_settings.ini,sha256=IDhstCWbLHaMj3qEOYcbDABaIUKHIz1jEBke3uSE8bI,1473
-pytolino/tolino_cloud.py,sha256=HwrEil5FT-L-4jebc4mC9ThdlgEUGIGc719wqbJpBdY,19239
-pytolino-1.6.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pytolino-1.6.dist-info/METADATA,sha256=FkfXV1lncQyg66TrLTI_l_rGLQ2VjBq6CCuB-MUMvks,3725
-pytolino-1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pytolino-1.6.dist-info/top_level.txt,sha256=3stGCqihEMMqlWGkME45OTJ0Prg-FO_kl554rtYNeuU,9
-pytolino-1.6.dist-info/RECORD,,