Fix GitHub tags of dependencies in the Dockerfiles

[skip ci]

.github/workflows/build.yml

@@ -19,13 +19,22 @@ jobs:
     - name: Install dependencies
       run: apk add --no-cache yarn yaml sqlite-static libarchive-dev libarchive-static acl-static expat-static zstd-static lz4-static bzip2-static
     - name: Build
-      run: make static
+      run: make static || make static
     - name: Linter
       run: make check
     - name: Run tests
       run: make test
-    - name: Upload artifact
+    - name: Upload binary
       uses: actions/upload-artifact@v2
       with:
         name: mango
         path: mango
+    - name: build arm32v7 object file
+      run: make arm32v7 || make arm32v7
+    - name: build arm64v8 object file
+      run: make arm64v8 || make arm64v8
+    - name: Upload object files
+      uses: actions/upload-artifact@v2
+      with:
+        name: object files
+        path: ./*.o

Dockerfile.arm32v7

@@ -0,0 +1,13 @@
+FROM arm32v7/ubuntu:18.04
+
+RUN apt-get update && apt-get install -y wget git make llvm-8 llvm-8-dev g++ libsqlite3-dev libyaml-dev libgc-dev libssl-dev libcrypto++-dev libevent-dev libgmp-dev zlib1g-dev libpcre++-dev pkg-config libarchive-dev libxml2-dev libacl1-dev nettle-dev liblzo2-dev liblzma-dev libbz2-dev
+
+RUN git clone https://github.com/crystal-lang/crystal && cd crystal && git checkout 0.34.0 && make deps && cd ..
+RUN git clone https://github.com/kostya/myhtml && cd myhtml/src/ext && git checkout v1.5.0 && make && cd ..
+RUN git clone https://github.com/jessedoyle/duktape.cr && cd duktape.cr/ext && git checkout v0.20.0 && make && cd ..
+
+COPY mango-arm32v7.o .
+
+RUN cc 'mango-arm32v7.o' -o 'mango' -rdynamic -lxml2 /myhtml/src/ext/modest-c/lib/libmodest_static.a -L/duktape.cr/src/.build/lib -L/duktape.cr/src/.build/include -lduktape -lm `pkg-config libarchive --libs` -lz `command -v pkg-config > /dev/null && pkg-config --libs --silence-errors libssl || printf %s '-lssl -lcrypto'` `command -v pkg-config > /dev/null && pkg-config --libs --silence-errors libcrypto || printf %s '-lcrypto'` -lgmp -lsqlite3 -lyaml -lpcre -lm /usr/lib/arm-linux-gnueabihf/libgc.so -lpthread /crystal/src/ext/libcrystal.a -levent -lrt -ldl -L/usr/bin/../lib/crystal/lib -L/usr/bin/../lib/crystal/lib
+
+CMD ["./mango"]

Dockerfile.arm64v8

@@ -0,0 +1,13 @@
+FROM arm64v8/ubuntu:18.04
+
+RUN apt-get update && apt-get install -y wget git make llvm-8 llvm-8-dev g++ libsqlite3-dev libyaml-dev libgc-dev libssl-dev libcrypto++-dev libevent-dev libgmp-dev zlib1g-dev libpcre++-dev pkg-config libarchive-dev libxml2-dev libacl1-dev nettle-dev liblzo2-dev liblzma-dev libbz2-dev
+
+RUN git clone https://github.com/crystal-lang/crystal && cd crystal && git checkout 0.34.0 && make deps && cd ..
+RUN git clone https://github.com/kostya/myhtml && cd myhtml/src/ext && git checkout v1.5.0 && make && cd ..
+RUN git clone https://github.com/jessedoyle/duktape.cr && cd duktape.cr/ext && git checkout v0.20.0 && make && cd ..
+
+COPY mango-arm64v8.o .
+
+RUN cc 'mango-arm64v8.o' -o 'mango' -rdynamic -lxml2 /myhtml/src/ext/modest-c/lib/libmodest_static.a -L/duktape.cr/src/.build/lib -L/duktape.cr/src/.build/include -lduktape -lm `pkg-config libarchive --libs` -lz `command -v pkg-config > /dev/null && pkg-config --libs --silence-errors libssl || printf %s '-lssl -lcrypto'` `command -v pkg-config > /dev/null && pkg-config --libs --silence-errors libcrypto || printf %s '-lcrypto'` -lgmp -lsqlite3 -lyaml -lpcre -lm /usr/lib/aarch64-linux-gnu/libgc.so -lpthread /crystal/src/ext/libcrystal.a -levent -lrt -ldl -L/usr/bin/../lib/crystal/lib -L/usr/bin/../lib/crystal/lib
+
+CMD ["./mango"]

Makefile

@@ -12,10 +12,10 @@ setup: libs
 	yarn gulp dev
 
 build: libs
-	crystal build src/mango.cr --release --progress
+	crystal build src/mango.cr --release --progress --error-trace
 
 static: uglify | libs
-	crystal build src/mango.cr --release --progress --static
+	crystal build src/mango.cr --release --progress --static --error-trace
 
 libs:
 	shards install --production
@@ -31,6 +31,12 @@ check:
 	./bin/ameba
 	./dev/linewidth.sh
 
+arm32v7:
+	crystal build src/mango.cr --release --progress --error-trace --cross-compile --target='arm-linux-gnueabihf' -o mango-arm32v7
+
+arm64v8:
+	crystal build src/mango.cr --release --progress --error-trace --cross-compile --target='aarch64-linux-gnu' -o mango-arm64v8
+
 install:
 	cp mango $(INSTALL_DIR)/mango
 

README.md

@@ -13,7 +13,7 @@ Mango is a self-hosted manga server and reader. Its features include
 - Supports nested folders in library
 - Automatically stores reading progress
 - Built-in [MangaDex](https://mangadex.org/) downloader
-- [Plugins](https://github.com/hkalexling/mango-plugins) support
+- Supports [plugins](https://github.com/hkalexling/mango-plugins) to download from thrid-party sites
 - The web reader is responsive and works well on mobile, so there is no need for a mobile app
 - All the static files are embedded in the binary, so the deployment process is easy and painless
 
@@ -51,7 +51,7 @@ The official docker images are available on [Dockerhub](https://hub.docker.com/r
 ### CLI
 
 ```
-  Mango - Manga Server and Web Reader. Version 0.9.0
+  Mango - Manga Server and Web Reader. Version 0.11.0
 
   Usage:
 
@@ -139,8 +139,12 @@ Mobile UI:
 
 ![mobile screenshot](./.github/screenshots/mobile.png)
 
+## Sponsors
+
+<a href="https://casinoshunter.com/online-casinos/"><img src="https://i.imgur.com/EJb3wBo.png" width="150" height="auto"></a>
+
 ## Contributors
 
-Please check the [development guideline](https://github.com/hkalexling/Mango/wiki/Development) if you are interest in code contributions.
+Please check the [development guideline](https://github.com/hkalexling/Mango/wiki/Development) if you are interested in code contributions.
 
 [![](https://sourcerer.io/fame/hkalexling/hkalexling/Mango/images/0)](https://sourcerer.io/fame/hkalexling/hkalexling/Mango/links/0)[![](https://sourcerer.io/fame/hkalexling/hkalexling/Mango/images/1)](https://sourcerer.io/fame/hkalexling/hkalexling/Mango/links/1)[![](https://sourcerer.io/fame/hkalexling/hkalexling/Mango/images/2)](https://sourcerer.io/fame/hkalexling/hkalexling/Mango/links/2)[![](https://sourcerer.io/fame/hkalexling/hkalexling/Mango/images/3)](https://sourcerer.io/fame/hkalexling/hkalexling/Mango/links/3)[![](https://sourcerer.io/fame/hkalexling/hkalexling/Mango/images/4)](https://sourcerer.io/fame/hkalexling/hkalexling/Mango/links/4)[![](https://sourcerer.io/fame/hkalexling/hkalexling/Mango/images/5)](https://sourcerer.io/fame/hkalexling/hkalexling/Mango/links/5)[![](https://sourcerer.io/fame/hkalexling/hkalexling/Mango/images/6)](https://sourcerer.io/fame/hkalexling/hkalexling/Mango/links/6)[![](https://sourcerer.io/fame/hkalexling/hkalexling/Mango/images/7)](https://sourcerer.io/fame/hkalexling/hkalexling/Mango/links/7)

public/css/mango.css

@@ -7,6 +7,7 @@
 }
 
 .uk-card-media-top {
+    width: 100%;
     height: 250px;
 }
 
@@ -122,3 +123,32 @@ td>.uk-dropdown {
 .uk-light .uk-description-list>dt {
     color: #555;
 }
+
+[x-cloak] {
+    display: none;
+}
+
+#select-bar-controls a {
+    transform: scale(1.5, 1.5);
+}
+
+#select-bar-controls a:hover {
+    color: orange;
+}
+
+#main-section {
+    position: relative;
+}
+
+#totop-wrapper {
+    position: absolute;
+    top: 100vh;
+    right: 2em;
+    bottom: 0;
+}
+
+#totop-wrapper a {
+    position: fixed;
+    position: sticky;
+    top: calc(100vh - 5em);
+}

public/js/title.js

@@ -182,3 +182,63 @@ const setupUpload = (eid) => {
 		}
 	});
 };
+
+const deselectAll = () => {
+	$('.item .uk-card').each((i, e) => {
+		const data = e.__x.$data;
+		data['selected'] = false;
+	});
+	$('#select-bar')[0].__x.$data['count'] = 0;
+};
+
+const selectAll = () => {
+	let count = 0;
+	$('.item .uk-card').each((i, e) => {
+		const data = e.__x.$data;
+		if (!data['disabled']) {
+			data['selected'] = true;
+			count++;
+		}
+	});
+	$('#select-bar')[0].__x.$data['count'] = count;
+};
+
+const selectedIDs = () => {
+	const ary = [];
+	$('.item .uk-card').each((i, e) => {
+		const data = e.__x.$data;
+		if (!data['disabled'] && data['selected']) {
+			const item = $(e).closest('.item');
+			ary.push($(item).attr('id'));
+		}
+	});
+	return ary;
+};
+
+const bulkProgress = (action, el) => {
+	const tid = $(el).attr('data-id');
+	const ids = selectedIDs();
+	const url = `${base_url}api/bulk-progress/${action}/${tid}`;
+	$.ajax({
+			type: 'POST',
+			url: url,
+			contentType: "application/json",
+			dataType: 'json',
+			data: JSON.stringify({
+				ids: ids
+			})
+		})
+		.done(data => {
+			if (data.error) {
+				alert('danger', `Failed to mark entries as ${action}. Error: ${data.error}`);
+				return;
+			}
+			location.reload();
+		})
+		.fail((jqXHR, status) => {
+			alert('danger', `Failed to mark entries as ${action}. Error: [${jqXHR.status}] ${jqXHR.statusText}`);
+		})
+		.always(() => {
+			deselectAll();
+		});
+};

shard.lock

@@ -28,6 +28,10 @@ shards:
     github: crystal-loot/exception_page
     version: 0.1.4
 
+  http_proxy:
+    github: mamantoha/http_proxy
+    version: 0.7.1
+
   kemal:
     github: kemalcr/kemal
     version: 0.26.1

shard.yml

@@ -1,5 +1,5 @@
 name: mango
-version: 0.9.0
+version: 0.11.0
 
 authors:
   - Alex Ling <hkalexling@gmail.com>
@@ -32,3 +32,5 @@ dependencies:
     version: ~> 0.20.0
   myhtml:
     github: kostya/myhtml
+  http_proxy:
+    github: mamantoha/http_proxy

spec/spec_helper.cr

@@ -2,6 +2,7 @@ require "spec"
 require "../src/queue"
 require "../src/server"
 require "../src/config"
+require "../src/main_fiber"
 
 class State
   @@hash = {} of String => String

src/config.cr

@@ -52,12 +52,8 @@ class Config
       config.fill_defaults
       return config
     end
-    puts "The config file #{cfg_path} does not exist." \
+    puts "The config file #{cfg_path} does not exist. " \
-         " Do you want mango to dump the default config there? [Y/n]"
+         "Dumping the default config there."
-    input = gets
-    if input && input.downcase == "n"
-      abort "Aborting..."
-    end
     default = self.allocate
     default.path = path
     default.fill_defaults

src/library/library.cr

@@ -30,6 +30,41 @@ class Library
     @title_ids.map { |tid| self.get_title!(tid) }
   end
 
+  def sorted_titles(username, opt : SortOptions? = nil)
+    if opt.nil?
+      opt = SortOptions.from_info_json @dir, username
+    else
+      TitleInfo.new @dir do |info|
+        info.sort_by[username] = opt.to_tuple
+        info.save
+      end
+    end
+
+    # This is a hack to bypass a compiler bug
+    ary = titles
+
+    case opt.not_nil!.method
+    when .time_modified?
+      ary.sort! { |a, b| (a.mtime <=> b.mtime).or \
+        compare_numerically a.title, b.title }
+    when .progress?
+      ary.sort! do |a, b|
+        (a.load_percentage(username) <=> b.load_percentage(username)).or \
+          compare_numerically a.title, b.title
+      end
+    else
+      unless opt.method.auto?
+        Logger.warn "Unknown sorting method #{opt.not_nil!.method}. Using " \
+                    "Auto instead"
+      end
+      ary.sort! { |a, b| compare_numerically a.title, b.title }
+    end
+
+    ary.reverse! unless opt.not_nil!.ascend
+
+    ary
+  end
+
   def deep_titles
     titles + titles.map { |t| t.deep_titles }.flatten
   end
@@ -57,7 +92,6 @@ class Library
                   "Attempting to create it"
       Dir.mkdir_p @dir
     end
-    @title_ids.clear
 
     storage = Storage.new auto_close: false
 
@@ -68,6 +102,7 @@ class Library
       .map { |path| Title.new path, "", storage, self }
       .select { |title| !(title.entries.empty? && title.titles.empty?) }
       .sort { |a, b| a.title <=> b.title }
+      .tap { |_| @title_ids.clear }
       .each do |title|
         @title_hash[title.id] = title
         @title_ids << title.id
@@ -83,7 +118,7 @@ class Library
     cr_entries = deep_titles
       .map { |t| t.get_last_read_entry username }
       # Select elements with type `Entry` from the array and ignore all `Nil`s
-      .select(Entry)[0..11]
+      .select(Entry)[0...ENTRIES_IN_HOME_SECTIONS]
       .map { |e|
         # Get the last read time of the entry. If it hasn't been started, get
         #   the last read time of the previous entry
@@ -143,41 +178,20 @@ class Library
         end
       end
 
-    recently_added[0..11]
+    recently_added[0...ENTRIES_IN_HOME_SECTIONS]
   end
 
-  def sorted_titles(username, opt : SortOptions? = nil)
+  def get_start_reading_titles(username)
-    if opt.nil?
+    # Here we are not using `deep_titles` as it may cause unexpected behaviors
-      opt = SortOptions.from_info_json @dir, username
+    # For example, consider the following nested titles:
-    else
+    #   - One Puch Man
-      TitleInfo.new @dir do |info|
+    #     - Vol. 1
-        info.sort_by[username] = opt.to_tuple
+    #     - Vol. 2
-        info.save
+    # If we use `deep_titles`, the start reading section might include `Vol. 2`
-      end
+    #   when the user hasn't started `Vol. 1` yet
-    end
+    titles
-
+      .select { |t| t.load_percentage(username) == 0 }
-    # This is a hack to bypass a compiler bug
+      .sample(ENTRIES_IN_HOME_SECTIONS)
-    ary = titles
+      .shuffle
-
-    case opt.not_nil!.method
-    when .time_modified?
-      ary.sort! { |a, b| (a.mtime <=> b.mtime).or \
-        compare_numerically a.title, b.title }
-    when .progress?
-      ary.sort! do |a, b|
-        (a.load_percentage(username) <=> b.load_percentage(username)).or \
-          compare_numerically a.title, b.title
-      end
-    else
-      unless opt.method.auto?
-        Logger.warn "Unknown sorting method #{opt.not_nil!.method}. Using " \
-                    "Auto instead"
-      end
-      ary.sort! { |a, b| compare_numerically a.title, b.title }
-    end
-
-    ary.reverse! unless opt.not_nil!.ascend
-
-    ary
   end
 end

src/library/title.cr

@@ -355,4 +355,24 @@ class Title
     return zip if title_ids.empty?
     zip + titles.map { |t| t.deep_entries_with_date_added }.flatten
   end
+
+  def bulk_progress(action, ids : Array(String), username)
+    selected_entries = ids
+      .map { |id|
+        @entries.find { |e| e.id == id }
+      }
+      .select(Entry)
+
+    TitleInfo.new @dir do |info|
+      selected_entries.each do |e|
+        page = action == "read" ? e.pages : 0
+        if info.progress[username]?.nil?
+          info.progress[username] = {e.title => page}
+        else
+          info.progress[username][e.title] = page
+        end
+      end
+      info.save
+    end
+  end
 end

src/main_fiber.cr

@@ -0,0 +1,34 @@
+# On ARM, connecting to the SQLite DB from a spawned fiber would crash
+#   https://github.com/crystal-lang/crystal-sqlite3/issues/30
+# This is a temporary workaround that forces the relevant code to run in the
+#   main fiber
+
+class MainFiber
+  @@channel = Channel(-> Nil).new
+  @@done = Channel(Bool).new
+  @@main_fiber = Fiber.current
+
+  def self.start_and_block
+    loop do
+      if proc = @@channel.receive
+        begin
+          proc.call
+        ensure
+          @@done.send true
+        end
+      end
+      Fiber.yield
+    end
+  end
+
+  def self.run(&block : -> Nil)
+    if @@main_fiber == Fiber.current
+      block.call
+    else
+      @@channel.send block
+      until @@done.receive
+        Fiber.yield
+      end
+    end
+  end
+end

src/mangadex/api.cr

@@ -1,4 +1,3 @@
-require "http/client"
 require "json"
 require "csv"
 require "../rename"

src/mangadex/downloader.cr

@@ -27,6 +27,7 @@ module MangaDex
 
     def pop : Queue::Job?
       job = nil
+      MainFiber.run do
         DB.open "sqlite3://#{@queue.path}" do |db|
           begin
             db.query_one "select * from queue where id not like '%-%' " \
@@ -37,6 +38,7 @@ module MangaDex
           rescue
           end
         end
+      end
       job
     end
 

src/mango.cr

@@ -1,12 +1,29 @@
 require "./config"
 require "./queue"
 require "./server"
+require "./main_fiber"
 require "./mangadex/*"
 require "option_parser"
 require "clim"
 require "./plugin/*"
 
-MANGO_VERSION = "0.9.0"
+MANGO_VERSION = "0.11.0"
+
+# From http://www.network-science.de/ascii/
+BANNER = %{
+
+              _|      _|
+              _|_|  _|_|    _|_|_|  _|_|_|      _|_|_|    _|_|
+              _|  _|  _|  _|    _|  _|    _|  _|    _|  _|    _|
+              _|      _|  _|    _|  _|    _|  _|    _|  _|    _|
+              _|      _|    _|_|_|  _|    _|    _|_|_|    _|_|
+                                                    _|
+                                                _|_|
+
+
+}
+
+DESCRIPTION = "Mango - Manga Server and Web Reader. Version #{MANGO_VERSION}"
 
 macro common_option
   option "-c PATH", "--config=PATH", type: String,
@@ -22,20 +39,28 @@ end
 
 class CLI < Clim
   main do
-    desc "Mango - Manga Server and Web Reader. Version #{MANGO_VERSION}"
+    desc DESCRIPTION
     usage "mango [sub_command] [options]"
     help short: "-h"
     version "Version #{MANGO_VERSION}", short: "-v"
     common_option
     run do |opts|
+      puts BANNER
+      puts DESCRIPTION
+      puts
+
+      # empty ARGV so it won't be passed to Kemal
+      ARGV.clear
+
       Config.load(opts.config).set_current
       MangaDex::Downloader.default
       Plugin::Downloader.default
 
-      # empty ARGV so it won't be passed to Kemal
+      spawn do
-      ARGV.clear
+        Server.new.start
-      server = Server.new
+      end
-      server.start
+
+      MainFiber.start_and_block
     end
 
     sub "admin" do

src/plugin/downloader.cr

@@ -8,6 +8,7 @@ class Plugin
 
     def pop : Queue::Job?
       job = nil
+      MainFiber.run do
         DB.open "sqlite3://#{@queue.path}" do |db|
           begin
             db.query_one "select * from queue where id like '%-%' " \
@@ -18,6 +19,7 @@ class Plugin
           rescue
           end
         end
+      end
       job
     end
 

src/plugin/plugin.cr

@@ -1,6 +1,5 @@
 require "duktape/runtime"
 require "myhtml"
-require "http"
 require "xml"
 
 class Plugin

src/queue.cr

@@ -119,6 +119,7 @@ class Queue
                   "Attepmting to create it"
       Dir.mkdir_p dir
     end
+    MainFiber.run do
       DB.open "sqlite3://#{@path}" do |db|
         begin
           db.exec "create table if not exists queue " \
@@ -138,11 +139,13 @@ class Queue
         end
       end
     end
+  end
 
   # Push an array of jobs into the queue, and return the number of jobs
   #   inserted. Any job already exists in the queue will be ignored.
   def push(jobs : Array(Job))
     start_count = self.count
+    MainFiber.run do
       DB.open "sqlite3://#{@path}" do |db|
         jobs.each do |job|
           db.exec "insert or ignore into queue values " \
@@ -152,16 +155,19 @@ class Queue
             job.success_count, job.fail_count, job.time.to_unix_ms
         end
       end
+    end
     self.count - start_count
   end
 
   def reset(id : String)
+    MainFiber.run do
       DB.open "sqlite3://#{@path}" do |db|
         db.exec "update queue set status = 0, status_message = '', " \
                 "pages = 0, success_count = 0, fail_count = 0 " \
                 "where id = (?)", id
       end
     end
+  end
 
   def reset(job : Job)
     self.reset job.id
@@ -169,91 +175,113 @@ class Queue
 
   # Reset all failed tasks (missing pages and error)
   def reset
+    MainFiber.run do
       DB.open "sqlite3://#{@path}" do |db|
         db.exec "update queue set status = 0, status_message = '', " \
                 "pages = 0, success_count = 0, fail_count = 0 " \
                 "where status = 2 or status = 4"
       end
     end
+  end
 
   def delete(id : String)
+    MainFiber.run do
       DB.open "sqlite3://#{@path}" do |db|
         db.exec "delete from queue where id = (?)", id
       end
     end
+  end
 
   def delete(job : Job)
     self.delete job.id
   end
 
   def delete_status(status : JobStatus)
+    MainFiber.run do
       DB.open "sqlite3://#{@path}" do |db|
         db.exec "delete from queue where status = (?)", status.to_i
       end
     end
+  end
 
   def count_status(status : JobStatus)
     num = 0
+    MainFiber.run do
       DB.open "sqlite3://#{@path}" do |db|
         num = db.query_one "select count(*) from queue where " \
                            "status = (?)", status.to_i, as: Int32
       end
+    end
     num
   end
 
   def count
     num = 0
+    MainFiber.run do
       DB.open "sqlite3://#{@path}" do |db|
         num = db.query_one "select count(*) from queue", as: Int32
       end
+    end
     num
   end
 
   def set_status(status : JobStatus, job : Job)
+    MainFiber.run do
       DB.open "sqlite3://#{@path}" do |db|
         db.exec "update queue set status = (?) where id = (?)",
           status.to_i, job.id
       end
     end
+  end
 
   def get_all
     jobs = [] of Job
+    MainFiber.run do
       DB.open "sqlite3://#{@path}" do |db|
         jobs = db.query_all "select * from queue order by time" do |rs|
           Job.from_query_result rs
         end
       end
+    end
     jobs
   end
 
   def add_success(job : Job)
+    MainFiber.run do
       DB.open "sqlite3://#{@path}" do |db|
         db.exec "update queue set success_count = success_count + 1 " \
                 "where id = (?)", job.id
       end
     end
+  end
 
   def add_fail(job : Job)
+    MainFiber.run do
       DB.open "sqlite3://#{@path}" do |db|
         db.exec "update queue set fail_count = fail_count + 1 " \
                 "where id = (?)", job.id
       end
     end
+  end
 
   def set_pages(pages : Int32, job : Job)
+    MainFiber.run do
       DB.open "sqlite3://#{@path}" do |db|
         db.exec "update queue set pages = (?), success_count = 0, " \
                 "fail_count = 0 where id = (?)", pages, job.id
       end
     end
+  end
 
   def add_message(msg : String, job : Job)
+    MainFiber.run do
       DB.open "sqlite3://#{@path}" do |db|
         db.exec "update queue set status_message = " \
                 "status_message || (?) || (?) where id = (?)",
           "\n", msg, job.id
       end
     end
+  end
 
   def <<(downloader : Downloader)
     @downloaders << downloader

src/routes/api.cr

@@ -97,6 +97,28 @@ class APIRouter < Router
       end
     end
 
+    post "/api/bulk-progress/:action/:title" do |env|
+      begin
+        username = get_username env
+        title = (@context.library.get_title env.params.url["title"]).not_nil!
+        action = env.params.url["action"]
+        ids = env.params.json["ids"].as(Array).map &.as_s
+
+        unless action.in? ["read", "unread"]
+          raise "Unknow action #{action}"
+        end
+        title.bulk_progress action, ids, username
+      rescue e
+        @context.error e
+        send_json env, {
+          "success" => false,
+          "error"   => e.message,
+        }.to_json
+      else
+        send_json env, {"success" => true}.to_json
+      end
+    end
+
     post "/api/admin/display_name/:title/:name" do |env|
       begin
         title = (@context.library.get_title env.params.url["title"])

src/routes/main.cr

@@ -103,6 +103,7 @@ class MainRouter < Router
         continue_reading = @context
           .library.get_continue_reading_entries username
         recently_added = @context.library.get_recently_added_entries username
+        start_reading = @context.library.get_start_reading_titles username
         titles = @context.library.titles
         new_user = !titles.any? { |t| t.load_percentage(username) > 0 }
         empty_library = titles.size == 0

src/storage.cr

@@ -32,6 +32,7 @@ class Storage
                   "Attepmting to create it"
       Dir.mkdir_p dir
     end
+    MainFiber.run do
       DB.open "sqlite3://#{@path}" do |db|
         begin
           # We create the `ids` table first. even if the uses has an
@@ -66,6 +67,7 @@ class Storage
         @db = DB.open "sqlite3://#{@path}"
       end
     end
+  end
 
   macro init_admin
     random_pw = random_str
@@ -87,6 +89,8 @@ class Storage
   end
 
   def verify_user(username, password)
+    out_token = nil
+    MainFiber.run do
       get_db do |db|
         begin
           hash, token = db.query_one "select password, token from " \
@@ -94,24 +98,29 @@ class Storage
             username, as: {String, String?}
           unless verify_password hash, password
             Logger.debug "Password does not match the hash"
-          return nil
+            next
           end
           Logger.debug "User #{username} verified"
-        return token if token
+          if token
+            out_token = token
+            next
+          end
           token = random_str
           Logger.debug "Updating token for #{username}"
           db.exec "update users set token = (?) where username = (?)",
             token, username
-        return token
+          out_token = token
         rescue e
           Logger.error "Error when verifying user #{username}: #{e}"
-        return nil
         end
       end
     end
+    out_token
+  end
 
   def verify_token(token)
     username = nil
+    MainFiber.run do
       get_db do |db|
         begin
           username = db.query_one "select username from users where " \
@@ -120,11 +129,13 @@ class Storage
           Logger.debug "Unable to verify token"
         end
       end
+    end
     username
   end
 
   def verify_admin(token)
     is_admin = false
+    MainFiber.run do
       get_db do |db|
         begin
           is_admin = db.query_one "select admin from users where " \
@@ -133,11 +144,13 @@ class Storage
           Logger.debug "Unable to verify user as admin"
         end
       end
+    end
     is_admin
   end
 
   def list_users
     results = Array(Tuple(String, Bool)).new
+    MainFiber.run do
       get_db do |db|
         db.query "select username, admin from users" do |rs|
           rs.each do
@@ -145,6 +158,7 @@ class Storage
           end
         end
       end
+    end
     results
   end
 
@@ -152,17 +166,20 @@ class Storage
     validate_username username
     validate_password password
     admin = (admin ? 1 : 0)
+    MainFiber.run do
       get_db do |db|
         hash = hash_password password
         db.exec "insert into users values (?, ?, ?, ?)",
           username, hash, nil, admin
       end
     end
+  end
 
   def update_user(original_username, username, password, admin)
     admin = (admin ? 1 : 0)
     validate_username username
     validate_password password unless password.empty?
+    MainFiber.run do
       get_db do |db|
         if password.empty?
           db.exec "update users set username = (?), admin = (?) " \
@@ -176,14 +193,18 @@ class Storage
         end
       end
     end
+  end
 
   def delete_user(username)
+    MainFiber.run do
       get_db do |db|
         db.exec "delete from users where username = (?)", username
       end
     end
+  end
 
   def logout(token)
+    MainFiber.run do
       get_db do |db|
         begin
           db.exec "update users set token = (?) where token = (?)", nil, token
@@ -191,13 +212,16 @@ class Storage
         end
       end
     end
+  end
 
   def get_id(path, is_title)
     id = nil
+    MainFiber.run do
       get_db do |db|
         id = db.query_one? "select id from ids where path = (?)", path,
           as: {String}
       end
+    end
     id
   end
 
@@ -206,6 +230,7 @@ class Storage
   end
 
   def bulk_insert_ids
+    MainFiber.run do
       get_db do |db|
         db.transaction do |tx|
           @insert_ids.each do |tp|
@@ -216,12 +241,15 @@ class Storage
       end
       @insert_ids.clear
     end
+  end
 
   def close
+    MainFiber.run do
       unless @db.nil?
         @db.not_nil!.close
       end
     end
+  end
 
   def to_json(json : JSON::Builder)
     json.string self

src/util/proxy.cr

@@ -0,0 +1,42 @@
+require "http_proxy"
+
+# Monkey-patch `HTTP::Client` to make it respect the `*_PROXY`
+#   environment variables
+module HTTP
+  class Client
+    private def self.exec(uri : URI, tls : TLSContext = nil)
+      Logger.debug "Using monkey-patched HTTP::Client"
+      previous_def uri, tls do |client, path|
+        client.set_proxy get_proxy uri
+        yield client, path
+      end
+    end
+  end
+end
+
+private def get_proxy(uri : URI) : HTTP::Proxy::Client?
+  no_proxy = ENV["no_proxy"]? || ENV["NO_PROXY"]?
+  return if no_proxy &&
+            no_proxy.split(",").any? &.== uri.hostname
+
+  case uri.scheme
+  when "http"
+    env_to_proxy "http_proxy"
+  when "https"
+    env_to_proxy "https_proxy"
+  else
+    nil
+  end
+end
+
+private def env_to_proxy(key : String) : HTTP::Proxy::Client?
+  val = ENV[key.downcase]? || ENV[key.upcase]?
+  return if val.nil?
+
+  begin
+    uri = URI.parse val
+    HTTP::Proxy::Client.new uri.hostname.not_nil!, uri.port.not_nil!
+  rescue
+    nil
+  end
+end

src/util/util.cr

@@ -1,4 +1,5 @@
 IMGS_PER_PAGE            = 5
+ENTRIES_IN_HOME_SECTIONS = 8
 UPLOAD_URL_PREFIX        = "/uploads"
 STATIC_DIRS              = ["/css", "/js", "/img", "/favicon.ico"]
 

src/views/components/card.html.ecr

@@ -35,12 +35,20 @@
       onclick="location='<%= base_url %>book/<%= item.id %>'" 
     <% end %>>
 
-    <div class="uk-card uk-card-default">
+    <div class="uk-card uk-card-default" x-data="{selected: false, hover: false, disabled: true}" :class="{selected: selected}"
-      <div class="uk-card-media-top">
+      <% if page == "title" && item.is_a?(Entry) && item.err_msg.nil? %>
-        <img data-src="<%= item.cover_url %>" data-width data-height alt="" uk-img
+        x-init="disabled = false"
+      <% end %>>
+      <div class="uk-card-media-top uk-inline" @mouseenter="hover = true" @mouseleave="hover = false">
+        <img data-src="<%= item.cover_url %>" width="100%" height="100%" alt="" uk-img
         <% if item.is_a? Entry && item.err_msg %>
           class="grayscale"
         <% end %>>
+        <div class="uk-overlay-primary uk-position-cover" x-show="!disabled && (selected || hover)">
+          <div class="uk-position-center">
+            <span class="fas fa-check-circle fa-3x" @click.stop="selected = !selected; $dispatch(selected ? 'add' : 'remove')" :style="`color:${selected && 'orange'};`"></span>
+          </div>
+        </div>
       </div>
 
       <div class="uk-card-body">

src/views/components/head.html.ecr

@@ -10,5 +10,6 @@
   <script defer src="<%= base_url %>js/fontawesome.min.js"></script>
   <script defer src="<%= base_url %>js/solid.min.js"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/gh/alpinejs/alpine@v2.5.0/dist/alpine.min.js" defer></script>
   <script src="<%= base_url %>js/theme.js"></script>
 </head>

src/views/home.html.ecr

@@ -41,7 +41,7 @@
 
   <%- unless continue_reading.empty? -%>
     <h2 class="uk-title home-headings">Continue Reading</h2>
-    <div id="item-container-continue" class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
+    <div class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
       <%- continue_reading.each do |cr| -%>
         <% item = cr[:entry] %>
         <% progress = cr[:percentage] %>
@@ -50,9 +50,20 @@
     </div>
   <%- end -%>
 
+  <%- unless start_reading.empty? -%>
+    <h2 class="uk-title home-headings">Start Reading</h2>
+    <div class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
+      <%- start_reading.each do |t| -%>
+        <% item = t %>
+        <% progress = 0.0 %>
+        <%= render_component "card" %>
+      <%- end -%>
+    </div>
+  <%- end -%>
+
   <%- unless recently_added.empty? -%>
     <h2 class="uk-title home-headings">Recently Added</h2>
-    <div id="item-container-continue" class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
+    <div class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
       <%- recently_added.each do |ra| -%>
         <% item = ra %>
         <% progress = ra[:percentage] %>

src/views/layout.html.ecr

@@ -67,10 +67,13 @@
     </div>
     <div class="uk-section uk-section-small">
     </div>
-    <div class="uk-section uk-section-small">
+    <div class="uk-section uk-section-small" id="main-section">
       <div class="uk-container uk-container-small">
         <div id="alert"></div>
         <%= content %>
+        <div class="uk-visible@m" id="totop-wrapper" x-data="{}" x-show="$('body').height() > 1.5 * $(window).height()">
+          <a href="#" uk-totop uk-scroll></a>
+        </div>
       </div>
     </div>
     <script>

src/views/library.html.ecr

@@ -16,7 +16,7 @@
     <%= render_component "sort-form" %>
   </div>
 </div>
-<div id="item-container" class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
+<div class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
   <% titles.each_with_index do |item, i| %>
     <% progress = percentage[i] %>
     <%= render_component "card" %>

src/views/title.html.ecr

@@ -1,4 +1,23 @@
 <div>
+  <div id="select-bar" class="uk-card uk-card-body uk-card-default uk-margin-bottom" uk-sticky="offset:10" x-data="{count: 0}" @add.window="count++" @remove.window="count--" x-show="count > 0" style="border:orange;border-style:solid;" x-cloak data-id="<%= title.id %>">
+    <div class="uk-child-width-1-3" uk-grid>
+      <div>
+        <p x-text="count + ' items selected'" style="color:orange"></p>
+      </div>
+      <div class="uk-text-center" id="select-bar-controls">
+        <a class="uk-icon uk-margin-right" uk-tooltip="title: Mark selected as read" href="" @click.prevent="bulkProgress('read', $el)">
+          <i class="fas fa-check-circle"></i>
+        </a>
+        <a class="uk-icon" uk-tooltip="title: Mark selected as unread" href="" @click.prevent="bulkProgress('unread', $el)">
+          <i class="fas fa-times-circle"></i>
+        </a>
+      </div>
+      <div class="uk-text-right">
+        <a @click="selectAll()" uk-tooltip="title: Select all"><i class="fas fa-check-double uk-margin-small-right"></i></a>
+        <a @click="deselectAll();" uk-tooltip="title: Deselect all"><i class="fas fa-times"></i></a>
+      </div>
+    </div>
+  </div>
   <h2 class=uk-title><span><%= title.display_name %></span>
     &nbsp;
     <% if is_admin %>
@@ -32,11 +51,14 @@
     <%= render_component "sort-form" %>
   </div>
 </div>
-<div id="item-container" class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
+
+<div class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
   <% title.titles.each_with_index do |item, i| %>
     <% progress = title_percentage[i] %>
     <%= render_component "card" %>
   <% end %>
+</div>
+<div class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
   <% entries.each_with_index do |item, i| %>
     <% progress = percentage[i] %>
     <%= render_component "card" %>