Merge pull request #16 from gutenbergtools/fix_pdf

small nitfixes
2019-06-19 15:11:54 -04:00 · 2019-06-19 15:11:54 -04:00 · 23ebd732f2
parent ca572a6b28 44065bd02a
commit 23ebd732f2
5 changed files with 103 additions and 99 deletions
--- a/CherryPyApp.py
+++ b/CherryPyApp.py
@ -35,7 +35,9 @@ import i18n_tool
 builtins._ = i18n_tool.ugettext
 builtins.__ = i18n_tool.ungettext

+# this import causes ConnectionPool.ConnectionPool to become the cherrypy connection pool
 import ConnectionPool
+
 import Page
 import StartPage
 import SuggestionsPage
--- a/Dropbox.py
+++ b/Dropbox.py
@ -57,9 +57,11 @@ class Dropbox (CloudStorage.CloudStorage):
            'Content-Type'    : 'application/octet-stream',
            'Dropbox-API-Arg' : json.dumps (parameters)
        }
-        with closing (session.post (self.upload_endpoint,
-                                    data = response.content,
-                                    headers = headers)) as r:
-            if 'error_summary' in r.text:
-                CloudStorage.error_log (r.text)
-            r.raise_for_status ()
+        data = response.content
+        with session as s:
+            with closing (s.post (self.upload_endpoint,
+                                        data = data,
+                                        headers = headers)) as r:
+                if 'error_summary' in r.text:
+                    CloudStorage.error_log (r.text)
+                r.raise_for_status ()
--- a/GDrive.py
+++ b/GDrive.py
@ -54,19 +54,20 @@ class GDrive (CloudStorage.CloudStorage):
        }
        headers = {
            'X-Upload-Content-Type': request.headers['Content-Type'],
-            'X-Upload-Content-Length': request.headers['Content-Length'],
+            'X-Upload-Content-Length': str(len(request.content)),
            'Content-Type': 'application/json; charset=UTF-8',
        }
-        with closing (session.post (self.upload_endpoint,
-                                    data = json.dumps (file_metadata),
-                                    headers = headers)) as r2:
-            r2.raise_for_status ()
-            session_uri = r2.headers['Location']
+        with session as s:
+            with closing (s.post (self.upload_endpoint,
+                                        data = json.dumps (file_metadata),
+                                        headers = headers)) as r2:
+                r2.raise_for_status ()
+                session_uri = r2.headers['Location']

-        headers = {
-            'Content-Type': request.headers['Content-Type'],
-        }
-        with closing (session.put (session_uri,
-                                   data = request.iter_content (1024 * 1024),
-                                   headers = headers)) as r3:
-            r3.raise_for_status ()
+            headers = {
+                'Content-Type': request.headers['Content-Type'],
+            }
+            with closing (s.put (session_uri,
+                                       data = request.iter_content (1024 * 1024),
+                                       headers = headers)) as r3:
+                r3.raise_for_status ()
--- a/MSDrive.py
+++ b/MSDrive.py
@ -50,7 +50,7 @@ class MSDrive(CloudStorage.CloudStorage):
            'description': 'A Project Gutenberg Ebook',
            "@microsoft.graph.conflictBehavior": "rename", 
        }
-        filesize = int(response.headers['Content-Length'])
+        filesize = len(response.content)
        url = self.upload_endpoint.format(filename=filename)
        chunk_size = 327680 # weird onedrive thing related to FAT tables
        upload_data = session.post(url, json={'item': item_data}).json()
@ -60,21 +60,20 @@ class MSDrive(CloudStorage.CloudStorage):
                'Content-Length': str(end - start + 1),
                'Content-Range': 'bytes {}-{}/{}'.format(start, end, filesize)
            }
+        with session as s:
+            if 'uploadUrl' in upload_data:
+                session_uri = upload_data['uploadUrl']
+                start = 0
+                end = min(chunk_size - 1, filesize - 1)

-        if 'uploadUrl' in upload_data:
-            session_uri = upload_data['uploadUrl']
-            start = 0
-            end = min(chunk_size - 1, filesize - 1)
-
-            for chunk in response.iter_content(chunk_size):
-                r = session.put(
-                    session_uri,
-                    data=chunk,
-                    headers=headers(start, end, filesize),
-                )
-                start = start + chunk_size
-                end = min(end + chunk_size, filesize - 1)
-                r.raise_for_status()
-        else:
-            CloudStorage.log('no uploadUrl in %s' % upload_data)
-        session.close()
+                for chunk in response.iter_content(chunk_size):
+                    r = s.put(
+                        session_uri,
+                        data=chunk,
+                        headers=headers(start, end, filesize),
+                    )
+                    start = start + chunk_size
+                    end = min(end + chunk_size, filesize - 1)
+                    r.raise_for_status()
+            else:
+                CloudStorage.log('no uploadUrl in %s' % upload_data)
--- a/Pipfile.lock
+++ b/Pipfile.lock
@ -18,11 +18,11 @@
    "default": {
        "babel": {
            "hashes": [
-                "sha256:6778d85147d5d85345c14a26aada5e478ab04e39b078b0745ee6870c2b5cf669",
-                "sha256:8cba50f48c529ca3fa18cf81fa9403be176d374ac4d60738b839122dfaaa3d23"
+                "sha256:af92e6106cb7c55286b25b38ad7695f8b4efb36a90ba483d7f7a6628c46158ab",
+                "sha256:e86135ae101e31e2c8ec20a4e0c5220f4eed12487d5cf3f78be7e98d3a57fc28"
            ],
            "index": "pypi",
-            "version": "==2.6.0"
+            "version": "==2.7.0"
        },
        "backports.functools-lru-cache": {
            "hashes": [
@ -33,10 +33,10 @@
        },
        "certifi": {
            "hashes": [
-                "sha256:59b7658e26ca9c7339e00f8f4636cdfe59d34fa37b9b04f6f9e9926b3cece1a5",
-                "sha256:b26104d6835d1f5e49452a26eb2ff87fe7090b89dfcaee5ea2212697e1e1d7ae"
+                "sha256:046832c04d4e752f37383b628bc601a7ea7211496b4638f6514d0e5b9acc4939",
+                "sha256:945e3ba63a0b9f577b1395204e13c3a231f9bc0223888be653286534e5873695"
            ],
-            "version": "==2019.3.9"
+            "version": "==2019.6.16"
        },
        "chardet": {
            "hashes": [
@ -48,10 +48,10 @@
        },
        "cheroot": {
            "hashes": [
-                "sha256:beb8eb9eeff5746059607e81b72efd6f4ca099111dc13f8961ae9e4f63f7786b",
-                "sha256:c52f8df52c461351b91ce9a7769208c064bae74bd61b531312ffc62bff667650"
+                "sha256:1593fa2a42b18744ac485aadf5fec4a29ebfee00ba3937a2269b8ffc94447879",
+                "sha256:f6a85e005adb5bc5f3a92b998ff0e48795d4d98a0fbb7edde47a7513d4100601"
            ],
-            "version": "==6.5.4"
+            "version": "==6.5.5"
        },
        "cherrypy": {
            "hashes": [
@ -71,11 +71,11 @@
        },
        "genshi": {
            "hashes": [
-                "sha256:0d87ae62cf2ed92133f35725da51e02d09f79bb4cb986f0d948408a0279dd3f8",
-                "sha256:8dd0628da7898c625d487a676992490c8222e47bb56f36a3dcb0cfe28159997f"
+                "sha256:5e92e278ca1ea395349a451d54fc81dc3c1b543c48939a15bd36b7b3335e1560",
+                "sha256:7933c95151d7dd2124a2b4c8dd85bb6aec881ca17c0556da0b40e56434b313a0"
            ],
            "index": "pypi",
-            "version": "==0.7.1"
+            "version": "==0.7.3"
        },
        "html5lib": {
            "hashes": [
@ -109,41 +109,39 @@
        },
        "libgutenberg": {
            "hashes": [
-                "sha256:6afff1b3067f3a862aad28b981fb72d4ff0ee33a9bad0893d570c9cec3fcef20"
+                "sha256:498cdcb2d4e1c4749bba9bd86fc08819637741c8093dc98a39d9f14b645a379c"
            ],
            "index": "pypi",
-            "version": "==0.3.1"
+            "version": "==0.3.2"
        },
        "lxml": {
            "hashes": [
-                "sha256:03984196d00670b2ab14ae0ea83d5cc0cfa4f5a42558afa9ab5fa745995328f5",
-                "sha256:0815b0c9f897468de6a386dc15917a0becf48cc92425613aa8bbfc7f0f82951f",
-                "sha256:175f3825f075cf02d15099eb52658457cf0ff103dcf11512b5d2583e1d40f58b",
-                "sha256:30e14c62d88d1e01a26936ecd1c6e784d4afc9aa002bba4321c5897937112616",
-                "sha256:3210da6f36cf4b835ff1be853962b22cc354d506f493b67a4303c88bbb40d57b",
-                "sha256:40f60819fbd5bad6e191ba1329bfafa09ab7f3f174b3d034d413ef5266963294",
-                "sha256:43b26a865a61549919f8a42e094dfdb62847113cf776d84bd6b60e4e3fc20ea3",
-                "sha256:4a03dd682f8e35a10234904e0b9508d705ff98cf962c5851ed052e9340df3d90",
-                "sha256:62f382cddf3d2e52cf266e161aa522d54fd624b8cc567bc18f573d9d50d40e8e",
-                "sha256:7b98f0325be8450da70aa4a796c4f06852949fe031878b4aa1d6c417a412f314",
-                "sha256:846a0739e595871041385d86d12af4b6999f921359b38affb99cdd6b54219a8f",
-                "sha256:a3080470559938a09a5d0ec558c005282e99ac77bf8211fb7b9a5c66390acd8d",
-                "sha256:ad841b78a476623955da270ab8d207c3c694aa5eba71f4792f65926dc46c6ee8",
-                "sha256:afdd75d9735e44c639ffd6258ce04a2de3b208f148072c02478162d0944d9da3",
-                "sha256:b4fbf9b552faff54742bcd0791ab1da5863363fb19047e68f6592be1ac2dab33",
-                "sha256:b90c4e32d6ec089d3fa3518436bdf5ce4d902a0787dbd9bb09f37afe8b994317",
-                "sha256:b91cfe4438c741aeff662d413fd2808ac901cc6229c838236840d11de4586d63",
-                "sha256:bdb0593a42070b0a5f138b79b872289ee73c8e25b3f0bea6564e795b55b6bcdd",
-                "sha256:c4e4bca2bb68ce22320297dfa1a7bf070a5b20bcbaec4ee023f83d2f6e76496f",
-                "sha256:cec4ab14af9eae8501be3266ff50c3c2aecc017ba1e86c160209bb4f0423df6a",
-                "sha256:e83b4b2bf029f5104bc1227dbb7bf5ace6fd8fabaebffcd4f8106fafc69fc45f",
-                "sha256:e995b3734a46d41ae60b6097f7c51ba9958648c6d1e0935b7e0ee446ee4abe22",
-                "sha256:f679d93dec7f7210575c85379a31322df4c46496f184ef650d3aba1484b38a2d",
-                "sha256:fd213bb5166e46974f113c8228daaef1732abc47cb561ce9c4c8eaed4bd3b09b",
-                "sha256:fdcb57b906dbc1f80666e6290e794ab8fb959a2e17aa5aee1758a85d1da4533f",
-                "sha256:ff424b01d090ffe1947ec7432b07f536912e0300458f9a7f48ea217dd8362b86"
+                "sha256:06c7616601430aa140a69f97e3116308fffe0848f543b639a5ec2e8920ae72fd",
+                "sha256:177202792f9842374a8077735c69c41a4282183f7851443d2beb8ee310720819",
+                "sha256:19317ad721ceb9e39847d11131903931e2794e447d4751ebb0d9236f1b349ff2",
+                "sha256:36d206e62f3e5dbaafd4ec692b67157e271f5da7fd925fda8515da675eace50d",
+                "sha256:387115b066c797c85f9861a9613abf50046a15aac16759bc92d04f94acfad082",
+                "sha256:3ce1c49d4b4a7bc75fb12acb3a6247bb7a91fe420542e6d671ba9187d12a12c2",
+                "sha256:4d2a5a7d6b0dbb8c37dab66a8ce09a8761409c044017721c21718659fa3365a1",
+                "sha256:58d0a1b33364d1253a88d18df6c0b2676a1746d27c969dc9e32d143a3701dda5",
+                "sha256:62a651c618b846b88fdcae0533ec23f185bb322d6c1845733f3123e8980c1d1b",
+                "sha256:69ff21064e7debc9b1b1e2eee8c2d686d042d4257186d70b338206a80c5bc5ea",
+                "sha256:7060453eba9ba59d821625c6af6a266bd68277dce6577f754d1eb9116c094266",
+                "sha256:7d26b36a9c4bce53b9cfe42e67849ae3c5c23558bc08363e53ffd6d94f4ff4d2",
+                "sha256:83b427ad2bfa0b9705e02a83d8d607d2c2f01889eb138168e462a3a052c42368",
+                "sha256:923d03c84534078386cf50193057aae98fa94cace8ea7580b74754493fda73ad",
+                "sha256:b773715609649a1a180025213f67ffdeb5a4878c784293ada300ee95a1f3257b",
+                "sha256:baff149c174e9108d4a2fee192c496711be85534eab63adb122f93e70aa35431",
+                "sha256:bca9d118b1014b4c2d19319b10a3ebed508ff649396ce1855e1c96528d9b2fa9",
+                "sha256:ce580c28845581535dc6000fc7c35fdadf8bea7ccb57d6321b044508e9ba0685",
+                "sha256:d34923a569e70224d88e6682490e24c842907ba2c948c5fd26185413cbe0cd96",
+                "sha256:dd9f0e531a049d8b35ec5e6c68a37f1ba6ec3a591415e6804cbdf652793d15d7",
+                "sha256:ecb805cbfe9102f3fd3d2ef16dfe5ae9e2d7a7dfbba92f4ff1e16ac9784dbfb0",
+                "sha256:ede9aad2197a0202caff35d417b671f5f91a3631477441076082a17c94edd846",
+                "sha256:ef2d1fc370400e0aa755aab0b20cf4f1d0e934e7fd5244f3dd4869078e4942b9",
+                "sha256:f2fec194a49bfaef42a548ee657362af5c7a640da757f6f452a35da7dd9f923c"
            ],
-            "version": "==4.3.3"
+            "version": "==4.3.4"
        },
        "more-itertools": {
            "hashes": [
@ -209,10 +207,10 @@
        },
        "portend": {
            "hashes": [
-                "sha256:507e1f76eb6deec0cc15045d1140a07874f44d02eec021e8fd383557d99fe93d",
-                "sha256:853d69e61d86aa1bc7a4976cb2f67efe1c92d3b41c47a5e6b8771d3c51b5bfd3"
+                "sha256:19dc27bfb3c72471bd30a235a4d5fbefef8a7e31cab367744b5d87a205e7bfd9",
+                "sha256:d2dca12e585ce29fc357b31ce424a27c16e2d485029252bbf8ddcc9696207976"
            ],
-            "version": "==2.4"
+            "version": "==2.5"
        },
        "psycopg2": {
            "hashes": [
@ -284,18 +282,20 @@
        },
        "regex": {
            "hashes": [
-                "sha256:020429dcf9b76cc7648a99c81b3a70154e45afebc81e0b85364457fe83b525e4",
-                "sha256:0552802b1c3f3c7e4fee8c85e904a13c48226020aa1a0593246888a1ac55aaaf",
-                "sha256:308965a80b92e1fec263ac1e4f1094317809a72bc4d26be2ec8a5fd026301175",
-                "sha256:4d627feef04eb626397aa7bdec772774f53d63a1dc7cc5ee4d1bd2786a769d19",
-                "sha256:93d1f9fcb1d25e0b4bd622eeba95b080262e7f8f55e5b43c76b8a5677e67334c",
-                "sha256:c3859bbf29b1345d694f069ddfe53d6907b0393fda5e3794c800ad02902d78e9",
-                "sha256:d56ce4c7b1a189094b9bee3b81c4aeb3f1ba3e375e91627ec8561b6ab483d0a8",
-                "sha256:ebc5ef4e10fa3312fa1967dc0a894e6bd985a046768171f042ac3974fadc9680",
-                "sha256:f9cd39066048066a4abe4c18fb213bc541339728005e72263f023742fb912585"
+                "sha256:1c70ccb8bf4ded0cbe53092e9f56dcc9d6b0efcf6e80b6ef9b0ece8a557d6635",
+                "sha256:2948310c01535ccb29bb600dd033b07b91f36e471953889b7f3a1e66b39d0c19",
+                "sha256:2ab13db0411cb308aa590d33c909ea4efeced40188d8a4a7d3d5970657fe73bc",
+                "sha256:38e6486c7e14683cd1b17a4218760f0ea4c015633cf1b06f7c190fb882a51ba7",
+                "sha256:80dde4ff10b73b823da451687363cac93dd3549e059d2dc19b72a02d048ba5aa",
+                "sha256:84daedefaa56320765e9c4d43912226d324ef3cc929f4d75fa95f8c579a08211",
+                "sha256:b98e5876ca1e63b41c4aa38d7d5cc04a736415d4e240e9ae7ebc4f780083c7d5",
+                "sha256:ca4f47131af28ef168ff7c80d4b4cad019cb4cabb5fa26143f43aa3dbd60389c",
+                "sha256:cf7838110d3052d359da527372666429b9485ab739286aa1a11ed482f037a88c",
+                "sha256:dd4e8924915fa748e128864352875d3d0be5f4597ab1b1d475988b8e3da10dd7",
+                "sha256:f2c65530255e4010a5029eb11138f5ecd5aa70363f57a3444d83b3253b0891be"
            ],
            "index": "pypi",
-            "version": "==2019.4.14"
+            "version": "==2019.6.8"
        },
        "repoze.lru": {
            "hashes": [
@ -307,11 +307,11 @@
        },
        "requests": {
            "hashes": [
-                "sha256:502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e",
-                "sha256:7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b"
+                "sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4",
+                "sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31"
            ],
            "index": "pypi",
-            "version": "==2.21.0"
+            "version": "==2.22.0"
        },
        "requests-oauthlib": {
            "hashes": [
@ -357,10 +357,10 @@
        },
        "sqlalchemy": {
            "hashes": [
-                "sha256:91c54ca8345008fceaec987e10924bf07dcab36c442925357e5a467b36a38319"
+                "sha256:c7fef198b43ef31dfd783d094fd5ee435ce8717592e6784c45ba337254998017"
            ],
            "index": "pypi",
-            "version": "==1.3.3"
+            "version": "==1.3.4"
        },
        "tempora": {
            "hashes": [
@ -371,11 +371,11 @@
        },
        "urllib3": {
            "hashes": [
-                "sha256:4c291ca23bbb55c76518905869ef34bdd5f0e46af7afe6861e8375643ffee1a0",
-                "sha256:9a247273df709c4fedb38c711e44292304f73f39ab01beda9f6b9fc375669ac3"
+                "sha256:b246607a25ac80bedac05c6f282e3cdaf3afb65420fd024ac94435cabe6e18d1",
+                "sha256:dbe59173209418ae49d485b87d1681aefa36252ee85884c31346debd19463232"
            ],
            "index": "pypi",
-            "version": "==1.24.2"
+            "version": "==1.25.3"
        },
        "webencodings": {
            "hashes": [