From 011123f690414a48544d9b2ac9b7ec3f7d075da1 Mon Sep 17 00:00:00 2001 From: Alex Ling Date: Tue, 24 Nov 2020 03:57:38 +0000 Subject: [PATCH 1/5] Allow keyboard navigation on reader page (#124) --- public/js/reader.js | 16 ++++++++++++++++ src/views/reader.html.ecr | 2 ++ 2 files changed, 18 insertions(+) diff --git a/public/js/reader.js b/public/js/reader.js index b51c4af..15aeff5 100644 --- a/public/js/reader.js +++ b/public/js/reader.js @@ -292,3 +292,19 @@ const flipPage = (isNext) => { replaceHistory(newIdx); saveProgress(newIdx); }; + +/** + * Handle the global keydown events + * + * @function keyHandler + * @param {event} event - The $event object + */ +const keyHandler = (event) => { + const mode = getProp('mode'); + if (mode === 'continuous') return; + + if (event.key === 'ArrowLeft' || event.key === 'j') + flipPage(false); + if (event.key === 'ArrowRight' || event.key === 'k') + flipPage(true); +}; diff --git a/src/views/reader.html.ecr b/src/views/reader.html.ecr index b1acde8..540fd0c 100644 --- a/src/views/reader.html.ecr +++ b/src/views/reader.html.ecr @@ -17,6 +17,8 @@ flipAnimation: null }"> +
+
From 1039732d8779f2dbc40e6c2c7903a085e9c583d9 Mon Sep 17 00:00:00 2001 From: Alex Ling Date: Tue, 24 Nov 2020 04:03:53 +0000 Subject: [PATCH 2/5] Log the full file path in error messages (#123) --- src/library/entry.cr | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/library/entry.cr b/src/library/entry.cr index 796d983..7a8cfae 100644 --- a/src/library/entry.cr +++ b/src/library/entry.cr @@ -118,8 +118,8 @@ class Entry "width" => size.width, "height" => size.height, } - rescue - Logger.warn "Failed to read page #{i} of entry #{@id}" + rescue e + Logger.warn "Failed to read page #{i} of entry #{zip_path}. #{e}" sizes << {"width" => 1000_i32, "height" => 1000_i32} end end @@ -227,8 +227,7 @@ class Entry end Storage.default.save_thumbnail @id, img rescue e - Logger.warn "Failed to generate thumbnail for entry " \ - "#{@book.title}/#{@title}. #{e}" + Logger.warn "Failed to generate thumbnail for file #{@zip_path}. #{e}" end img From 6384d4b77ad22f217c50c303517bddf1ad3ff20a Mon Sep 17 00:00:00 2001 From: Alex Ling Date: Tue, 24 Nov 2020 04:05:07 +0000 Subject: [PATCH 3/5] Log "DB optimization finished" in the info level --- src/storage.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage.cr b/src/storage.cr index 592da0e..33b751f 100644 --- a/src/storage.cr +++ b/src/storage.cr @@ -293,7 +293,7 @@ class Storage Logger.info "#{trash_thumbnails_count} dangling thumbnails deleted" end end - Logger.debug "DB optimization finished" + Logger.info "DB optimization finished" end end From c8db397a3b9488902bd15b0e905548a2e69dcccc Mon Sep 17 00:00:00 2001 From: Alex Ling Date: Tue, 24 Nov 2020 04:30:47 +0000 Subject: [PATCH 4/5] Bump version to v0.16.0 --- README.md | 2 +- shard.yml | 2 +- src/mango.cr | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5f6bf6e..7f3a037 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ The official docker images are available on [Dockerhub](https://hub.docker.com/r ### CLI ``` - Mango - Manga Server and Web Reader. Version 0.15.1 + Mango - Manga Server and Web Reader. Version 0.16.0 Usage: diff --git a/shard.yml b/shard.yml index e82a069..bca96d9 100644 --- a/shard.yml +++ b/shard.yml @@ -1,5 +1,5 @@ name: mango -version: 0.15.1 +version: 0.16.0 authors: - Alex Ling diff --git a/src/mango.cr b/src/mango.cr index ae1edd4..e2bd119 100644 --- a/src/mango.cr +++ b/src/mango.cr @@ -7,7 +7,7 @@ require "option_parser" require "clim" require "./plugin/*" -MANGO_VERSION = "0.15.1" +MANGO_VERSION = "0.16.0" # From http://www.network-science.de/ascii/ BANNER = %{ From b2dc44a9192c34613a1e7f1d10c4a03c547d8310 Mon Sep 17 00:00:00 2001 From: Alex Ling Date: Tue, 24 Nov 2020 05:09:06 +0000 Subject: [PATCH 5/5] Reverse J and K for page navigation --- public/js/reader.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/reader.js b/public/js/reader.js index 15aeff5..6d44a06 100644 --- a/public/js/reader.js +++ b/public/js/reader.js @@ -303,8 +303,8 @@ const keyHandler = (event) => { const mode = getProp('mode'); if (mode === 'continuous') return; - if (event.key === 'ArrowLeft' || event.key === 'j') + if (event.key === 'ArrowLeft' || event.key === 'k') flipPage(false); - if (event.key === 'ArrowRight' || event.key === 'k') + if (event.key === 'ArrowRight' || event.key === 'j') flipPage(true); };