diff --git a/README.md b/README.md index 061912e..31e7860 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ from https://docs.docker.com/get-docker/. Then run the following command to star have not tested it on Windows yet): ``` -touch ~/.remarkable-pocket ~/.rmapi && mkdir -p ~/.rmapi-cache && docker run -it --env TZ=Europe/Amsterdam -p 65112:65112 -v ~/.remarkable-pocket:/root/.remarkable-pocket -v ~/.rmapi:/root/.rmapi -v ~/.rmapi-cache:/root/.cache/rmapi ghcr.io/nov1n/remarkable-pocket:0.3.0 +touch ~/.remarkable-pocket ~/.rmapi && mkdir -p ~/.rmapi-cache && docker run -it --env TZ=Europe/Amsterdam -p 65112:65112 -v ~/.remarkable-pocket:/root/.remarkable-pocket -v ~/.rmapi:/root/.rmapi -v ~/.rmapi-cache:/root/.cache/rmapi ghcr.io/nov1n/remarkable-pocket:0.4.0 ``` The first time you run the application, you will be asked to authorize Pocket and Remarkable Cloud. Once you have done diff --git a/build.gradle b/build.gradle index dba3cc6..53fd083 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { } group = "nl.carosi" -version = "0.3.0" +version = "0.4.0" java { toolchain { diff --git a/docker-compose.yml b/docker-compose.yml index c160516..90e16f7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: remarkable-pocket: - image: ghcr.io/nov1n/remarkable-pocket:0.3.0 + image: ghcr.io/nov1n/remarkable-pocket:0.4.0 restart: always environment: - TZ=Europe/Amsterdam diff --git a/nl.carosi.remarkable-pocket.plist b/nl.carosi.remarkable-pocket.plist index 0cd9943..415c57b 100644 --- a/nl.carosi.remarkable-pocket.plist +++ b/nl.carosi.remarkable-pocket.plist @@ -8,7 +8,7 @@ /bin/sh -c - while ! /usr/local/bin/docker version > /dev/null 2>&1; do sleep 5; done && /usr/local/bin/docker run --env TZ=Europe/Amsterdam -v ~/.remarkable-pocket:/root/.remarkable-pocket -v ~/.rmapi:/root/.rmapi -v ~/.rmapi-cache:/root/.cache/rmapi ghcr.io/nov1n/remarkable-pocket:0.3.0 1>>$HOME/.remarkable-pocket.log 2>&1 + while ! /usr/local/bin/docker version > /dev/null 2>&1; do sleep 5; done && /usr/local/bin/docker run --env TZ=Europe/Amsterdam -v ~/.remarkable-pocket:/root/.remarkable-pocket -v ~/.rmapi:/root/.rmapi -v ~/.rmapi-cache:/root/.cache/rmapi ghcr.io/nov1n/remarkable-pocket:0.4.0 1>>$HOME/.remarkable-pocket.log 2>&1 RunAtLoad diff --git a/src/main/java/nl/carosi/remarkablepocket/RemarkableApi.java b/src/main/java/nl/carosi/remarkablepocket/RemarkableApi.java index c168964..0df8fef 100644 --- a/src/main/java/nl/carosi/remarkablepocket/RemarkableApi.java +++ b/src/main/java/nl/carosi/remarkablepocket/RemarkableApi.java @@ -78,11 +78,11 @@ public class RemarkableApi { new Thread( () -> { Scanner sc = new Scanner(src); - sc.useDelimiter(Pattern.compile("\\n|: ")); + sc.useDelimiter(Pattern.compile("\\n|\\): ")); while (sc.hasNext()) { String token = sc.next(); - if (token.equals("Refreshing tree...")) { - consumer.accept("Refreshing cache... This may take a while."); + if (token.startsWith("Enter one-time code")) { + consumer.accept(token + "):"); } else { consumer.accept(token); } @@ -101,11 +101,10 @@ public class RemarkableApi { public void login() { try { Process proc = - new ProcessBuilder(RMAPI_EXECUTABLE, "version").redirectInput(INHERIT).start(); + new ProcessBuilder(RMAPI_EXECUTABLE, "account").redirectInput(INHERIT).start(); logStream(proc.getInputStream(), LOG::info); logStream(proc.getErrorStream(), LOG::error); int exitCode = proc.waitFor(); - LOG.info(""); if (exitCode != 0) { throw new RuntimeException("Could not authenticate to Remarkable API"); } diff --git a/src/main/java/nl/carosi/remarkablepocket/SyncCommand.java b/src/main/java/nl/carosi/remarkablepocket/SyncCommand.java index d86fff6..17f8ffa 100644 --- a/src/main/java/nl/carosi/remarkablepocket/SyncCommand.java +++ b/src/main/java/nl/carosi/remarkablepocket/SyncCommand.java @@ -19,7 +19,7 @@ import picocli.CommandLine.Option; sortOptions = false, usageHelpAutoWidth = true, // TODO: Read from gradle.properties - version = "0.3.0", + version = "0.4.0", mixinStandardHelpOptions = true) class SyncCommand implements Callable { @Option( diff --git a/src/main/jib/usr/local/bin/rmapi_aarch64 b/src/main/jib/usr/local/bin/rmapi_aarch64 index 33afc19..0ac58ca 100755 Binary files a/src/main/jib/usr/local/bin/rmapi_aarch64 and b/src/main/jib/usr/local/bin/rmapi_aarch64 differ diff --git a/src/main/jib/usr/local/bin/rmapi_amd64 b/src/main/jib/usr/local/bin/rmapi_amd64 index f8c482d..41e6dff 100755 Binary files a/src/main/jib/usr/local/bin/rmapi_amd64 and b/src/main/jib/usr/local/bin/rmapi_amd64 differ diff --git a/src/main/jib/usr/local/bin/rmapi_arm b/src/main/jib/usr/local/bin/rmapi_arm index 5eef224..ce00a81 100755 Binary files a/src/main/jib/usr/local/bin/rmapi_arm and b/src/main/jib/usr/local/bin/rmapi_arm differ diff --git a/update_rmapi_binaries.sh b/update_rmapi_binaries.sh new file mode 100755 index 0000000..df91b2e --- /dev/null +++ b/update_rmapi_binaries.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +# Usage: ./update_rmapi_binaries.sh + +SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd) + +cd "${1}" || exit +git fetch +git checkout "${2}" + +move() { + mv rmapi "${SCRIPT_DIR}"/src/main/jib/usr/local/bin/rmapi_"${1}" +} + +GOOS=linux GOARCH=arm64 go build && move "aarch64" +GOOS=linux GOARCH=arm GOARM=5 go build && move "arm" +GOOS=linux GOARCH=amd64 go build && move "amd64" + +cd "${SCRIPT_DIR}" || exit