Merge remote-tracking branch 'origin/master'

# Conflicts: # rmapy/const.py
subutux · Jul 23, 2021 · 081db1d · 081db1d
2 parents 5c78598 + 42430b0
commit 081db1d
Show file tree

Hide file tree

Showing 6 changed files with 212 additions and 165 deletions.
diff --git a/Pipfile b/Pipfile
@@ -9,6 +9,7 @@ verify_ssl = true
 requests = "*"
 pyaml = "*"
 sphinx = "*"
+urllib3 = ">=1.26.5"
 
 [requires]
 python_version = "3.7"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/docs/source/quickstart.rst b/docs/source/quickstart.rst
@@ -175,10 +175,13 @@ Here is the content of an archive retried on the tablet as example:
     * 384326f5-133e-49c8-82ff-30aa19f3cfa40.pdf
     * 384327f5-133e-49c8-82ff-30aa19f3cfa40.pagedata
     * 384327f5-133e-49c8-82ff-30aa19f3cfa40.thumbnails/0.jpg
+    * 384327f5-133e-49c8-82ff-30aa19f3cfa40.highlights/9b75d8df-1d06-4c59-8f3e-4cf69aa96cd9.json
 
 As the .zip file from remarkable is simply a normal .zip file
 containing specific file formats.
 
+Highlights are stored in the `{uuid}.highlights/` folder.
+
 You can find some help about the format at the following URL:
 https://remarkablewiki.com/tech/filesystem
 

diff --git a/requirements.txt b/requirements.txt
@@ -3,4 +3,5 @@ pyaml==19.4.1
 sphinx==2.2.0
 sphinx-autodoc-typehints==1.8.0
 guzzle-sphinx-theme==0.7.11
+urllib3>=1.26.5