Merge tag '0.9.16' into master

Author: LinusCDE

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 authors = ["Bastien Dejean <[email protected]>"]
 name = "plato"
-version = "0.9.13"
+version = "0.9.16"
 edition = "2018"
 
 [[bin]]
@@ -27,32 +27,32 @@ required-features = ["fetcher"]
 bitflags = "1.2.1"
 downcast-rs = "1.2.0"
 lazy_static = "1.4.0"
-libc = "0.2.82"
+libc = "0.2.88"
 png = "0.16.8"
 regex = "1.4.3"
-serde = { version = "1.0.119", features = ["derive"] }
-serde_json = "1.0.61"
+serde = { version = "1.0.124", features = ["derive"] }
+serde_json = "1.0.64"
 titlecase = "1.1.0"
-unicode-normalization = "0.1.16"
+unicode-normalization = "0.1.17"
 toml = "0.5.8"
-zip = "0.5.9"
+zip = "0.5.11"
 kl-hyphenate = "0.7.3"
 entities = "1.0.1"
 paragraph-breaker = "0.4.3"
 xi-unicode = "0.3.0"
-septem = "1.0.1"
+septem = "1.1.0"
 byteorder = "1.4.2"
 flate2 = "1.0.14"
-levenshtein = "1.0.4"
-nix = "0.19.1"
-indexmap = { version = "1.6.1", features = ["serde-1"] }
+levenshtein = "1.0.5"
+nix = "0.20.0"
+indexmap = { version = "1.6.2", features = ["serde-1"] }
 anyhow = "1.0.38"
-thiserror = "1.0.23"
+thiserror = "1.0.24"
 walkdir = "2.3.1"
 globset = "0.4.6"
-filetime = "0.2.13"
+filetime = "0.2.14"
 fxhash = "0.2.1"
-rand_core = "0.6.1"
+rand_core = "0.6.2"
 rand_xoshiro = "0.6.0"
 percent-encoding = "2.1.0"
 libremarkable = "0.4.3"
@@ -63,7 +63,7 @@ version = "0.2.21"
 optional = true
 
 [dependencies.reqwest]
-version = "0.11.0"
+version = "0.11.1"
 features = ["rustls-tls", "json", "blocking"]
 default-features = false
 optional = true
@@ -77,7 +77,7 @@ version = "0.34.3"
 optional = true
 
 [dependencies.signal-hook]
-version = "0.3.3"
+version = "0.3.6"
 optional = true
 
 [features]

Cargo.toml

@@ -5,7 +5,7 @@ FROM buildpack-deps:stretch
 ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \
     PATH=/usr/local/cargo/bin:$PATH \
-    RUST_VERSION=1.48.0
+    RUST_VERSION=1.50.0
 
 RUN set -eux; \
     dpkgArch="$(dpkg --print-architecture)"; \

Dockerfile

@@ -6,4 +6,8 @@ Pick one of the [one-click install packages](https://www.mobileread.com/forums/s
 
 The settings are saved in and read from `Settings.toml`. You can edit this file when *Plato* isn't running or is in shared mode. You can enter the shared mode by connecting your device to a computer.
 
-The default ePUB stylesheet, `css/epub.css`, can be overriden via `css/epub-user.css`.
+The default ePUB stylesheet, `css/epub.css`, can be overridden via `css/epub-user.css`.
+
+## Upgrade
+
+Install the corresponding one-click package on top of the previous one. Check out the [release notes](https://github.com/baskerville/plato/releases) before upgrading: manual intervention might be required.

contrib/grayscale-256.svg

@@ -22,8 +22,8 @@ selected.
 The *Toogle Select* sub-menu of the library menu can be used to trigger a hook
 when there's no imported documents in `path`. Otherwise, you can just tap the
 directory in the navigation bar. When the hook is triggered, the associated
-`program` is executed as a background process. It will receive the directory
-path, wifi and online statuses (*true* or *false*) as arguments.
+`program` is executed as a background process. It will receive the library path,
+directory path, wifi and online statuses (*true* or *false*) as arguments.
 
 A fetcher can use its standard output (resp. standard input) to send events to
 (resp. receive events from) *Plato*. An event is a JSON object with a required
@@ -37,23 +37,21 @@ The events that can be written to standard output are:
 // Add a document to the current library. `info` is the camel cased JSON version
 // of the `Info` structure defined in `src/metadata.rs`.
 {"type": "addDocument", "info": OBJECT}
+// Remove a document from the current library.
+{"type": "removeDocument", "path": STRING}
 // Enable or disable the WiFi.
 {"type": "setWifi", "enable": BOOL}
 // Search for books inside `path` matching `query` and sort the results by `sortBy`.
 {"type": "search", "path": STRING, "query": STRING, "sortBy": [STRING, BOOL]}
-// Import new entries and update existing entries in the current library.
-{"type": "import"}
-// Remove entries with dangling paths from the current library.
-{"type": "cleanUp"}
 ```
 
 The events that can be read from standard input are:
 
 ```
 
-// Sent in response to `search`. `path` is the path of the library
-// that was searched for. `results` is an array of *Info* objects.
-{"type": "search": "path": STRING, "results": ARRAY}
+// Sent in response to `search`.
+// `results` is an array of *Info* objects.
+{"type": "search": "results": ARRAY}
 // Sent to all the fetchers when the network becomes available.
 {"type": "network", "status": "up"}
 ```

contrib/hilbert-256.svg

@@ -8,11 +8,11 @@ The following swipe sequences are recognized:
 
 ## Address bar
 
-When the navigation bar is present, this optional bar can be shown by swipping from the top bar to the shelf, and hidden by swipping from the shelf to the top bar.
+When the navigation bar is present, this optional bar can be shown by swiping from the top bar to the shelf, and hidden by swiping from the shelf to the top bar.
 
 ## Navigation bar
 
-This optional bar can be shown by swipping from the top bar to the shelf, and hidden by swipping from the shelf to the top bar.
+This optional bar can be shown by swiping from the top bar to the shelf, and hidden by swiping from the shelf to the top bar.
 
 This bar shows at most `max-levels` directory levels starting at the current directory. It can be used to navigate within the directory hierarchy.
 
@@ -27,6 +27,11 @@ This is a view of the books within the current directory.
 - Swipe west/east to go to the next/previous page.
 - Tap on a book entry to open it.
 
+The following swipe sequences are recognized:
+
+- Arrow west/east: go to the first/last page.
+- Top or bottom left/right corner: go to the previous/next status change.
+
 ## Search bar
 
 The input's text is interpreted as a regular expression, and a book will match if any of its title, subtitle, author, series or file path matches.