diff options
| author | Gertjan van den Burg <gertjanvandenburg@gmail.com> | 2020-02-22 14:13:37 +0000 |
|---|---|---|
| committer | Gertjan van den Burg <gertjanvandenburg@gmail.com> | 2020-02-22 14:13:37 +0000 |
| commit | c4bad38d303c15903b6749052e466c1c599943eb (patch) | |
| tree | 50ea93ad19cf6fad1ec88141b7947908f5fa8a95 | |
| parent | Add provider for JMLR (diff) | |
| parent | Code formatting (diff) | |
| download | paper2remarkable-c4bad38d303c15903b6749052e466c1c599943eb.tar.gz paper2remarkable-c4bad38d303c15903b6749052e466c1c599943eb.zip | |
Merge branch 'master' into feature/provider_jmlr
| -rw-r--r-- | paper2remarkable/utils.py | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/paper2remarkable/utils.py b/paper2remarkable/utils.py index 22d6d38..592dcd3 100644 --- a/paper2remarkable/utils.py +++ b/paper2remarkable/utils.py @@ -94,8 +94,9 @@ def get_content_type_with_retry(url, tries=5, cookiejar=None): count += 1 error = False try: - res = requests.head(url, headers=HEADERS, cookies=jar, - allow_redirects=True) + res = requests.head( + url, headers=HEADERS, cookies=jar, allow_redirects=True + ) except requests.exceptions.ConnectionError: error = True if error or not res.ok: @@ -133,13 +134,18 @@ def upload_to_remarkable(filepath, remarkable_dir="/", rmapi_path="rmapi"): # Create the reMarkable dir if it doesn't exist remarkable_dir = remarkable_dir.rstrip("/") if remarkable_dir: - status = subprocess.call( - [rmapi_path, "mkdir", remarkable_dir], stdout=subprocess.DEVNULL, - ) - if not status == 0: - raise RemarkableError( - "Creating directory %s on reMarkable failed" % remarkable_dir + parts = remarkable_dir.split("/") + rmdir = "" + while parts: + rmdir += "/" + parts.pop(0) + status = subprocess.call( + [rmapi_path, "mkdir", rmdir], stdout=subprocess.DEVNULL, ) + if not status == 0: + raise RemarkableError( + "Creating directory %s on reMarkable failed" + % remarkable_dir + ) # Upload the file status = subprocess.call( |