pytolino 1.4__tar.gz → 1.6__tar.gz

{pytolino-1.4/src/pytolino.egg-info → pytolino-1.6}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pytolino
-Version: 1.4
+Version: 1.6
 Summary: client for tolino cloud
 Author: Imam Usmani
 Project-URL: Source Code, https://github.com/ImamAzim/pytolino
@@ -23,6 +23,7 @@ Requires-Dist: sphinx; extra == "dev"
 Requires-Dist: build; extra == "dev"
 Requires-Dist: twine; extra == "dev"
 Requires-Dist: sphinx-rtd-theme; extra == "dev"
+Dynamic: license-file
 
 pytolino
 ===================

{pytolino-1.4 → pytolino-1.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pytolino"
-version = "1.4"
+version = "1.6"
 authors = [
     {name="Imam Usmani"},
 ]

{pytolino-1.4 → pytolino-1.6}/src/pytolino/tolino_cloud.py

@@ -6,11 +6,13 @@ import configparser
 import platform
 import logging
 from urllib.parse import urlparse, parse_qs
+from urllib3.util import Retry
 import json
 import time
 
 
 import requests
+from requests.adapters import HTTPAdapter
 import mechanize
 
 
@@ -27,6 +29,8 @@ servers_settings = configparser.ConfigParser()
 servers_settings.read(SERVERS_SETTINGS_FILE_PATH)
 
 PARTNERS = servers_settings.sections()
+TOTAL_RETRY =5
+STATUS_FORCELIST = [404]
 
 
 def main():
@@ -124,8 +128,17 @@ class Client(object):
         self.token_expires = None
 
         self.server_settings = servers_settings[server_name]
-        self.session = requests.session()
+        self.session = requests.Session()
+        retry_strategy = Retry(
+                total=TOTAL_RETRY,
+                status_forcelist=STATUS_FORCELIST,
+                backoff_factor=2,
+                allowed_methods=frozenset(['GET', 'POST']))
+        adapter = HTTPAdapter(max_retries=retry_strategy)
+        self.session.mount('http://', adapter)
+        self.session.mount('https://', adapter)
         self.browser = mechanize.Browser()
+        self.browser.set_handle_robots(False)
         self.server_name = server_name
 
     def login(self, username, password):
@@ -195,6 +208,7 @@ class Client(object):
                 allow_redirects=False,
                 )
         self._log_requests(host_response)
+
         try:
             j = host_response.json()
             self.access_token = j['access_token']

{pytolino-1.4 → pytolino-1.6/src/pytolino.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pytolino
-Version: 1.4
+Version: 1.6
 Summary: client for tolino cloud
 Author: Imam Usmani
 Project-URL: Source Code, https://github.com/ImamAzim/pytolino
@@ -23,6 +23,7 @@ Requires-Dist: sphinx; extra == "dev"
 Requires-Dist: build; extra == "dev"
 Requires-Dist: twine; extra == "dev"
 Requires-Dist: sphinx-rtd-theme; extra == "dev"
+Dynamic: license-file
 
 pytolino
 ===================

{pytolino-1.4 → pytolino-1.6}/tests/test_tolino_cloud.py

@@ -9,12 +9,14 @@ import os
 import unittest
 import configparser
 import logging
+import time
+import logging
 
 
 from pytolino.tolino_cloud import Client, PytolinoException
 
 
-logging.basicConfig(level=logging.INFO)
+# logging.basicConfig(level=logging.INFO)
 
 
 class TestClient(unittest.TestCase):
@@ -130,11 +132,12 @@ def upload_test():
     username, password = get_credentials()
     client = Client()
     client.login(username, password)
+    client.register()
     ebook_id = client.upload(EPUB_PATH)
     print(ebook_id)
     with open(EPUB_ID_PATH, 'w') as myfile:
         myfile.write(ebook_id)
-
+    client.unregister()
     client.logout()
 
 def collection_test():
@@ -165,12 +168,15 @@ def inventory_test():
     username, password = get_credentials()
     client = Client()
     client.login(username, password)
+    client.register()
     inventory = client.get_inventory()
+    client.unregister()
     client.logout()
     print(inventory[0].keys())
     for item in inventory:
         metadata = item['epubMetaData']
-        print(metadata.keys())
+        print(metadata['title'])
+        # print(metadata.keys())
 
 
 def delete_test():
@@ -186,20 +192,32 @@ def delete_test():
 
 
 def metadata_test():
-    new_metadata = dict(publisher='someone')
+
+    metadata = dict(
+            title='mytitle',
+            isbn='myisbn',
+            language='mylanguage',
+            author='myauthor',
+            publisher='mypublisher',
+            issued=time.time(),
+            )
     with open(EPUB_ID_PATH, 'r') as myfile:
         epub_id = myfile.read()
 
     username, password = get_credentials()
     client = Client()
     client.login(username, password)
-    client.upload_metadata(epub_id, **new_metadata)
+    client.register()
+
+    client.upload_metadata(epub_id, **metadata)
+
     inventory = client.get_inventory()
-    for item in inventory:
-        item_metadata = item['epubMetaData']
-        if item_metadata['identifier'] == epub_id:
-            for key, value in new_metadata.items():
-                print(item_metadata[key])
+    book = [el for el in inventory if el['epubMetaData']['identifier']==epub_id][0]
+    online_metadata = book['epubMetaData']
+    for key in metadata:
+        print(key, online_metadata[key])
+
+    client.unregister()
     client.logout()
 
 def add_cover_test():
@@ -220,7 +238,12 @@ def add_cover_test():
 
 
 if __name__ == '__main__':
+    logging.basicConfig(level=logging.INFO)
+    # register_test()
+    # unregister_test()
+    client_method_tests()
     # upload_test()
-    add_cover_test()
+    # delete_test()
+    # add_cover_test()
     # metadata_test()
     # inventory_test()