Bump version to v0.7.1

Kemal is having some issues in 0.35.0: https://github.com/kemalcr/kemal/issues/575

.ameba.yml

@@ -0,0 +1,9 @@
+Lint/UselessAssign:
+  Excluded:
+    - src/routes/*
+    - src/server.cr
+Lint/UnusedArgument:
+  Excluded:
+    - src/routes/*
+Metrics/CyclomaticComplexity:
+  Enabled: false

.github/FUNDING.yml

@@ -1,3 +1,4 @@
 # These are supported funding model platforms
 
 patreon: hkalexling
+ko_fi: hkalexling

.github/ISSUE_TEMPLATE/bug_report.md

@@ -26,7 +26,7 @@ A clear and concise description of what you expected to happen.
  - Mango Version [e.g. v0.1.0]
 
 **Docker (if you are running Mango in a Docker container)**
-- The `docker-compose.yml` file you are using
+- The `docker-compose.yml` file you are using, or your `.env` file.
 
 **Additional context**
 Add any other context about the problem here. Add screenshots if applicable.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -8,10 +8,13 @@ assignees: ''
 ---
 
 **Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+A clear and concise description of what the problem is. E.g. I'm always frustrated when [...]
 
 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.
 
+**Describe a small use-case for this feature request**
+How would you imagine this to be used? What would be the advantage of this for the users of the application?
+
 **Additional context**
 Add any other context or screenshots about the feature request here.

.github/workflows/build.yml

@@ -8,17 +8,24 @@ on:
 
 jobs:
   build:
+    if: "!contains(github.event.head_commit.message, 'skip ci')"
 
     runs-on: ubuntu-latest
-
     container:
-      image: crystallang/crystal:0.32.1-alpine
+      image: crystallang/crystal:0.34.0-alpine
 
     steps:
     - uses: actions/checkout@v2
     - name: Install dependencies
-      run: apk add --no-cache yarn yaml sqlite-static
+      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
+      run: make static
+    - name: Linter
+      run: make check
     - name: Run tests
       run: make test
+    - name: Upload artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: mango
+        path: mango

.github/workflows/dockerhub.yml

@@ -0,0 +1,19 @@
+name: Publish Dockerhub
+on:
+  release:
+    types: [published]
+jobs:
+  update:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Get release version
+      id: get_version
+      run: echo ::set-env name=RELEASE_VERSION::$(echo ${GITHUB_REF:10})
+    - name: Publish to Dockerhub
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: hkalexling/mango
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        tags: "latest,${{ env.RELEASE_VERSION }}"

.gitignore

@@ -7,4 +7,6 @@ node_modules
 yarn.lock
 dist
 mango
-docker-compose.yml
+.env
+*.md
+public/css/uikit.css

Dockerfile

@@ -1,10 +1,10 @@
-FROM crystallang/crystal:0.32.1-alpine AS builder
+FROM crystallang/crystal:0.34.0-alpine AS builder
 
 WORKDIR /Mango
 
 COPY . .
 COPY package*.json .
-RUN apk add --no-cache yarn yaml sqlite-static \
+RUN apk add --no-cache yarn yaml sqlite-static libarchive-dev libarchive-static acl-static expat-static zstd-static lz4-static bzip2-static \
     && make static
 
 FROM library/alpine

Makefile

@@ -1,4 +1,4 @@
-PREFIX=/usr/local
+PREFIX ?= /usr/local
 INSTALL_DIR=$(PREFIX)/bin
 
 all: uglify | build
@@ -14,7 +14,7 @@ static: uglify | libs
 	crystal build src/mango.cr --release --progress --static
 
 libs:
-	shards install
+	shards install --production
 
 run:
 	crystal run src/mango.cr --error-trace
@@ -22,6 +22,11 @@ run:
 test:
 	crystal spec
 
+check:
+	crystal tool format --check
+	./bin/ameba
+	./dev/linewidth.sh
+
 install:
 	cp mango $(INSTALL_DIR)/mango
 

README.md

@@ -1,6 +1,3 @@
-
-
-
 ![banner](./public/img/banner-paddings.png)
 
 # Mango
@@ -10,32 +7,39 @@
 Mango is a self-hosted manga server and reader. Its features include
 
 - Multi-user support
+- OPDS support
 - Dark/light mode switch
-- Supports both `.zip` and `.cbz` formats
+- Supported formats: `.cbz`, `.zip`, `.cbr` and `.rar`
 - Supports nested folders in library
 - Automatically stores reading progress
 - Built-in [MangaDex](https://mangadex.org/) downloader
 - 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
 
+Please check the [Wiki](https://github.com/hkalexling/Mango/wiki) for more information.
+
 ## Installation
 
 ### Pre-built Binary
 
-1. Simply download the pre-built binary file `mango` for the latest [release](https://github.com/hkalexling/Mango/releases). All the dependencies are statically linked, and it should work with most Linux systems on amd64.
+Simply download the pre-built binary file `mango` for the latest [release](https://github.com/hkalexling/Mango/releases). All the dependencies are statically linked, and it should work with most Linux systems on amd64.
 
 ### Docker
 
 1. Make sure you have docker installed and running. You will also need `docker-compose`
 2. Clone the repository
-3. Copy `docker-compose.example.yml` to `docker-compose.yml`
-4. Modify the `volumes` in `docker-compose.yml` to point the directories to desired locations on the host machine
+3. Copy the `env.example` file to `.env`
+4. Fill out the values in the `.env` file. Note that the main and config directories will be created if they don't already exist. The files in these folders will be owned by the root user
 5. Run `docker-compose up`. This should build the docker image and start the container with Mango running inside
-6. Head over to `localhost:9000` to log in
+6. Head over to `localhost:9000` (or a different port if you changed it) to log in
+
+### Docker (via Dockerhub)
+
+The official docker images are available on [Dockerhub](https://hub.docker.com/r/hkalexling/mango).
 
 ### Build from source
 
-1. Make sure you have Crystal, Node and Yarn installed. You might also need to install the development headers for `libsqlite3` and `libyaml`.
+1. Make sure you have `crystal`, `shards` and `yarn` installed. You might also need to install the development headers of some libraries. Please see the [Dockerfile](https://github.com/hkalexling/Mango/blob/master/Dockerfile) for the full list of dependencies
 2. Clone the repository
 3. `make && sudo make install`
 4. Start Mango by running the command `mango`
@@ -46,11 +50,21 @@ Mango is a self-hosted manga server and reader. Its features include
 ### CLI
 
 ```
-Mango e-manga server/reader. Version 0.2.0
+  Mango - Manga Server and Web Reader. Version 0.7.1
 
-    -v, --version                    Show version
-    -h, --help                       Show help
-    -c PATH, --config=PATH           Path to the config file. Default is `~/.config/mango/config.yml`
+  Usage:
+
+    mango [sub_command] [options]
+
+  Options:
+
+    -c PATH, --config=PATH           Path to the config file [type:String]
+    -h, --help                       Show this help.
+    -v, --version                    Show version.
+
+  Sub Commands:
+
+    admin   Run admin tools
 ```
 
 ### Config
@@ -60,16 +74,20 @@ The default config file location is `~/.config/mango/config.yml`. It might be di
 ```yaml
 ---
 port: 9000
+base_url: /
 library_path: ~/mango/library
 db_path: ~/mango/mango.db
 scan_interval_minutes: 5
 log_level: info
+upload_path: ~/mango/uploads
 mangadex:
   base_url: https://mangadex.org
   api_url: https://mangadex.org/api
   download_wait_seconds: 5
   download_retries: 4
   download_queue_db_path: ~/mango/queue.db
+  chapter_rename_rule: '[Vol.{volume} ][Ch.{chapter} ]{title|id}'
+  manga_rename_rule: '{title}'
 ```
 
 - `scan_interval_minutes` can be any non-negative integer. Setting it to `0` disables the periodic scan
@@ -77,7 +95,7 @@ mangadex:
 
 ### Library Structure
 
-You can organize your `.cbz/.zip` files in nested folders in the library directory. Here's an example:
+You can organize your archive files in nested folders in the library directory. Here's an example:
 
 ```
 .
@@ -89,8 +107,8 @@ You can organize your `.cbz/.zip` files in nested folders in the library directo
 └── Manga 2
     └── Vol. 1
         └── Ch.1 - Ch.3
-            ├── 1.zip 
-            ├── 2.zip 
+            ├── 1.zip
+            ├── 2.zip
             └── 3.zip
 ```
 
@@ -122,4 +140,6 @@ Mobile UI:
 
 ## Contributors
 
+Please check the [development guideline](https://github.com/hkalexling/Mango/wiki/Development) if you are interest 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)

dev/linewidth.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+[ ! -z "$(grep '.\{80\}' --exclude-dir=lib --include="*.cr" -nr --color=always . | tee /dev/tty)" ] \
+	&& echo "The above lines exceed the 80 characters limit" \
+	|| exit 0

docker-compose.yml

@@ -7,9 +7,9 @@ services:
       context: .
       dockerfile: ./Dockerfile
     expose:
-      - 9000
+      - ${PORT}
     ports:
-      - 9000:9000
+      - "${PORT}:9000"
     volumes:
-      - ~/mango:/root/mango
-      - ~/.config/mango:/root/.config/mango
+      - ${MAIN_DIRECTORY_PATH}:/root/mango
+      - ${CONFIG_DIRECTORY_PATH}:/root/.config/mango

env.example

@@ -0,0 +1,10 @@
+# Port that exposes the HTTP frontend
+PORT=9000
+
+# Path to the mango main directory
+# This directory holds the database and the library files
+MAIN_DIRECTORY_PATH=
+
+# Path to the mango config directory
+# This directory holds the mango configuration path
+CONFIG_DIRECTORY_PATH=

gulpfile.js

@@ -1,6 +1,7 @@
 const gulp = require('gulp');
 const minify = require("gulp-babel-minify");
 const minifyCss = require('gulp-minify-css');
+const less = require('gulp-less');
 
 gulp.task('minify-js', () => {
 	return gulp.src('public/js/*.js')
@@ -10,6 +11,12 @@ gulp.task('minify-js', () => {
 		.pipe(gulp.dest('dist/js'));
 });
 
+gulp.task('less', () => {
+	return gulp.src('src/assets/*.less')
+		.pipe(less())
+		.pipe(gulp.dest('public/css'));
+});
+
 gulp.task('minify-css', () => {
 	return gulp.src('public/css/*.css')
 		.pipe(minifyCss())
@@ -21,9 +28,9 @@ gulp.task('img', () => {
 		.pipe(gulp.dest('dist/img'));
 });
 
-gulp.task('favicon', () => {
-	return gulp.src('public/favicon.ico')
+gulp.task('copy-files', () => {
+	return gulp.src('public/*.*')
 		.pipe(gulp.dest('dist'));
 });
 
-gulp.task('default', gulp.parallel('minify-js', 'minify-css', 'img', 'favicon'));
+gulp.task('default', gulp.parallel('minify-js', gulp.series('less', 'minify-css'), 'img', 'copy-files'));

package.json

@@ -8,9 +8,14 @@
   "devDependencies": {
     "gulp": "^4.0.2",
     "gulp-babel-minify": "^0.5.1",
-    "gulp-minify-css": "^1.2.4"
+    "gulp-less": "^4.0.1",
+    "gulp-minify-css": "^1.2.4",
+    "less": "^3.11.3"
   },
   "scripts": {
     "uglify": "gulp"
+  },
+  "dependencies": {
+    "uikit": "^3.5.4"
   }
 }

public/css/mango.css

@@ -36,7 +36,8 @@
 	word-wrap: break-word;
 }
 .uk-logo > img {
-	max-height: 90px;
+	height: 90px;
+	width: 90px;
 }
 .uk-search {
 	width: 100%;
@@ -56,3 +57,18 @@
 td > .uk-dropdown {
 	white-space: pre-line;
 }
+#edit-modal .uk-grid > div {
+	height: 300px;
+}
+#edit-modal #cover {
+	height: 100%;
+	width: 100%;
+	object-fit: cover;
+}
+#edit-modal #cover-upload {
+	height: 100%;
+	box-sizing: border-box;
+}
+#edit-modal .uk-modal-body .uk-inline {
+	width: 100%;
+}

public/js/admin.js

@@ -5,7 +5,7 @@ function scan() {
 	$('#scan-status > span').attr('hidden', '');
 	var color = $('#scan').css('color');
 	$('#scan').css('color', 'gray');
-	$.post('/api/admin/scan', function (data) {
+	$.post(base_url + 'api/admin/scan', function (data) {
 		var ms = data.milliseconds;
 		var titles = data.titles;
 		$('#scan-status > span').text('Scanned ' + titles + ' titles in ' + ms + 'ms');

public/js/download-manager.js

@@ -22,97 +22,103 @@ const loadConfig = () => {
 	globalConfig.autoRefresh = $('#auto-refresh').prop('checked');
 };
 const remove = (id) => {
-	var url = '/api/admin/mangadex/queue/delete';
+	var url = base_url + 'api/admin/mangadex/queue/delete';
 	if (id !== undefined)
-		url += '?' + $.param({id: id});
+		url += '?' + $.param({
+			id: id
+		});
 	console.log(url);
 	$.ajax({
-		type: 'POST',
-		url: url,
-		dataType: 'json'
-	})
-	.done(data => {
-		if (!data.success && data.error) {
-			alert('danger', `Failed to remove job from download queue. Error: ${data.error}`);
-			return;
-		}
-		load();
-	})
-	.fail((jqXHR, status) => {
-		alert('danger', `Failed to remove job from download queue. Error: [${jqXHR.status}] ${jqXHR.statusText}`);
-	});
+			type: 'POST',
+			url: url,
+			dataType: 'json'
+		})
+		.done(data => {
+			if (!data.success && data.error) {
+				alert('danger', `Failed to remove job from download queue. Error: ${data.error}`);
+				return;
+			}
+			load();
+		})
+		.fail((jqXHR, status) => {
+			alert('danger', `Failed to remove job from download queue. Error: [${jqXHR.status}] ${jqXHR.statusText}`);
+		});
 };
 const refresh = (id) => {
-	var url = '/api/admin/mangadex/queue/retry';
+	var url = base_url + 'api/admin/mangadex/queue/retry';
 	if (id !== undefined)
-		url += '?' + $.param({id: id});
+		url += '?' + $.param({
+			id: id
+		});
 	console.log(url);
 	$.ajax({
-		type: 'POST',
-		url: url,
-		dataType: 'json'
-	})
-	.done(data => {
-		if (!data.success && data.error) {
-			alert('danger', `Failed to restart download job. Error: ${data.error}`);
-			return;
-		}
-		load();
-	})
-	.fail((jqXHR, status) => {
-		alert('danger', `Failed to restart download job. Error: [${jqXHR.status}] ${jqXHR.statusText}`);
-	});
+			type: 'POST',
+			url: url,
+			dataType: 'json'
+		})
+		.done(data => {
+			if (!data.success && data.error) {
+				alert('danger', `Failed to restart download job. Error: ${data.error}`);
+				return;
+			}
+			load();
+		})
+		.fail((jqXHR, status) => {
+			alert('danger', `Failed to restart download job. Error: [${jqXHR.status}] ${jqXHR.statusText}`);
+		});
 };
 const toggle = () => {
 	$('#pause-resume-btn').attr('disabled', '');
 	const paused = $('#pause-resume-btn').text() === 'Resume download';
 	const action = paused ? 'resume' : 'pause';
-	const url = `/api/admin/mangadex/queue/${action}`;
+	const url = `${base_url}api/admin/mangadex/queue/${action}`;
 	$.ajax({
-		type: 'POST',
-		url: url,
-		dataType: 'json'
-	})
-	.fail((jqXHR, status) => {
-		alert('danger', `Failed to ${action} download queue. Error: [${jqXHR.status}] ${jqXHR.statusText}`);
-	})
-	.always(() => {
-		load();
-		$('#pause-resume-btn').removeAttr('disabled');
-	});
+			type: 'POST',
+			url: url,
+			dataType: 'json'
+		})
+		.fail((jqXHR, status) => {
+			alert('danger', `Failed to ${action} download queue. Error: [${jqXHR.status}] ${jqXHR.statusText}`);
+		})
+		.always(() => {
+			load();
+			$('#pause-resume-btn').removeAttr('disabled');
+		});
 };
 const load = () => {
 	if (loading) return;
 	loading = true;
 	console.log('fetching');
 	$.ajax({
-		type: 'GET',
-		url: '/api/admin/mangadex/queue',
-		dataType: 'json'
-	})
-	.done(data => {
-		if (!data.success && data.error) {
-			alert('danger', `Failed to fetch download queue. Error: ${data.error}`);
-			return;
-		}
-		console.log(data);
-		const btnText = data.paused ? "Resume download" : "Pause download";
-		$('#pause-resume-btn').text(btnText);
-		$('#pause-resume-btn').removeAttr('hidden');
-		const rows = data.jobs.map(obj => {
-			var cls = 'uk-label ';
-			if (obj.status === 'Completed')
-				cls += 'uk-label-success';
-			if (obj.status === 'Error')
-				cls += 'uk-label-danger';
-			if (obj.status === 'MissingPages')
-				cls += 'uk-label-warning';
+			type: 'GET',
+			url: base_url + 'api/admin/mangadex/queue',
+			dataType: 'json'
+		})
+		.done(data => {
+			if (!data.success && data.error) {
+				alert('danger', `Failed to fetch download queue. Error: ${data.error}`);
+				return;
+			}
+			console.log(data);
+			const btnText = data.paused ? "Resume download" : "Pause download";
+			$('#pause-resume-btn').text(btnText);
+			$('#pause-resume-btn').removeAttr('hidden');
+			const rows = data.jobs.map(obj => {
+				var cls = 'label ';
+				if (obj.status === 'Pending')
+					cls += 'label-pending';
+				if (obj.status === 'Completed')
+					cls += 'label-success';
+				if (obj.status === 'Error')
+					cls += 'label-danger';
+				if (obj.status === 'MissingPages')
+					cls += 'label-warning';
 
-			const info = obj.status_message.length > 0 ? '<span uk-icon="info"></span>' : '';
-			const statusSpan = `<span class="${cls}">${obj.status} ${info}</span>`;
-			const dropdown = obj.status_message.length > 0 ? `<div uk-dropdown>${obj.status_message}</div>` : '';
-			const retryBtn = obj.status_message.length > 0 ? `<a onclick="refresh('${obj.id}')" uk-icon="refresh"></a>` : '';
-			return `<tr id="chapter-${obj.id}">
+				const info = obj.status_message.length > 0 ? '<span uk-icon="info"></span>' : '';
+				const statusSpan = `<span class="${cls}">${obj.status} ${info}</span>`;
+				const dropdown = obj.status_message.length > 0 ? `<div uk-dropdown>${obj.status_message}</div>` : '';
+				const retryBtn = obj.status_message.length > 0 ? `<a onclick="refresh('${obj.id}')" uk-icon="refresh"></a>` : '';
+				return `<tr id="chapter-${obj.id}">
 				<td><a href="${baseURL}/chapter/${obj.id}">${obj.title}</a></td>
 				<td><a href="${baseURL}/manga/${obj.manga_id}">${obj.manga_title}</a></td>
 				<td>${obj.success_count}/${obj.pages}</td>
@@ -123,16 +129,16 @@ const load = () => {
 					${retryBtn}
 				</td>
 				</tr>`;
-		});
+			});
 
-		const tbody = `<tbody>${rows.join('')}</tbody>`;
-		$('tbody').remove();
-		$('table').append(tbody);
-	})
-	.fail((jqXHR, status) => {
-		alert('danger', `Failed to fetch download queue. Error: [${jqXHR.status}] ${jqXHR.statusText}`);
-	})
-	.always(() => {
-		loading = false;
-	});
+			const tbody = `<tbody>${rows.join('')}</tbody>`;
+			$('tbody').remove();
+			$('table').append(tbody);
+		})
+		.fail((jqXHR, status) => {
+			alert('danger', `Failed to fetch download queue. Error: [${jqXHR.status}] ${jqXHR.statusText}`);
+		})
+		.always(() => {
+			loading = false;
+		});
 };

public/js/download.js

@@ -33,7 +33,7 @@ const download = () => {
 		console.log(ids);
 		$.ajax({
 			type: 'POST',
-			url: '/api/admin/mangadex/download',
+			url: base_url + 'api/admin/mangadex/download',
 			data: JSON.stringify({chapters: chapters}),
 			contentType: "application/json",
 			dataType: 'json'
@@ -47,7 +47,7 @@ const download = () => {
 			const successCount = parseInt(data.success);
 			const failCount = parseInt(data.fail);
 			UIkit.modal.confirm(`${successCount} of ${successCount + failCount} chapters added to the download queue. Proceed to the download manager?`).then(() => {
-				window.location.href = '/admin/downloads';
+				window.location.href = base_url + 'admin/downloads';
 			});
 			styleModal();
 		})
@@ -109,7 +109,7 @@ const search = () => {
 		return;
 	}
 
-	$.getJSON("/api/admin/mangadex/manga/" + int_id)
+	$.getJSON(`${base_url}api/admin/mangadex/manga/${int_id}`)
 		.done((data) => {
 			if (data.error) {
 				alert('danger', 'Failed to get manga info. Error: ' + data.error);
@@ -242,7 +242,10 @@ const buildTable = () => {
 	Object.entries(filters).forEach(([k, v]) => {
 		if (v === 'All') return;
 		if (k === 'group') {
-			chapters = chapters.filter(c => v in c.groups);
+			chapters = chapters.filter(c => {
+				unescaped_groups = Object.entries(c.groups).map(([g, id]) => unescapeHTML(g));
+				return unescaped_groups.indexOf(v) >= 0;
+			});
 			return;
 		}
 		if (k === 'lang') {
@@ -297,3 +300,9 @@ const buildTable = () => {
 	});
 	$('#selection-controls').removeAttr('hidden');
 };
+
+const unescapeHTML = (str) => {
+   var elt = document.createElement("span");
+   elt.innerHTML = str;
+   return elt.innerText;
+};

public/js/theme.js

@@ -22,8 +22,7 @@ const setTheme = themeStr => {
 		$('.uk-card').addClass('uk-card-secondary');
 		$('.uk-card').removeClass('uk-card-default');
 		$('.ui-widget-content').addClass('dark');
-	}
-	else {
+	} else {
 		$('html').css('background', '');
 		$('body').removeClass('uk-light');
 		$('.uk-card').removeClass('uk-card-secondary');
@@ -39,5 +38,11 @@ const styleModal = () => {
 	$('.uk-modal-footer').css('background', color);
 };
 
-// do it before document is ready to prevent the initial flash of white
+// do it before document is ready to prevent the initial flash of white on
+// 	most pages
 setTheme(getTheme());
+
+$(() => {
+	// hack for the reader page
+	setTheme(getTheme());
+});

public/js/title.js

@@ -2,44 +2,167 @@ function showModal(encodedPath, pages, percentage, encodedeTitle, encodedEntryTi
 	const zipPath = decodeURIComponent(encodedPath);
 	const title = decodeURIComponent(encodedeTitle);
 	const entry = decodeURIComponent(encodedEntryTitle);
-	$('#modal button, #modal a').each(function(){
+	$('#modal button, #modal a').each(function() {
 		$(this).removeAttr('hidden');
 	});
 	if (percentage === 0) {
 		$('#continue-btn').attr('hidden', '');
 		$('#unread-btn').attr('hidden', '');
-	}
-	else {
+	} else if (percentage === 100) {
+		$('#read-btn').attr('hidden', '');
+		$('#continue-btn').attr('hidden', '');
+	} else {
 		$('#continue-btn').text('Continue from ' + percentage + '%');
 	}
-	if (percentage === 100) {
-		$('#read-btn').attr('hidden', '');
-	}
-	$('#modal-title').text(entry);
+
+	$('#modal-title-link').text(title);
+	$('#modal-title-link').attr('href', `${base_url}book/${titleID}`);
+
+	$('#modal-entry-title').find('span').text(entry);
+	$('#modal-entry-title').next().attr('data-id', titleID);
+	$('#modal-entry-title').next().attr('data-entry-id', entryID);
+	$('#modal-entry-title').next().find('.title-rename-field').val(entry);
 	$('#path-text').text(zipPath);
 	$('#pages-text').text(pages + ' pages');
 
-	$('#beginning-btn').attr('href', '/reader/' + titleID + '/' + entryID + '/1');
-	$('#continue-btn').attr('href', '/reader/' + titleID + '/' + entryID);
+	$('#beginning-btn').attr('href', `${base_url}reader/${titleID}/${entryID}/1`);
+	$('#continue-btn').attr('href', `${base_url}reader/${titleID}/${entryID}`);
 
-	$('#read-btn').click(function(){
+	$('#read-btn').click(function() {
 		updateProgress(titleID, entryID, pages);
 	});
-	$('#unread-btn').click(function(){
+	$('#unread-btn').click(function() {
 		updateProgress(titleID, entryID, 0);
 	});
 
+	$('#modal-edit-btn').attr('onclick', `edit("${entryID}")`);
+
+	$('#modal-download-btn').attr('href', `/opds/download/${titleID}/${entryID}`);
+
 	UIkit.modal($('#modal')).show();
 	styleModal();
 }
-function updateProgress(titleID, entryID, page) {
-	$.post('/api/progress/' + titleID + '/' + entryID + '/' + page, function(data) {
+
+const updateProgress = (tid, eid, page) => {
+	let url = `${base_url}api/progress/${tid}/${page}`
+	const query = $.param({
+		entry: eid
+	});
+	if (eid)
+		url += `?${query}`;
+	$.post(url, (data) => {
 		if (data.success) {
 			location.reload();
-		}
-		else {
+		} else {
 			error = data.error;
 			alert('danger', error);
 		}
 	});
-}
+};
+
+const renameSubmit = (name, eid) => {
+	const upload = $('.upload-field');
+	const titleId = upload.attr('data-title-id');
+
+	console.log(name);
+
+	if (name.length === 0) {
+		alert('danger', 'The display name should not be empty');
+		return;
+	}
+
+	const query = $.param({
+		entry: eid
+	});
+	let url = `${base_url}api/admin/display_name/${titleId}/${name}`;
+	if (eid)
+		url += `?${query}`;
+
+	$.ajax({
+			type: 'POST',
+			url: url,
+			contentType: "application/json",
+			dataType: 'json'
+		})
+		.done(data => {
+			if (data.error) {
+				alert('danger', `Failed to update display name. Error: ${data.error}`);
+				return;
+			}
+			location.reload();
+		})
+		.fail((jqXHR, status) => {
+			alert('danger', `Failed to update display name. Error: [${jqXHR.status}] ${jqXHR.statusText}`);
+		});
+};
+
+const edit = (eid) => {
+	const cover = $('#edit-modal #cover');
+	let url = cover.attr('data-title-cover');
+	let displayName = $('h2.uk-title > span').text();
+
+	if (eid) {
+		const item = $(`#${eid}`);
+		url = item.find('img').attr('data-src');
+		displayName = item.find('.uk-card-title').attr('data-title');
+		$('#title-progress-control').attr('hidden', '');
+	} else {
+		$('#title-progress-control').removeAttr('hidden');
+	}
+
+	cover.attr('data-src', url);
+
+	const displayNameField = $('#display-name-field');
+	displayNameField.attr('value', displayName);
+	displayNameField.keyup(event => {
+		if (event.keyCode === 13) {
+			renameSubmit(displayNameField.val(), eid);
+		}
+	});
+	displayNameField.siblings('a.uk-form-icon').click(() => {
+		renameSubmit(displayNameField.val(), eid);
+	});
+
+	setupUpload(eid);
+
+	UIkit.modal($('#edit-modal')).show();
+	styleModal();
+};
+
+const setupUpload = (eid) => {
+	const upload = $('.upload-field');
+	const bar = $('#upload-progress').get(0);
+	const titleId = upload.attr('data-title-id');
+	const queryObj = {
+		title: titleId
+	};
+	if (eid)
+		queryObj['entry'] = eid;
+	const query = $.param(queryObj);
+	const url = `${base_url}api/admin/upload/cover?${query}`;
+	console.log(url);
+	UIkit.upload('.upload-field', {
+		url: url,
+		name: 'file',
+		error: (e) => {
+			alert('danger', `Failed to upload cover image: ${e.toString()}`);
+		},
+		loadStart: (e) => {
+			$(bar).removeAttr('hidden');
+			bar.max = e.total;
+			bar.value = e.loaded;
+		},
+		progress: (e) => {
+			bar.max = e.total;
+			bar.value = e.loaded;
+		},
+		loadEnd: (e) => {
+			bar.max = e.total;
+			bar.value = e.loaded;
+		},
+		completeAll: () => {
+			$(bar).attr('hidden', '');
+			location.reload();
+		}
+	});
+};

public/js/user-edit.js

@@ -1,5 +1,5 @@
 $(() => {
-	var target = '/admin/user/edit';
+	var target = base_url + 'admin/user/edit';
 	if (username) target += username;
 	$('form').attr('action', target);
 	if (error) alert('danger', error);

public/js/user.js

@@ -1,5 +1,5 @@
 function remove(username) {
-	$.post('/api/admin/user/delete/' + username, function(data) {
+	$.post(base_url + 'api/admin/user/delete/' + username, function(data) {
 		if (data.success) {
 			location.reload();
 		}

public/robots.txt

@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /

shard.lock

@@ -1,20 +1,36 @@
 version: 1.0
 shards:
+  ameba:
+    github: crystal-ameba/ameba
+    version: 0.12.1
+
+  archive:
+    github: hkalexling/archive.cr
+    version: 0.2.0
+
+  baked_file_system:
+    github: schovi/baked_file_system
+    version: 0.9.8
+
+  clim:
+    github: at-grandpa/clim
+    version: 0.12.0
+
   db:
     github: crystal-lang/crystal-db
-    version: 0.8.0
+    version: 0.9.0
 
   exception_page:
     github: crystal-loot/exception_page
-    version: 0.1.2
+    version: 0.1.4
 
   kemal:
     github: kemalcr/kemal
     version: 0.26.1
 
-  kemal-basic-auth:
-    github: kemalcr/kemal-basic-auth
-    version: 0.2.0
+  kemal-session:
+    github: kemalcr/kemal-session
+    version: 0.12.1
 
   kilt:
     github: jeromegn/kilt
@@ -26,5 +42,5 @@ shards:
 
   sqlite3:
     github: crystal-lang/crystal-sqlite3
-    version: 0.15.0
+    version: 0.16.0
 

shard.yml

@@ -1,5 +1,5 @@
 name: mango
-version: 0.2.5
+version: 0.7.1
 
 authors:
   - Alex Ling <hkalexling@gmail.com>
@@ -8,14 +8,22 @@ targets:
   mango:
     main: src/mango.cr
 
-crystal: 0.32.1
+crystal: 0.34.0
 
 license: MIT
 
 dependencies:
   kemal:
     github: kemalcr/kemal
+  kemal-session:
+    github: kemalcr/kemal-session
   sqlite3:
     github: crystal-lang/crystal-sqlite3
   baked_file_system:
     github: schovi/baked_file_system
+  archive:
+    github: hkalexling/archive.cr
+  ameba:
+    github: crystal-ameba/ameba
+  clim:
+    github: at-grandpa/clim

spec/config_spec.cr

@@ -1,14 +1,14 @@
 require "./spec_helper"
 
 describe Config do
-	it "creates config if it does not exist" do
-		with_default_config do |config, logger, path|
-			File.exists?(path).should be_true
-		end
-	end
+  it "creates config if it does not exist" do
+    with_default_config do |_, path|
+      File.exists?(path).should be_true
+    end
+  end
 
-	it "correctly loads config" do
-		config = Config.load "spec/asset/test-config.yml"
-		config.port.should eq 3000
-	end
+  it "correctly loads config" do
+    config = Config.load "spec/asset/test-config.yml"
+    config.port.should eq 3000
+  end
 end

spec/mangadex_spec.cr

@@ -3,103 +3,102 @@ require "./spec_helper"
 include MangaDex
 
 describe Queue do
-	it "creates DB at given path" do
-		with_queue do |queue, path|
-			File.exists?(path).should be_true
-		end
-	end
+  it "creates DB at given path" do
+    with_queue do |_, path|
+      File.exists?(path).should be_true
+    end
+  end
 
-	it "pops nil when empty" do
-		with_queue do |queue|
-			queue.pop.should be_nil
-		end
-	end
+  it "pops nil when empty" do
+    with_queue do |queue|
+      queue.pop.should be_nil
+    end
+  end
 
-	it "inserts multiple jobs" do
-		with_queue do |queue|
-			j1 = Job.new "1", "1", "title", "manga_title", JobStatus::Error,
-				Time.utc
-			j2 = Job.new "2", "2", "title", "manga_title", JobStatus::Completed,
-				Time.utc
-			j3 = Job.new "3", "3", "title", "manga_title", JobStatus::Pending,
-				Time.utc
-			j4 = Job.new "4", "4", "title", "manga_title",
-				JobStatus::Downloading, Time.utc
-			count = queue.push [j1, j2, j3, j4]
-			count.should eq 4
-		end
-	end
+  it "inserts multiple jobs" do
+    with_queue do |queue|
+      j1 = Job.new "1", "1", "title", "manga_title", JobStatus::Error,
+        Time.utc
+      j2 = Job.new "2", "2", "title", "manga_title", JobStatus::Completed,
+        Time.utc
+      j3 = Job.new "3", "3", "title", "manga_title", JobStatus::Pending,
+        Time.utc
+      j4 = Job.new "4", "4", "title", "manga_title",
+        JobStatus::Downloading, Time.utc
+      count = queue.push [j1, j2, j3, j4]
+      count.should eq 4
+    end
+  end
 
-	it "pops pending job" do
-		with_queue do |queue|
-			job = queue.pop
-			job.should_not be_nil
-			job.not_nil!.id.should eq "3"
-		end
-	end
+  it "pops pending job" do
+    with_queue do |queue|
+      job = queue.pop
+      job.should_not be_nil
+      job.not_nil!.id.should eq "3"
+    end
+  end
 
-	it "correctly counts jobs" do
-		with_queue do |queue|
-			queue.count.should eq 4
-		end
-	end
+  it "correctly counts jobs" do
+    with_queue do |queue|
+      queue.count.should eq 4
+    end
+  end
 
-	it "deletes job" do
-		with_queue do |queue|
-			queue.delete "4"
-			queue.count.should eq 3
-		end
-	end
+  it "deletes job" do
+    with_queue do |queue|
+      queue.delete "4"
+      queue.count.should eq 3
+    end
+  end
 
-	it "sets status" do
-		with_queue do |queue|
-			job = queue.pop.not_nil!
-			queue.set_status JobStatus::Downloading, job
-			job = queue.pop
-			job.should_not be_nil
-			job.not_nil!.status.should eq JobStatus::Downloading
-		end
-	end
+  it "sets status" do
+    with_queue do |queue|
+      job = queue.pop.not_nil!
+      queue.set_status JobStatus::Downloading, job
+      job = queue.pop
+      job.should_not be_nil
+      job.not_nil!.status.should eq JobStatus::Downloading
+    end
+  end
 
-	it "sets number of pages" do
-		with_queue do |queue|
-			job = queue.pop.not_nil!
-			queue.set_pages 100, job
-			job = queue.pop
-			job.should_not be_nil
-			job.not_nil!.pages.should eq 100
-		end
-	end
+  it "sets number of pages" do
+    with_queue do |queue|
+      job = queue.pop.not_nil!
+      queue.set_pages 100, job
+      job = queue.pop
+      job.should_not be_nil
+      job.not_nil!.pages.should eq 100
+    end
+  end
 
-	it "adds fail/success counts" do
-		with_queue do |queue|
-			job = queue.pop.not_nil!
-			queue.add_success job
-			queue.add_success job
-			queue.add_fail job
-			job = queue.pop
-			job.should_not be_nil
-			job.not_nil!.success_count.should eq 2
-			job.not_nil!.fail_count.should eq 1
-		end
-	end
+  it "adds fail/success counts" do
+    with_queue do |queue|
+      job = queue.pop.not_nil!
+      queue.add_success job
+      queue.add_success job
+      queue.add_fail job
+      job = queue.pop
+      job.should_not be_nil
+      job.not_nil!.success_count.should eq 2
+      job.not_nil!.fail_count.should eq 1
+    end
+  end
 
-	it "appends status message" do
-		with_queue do |queue|
-			job = queue.pop.not_nil!
-			queue.add_message "hello", job
-			queue.add_message "world", job
-			job = queue.pop
-			job.should_not be_nil
-			job.not_nil!.status_message.should eq "\nhello\nworld"
-		end
-	end
+  it "appends status message" do
+    with_queue do |queue|
+      job = queue.pop.not_nil!
+      queue.add_message "hello", job
+      queue.add_message "world", job
+      job = queue.pop
+      job.should_not be_nil
+      job.not_nil!.status_message.should eq "\nhello\nworld"
+    end
+  end
 
-	it "cleans up" do
-		with_queue do
-			true
-		end
-		State.reset
-	end
+  it "cleans up" do
+    with_queue do
+      true
+    end
+    State.reset
+  end
 end
-

spec/rename_spec.cr

@@ -0,0 +1,76 @@
+require "./spec_helper"
+require "../src/rename"
+
+include Rename
+
+describe Rule do
+  it "raises on nested brackets" do
+    expect_raises Exception do
+      Rule.new "[[]]"
+    end
+    expect_raises Exception do
+      Rule.new "{{}}"
+    end
+  end
+
+  it "raises on unclosed brackets" do
+    expect_raises Exception do
+      Rule.new "["
+    end
+    expect_raises Exception do
+      Rule.new "{"
+    end
+    expect_raises Exception do
+      Rule.new "[{]}"
+    end
+  end
+
+  it "raises when closing unopened brackets" do
+    expect_raises Exception do
+      Rule.new "]"
+    end
+    expect_raises Exception do
+      Rule.new "[}"
+    end
+  end
+
+  it "handles `|` in patterns" do
+    rule = Rule.new "{a|b|c}"
+    rule.render({"b" => "b"}).should eq "b"
+    rule.render({"a" => "a", "b" => "b"}).should eq "a"
+  end
+
+  it "allows `|` outside of patterns" do
+    rule = Rule.new "hello|world"
+    rule.render({} of String => String).should eq "hello|world"
+  end
+
+  it "raises on escaped characters" do
+    expect_raises Exception do
+      Rule.new "hello/world"
+    end
+  end
+
+  it "handles spaces in patterns" do
+    rule = Rule.new "{  a }"
+    rule.render({"a" => "a"}).should eq "a"
+  end
+
+  it "strips leading and tailing spaces" do
+    rule = Rule.new "  hello "
+    rule.render({"a" => "a"}).should eq "hello"
+  end
+
+  it "renders a few examples correctly" do
+    rule = Rule.new "[Ch. {chapter }] {title | id} testing"
+    rule.render({"id" => "ID"}).should eq "ID testing"
+    rule.render({"chapter" => "CH", "id" => "ID"})
+      .should eq "Ch. CH ID testing"
+    rule.render({} of String => String).should eq "testing"
+  end
+
+  it "escapes slash" do
+    rule = Rule.new "{id}"
+    rule.render({"id" => "/hello/world"}).should eq "_hello_world"
+  end
+end

spec/spec_helper.cr

@@ -1,65 +1,65 @@
 require "spec"
-require "../src/context"
 require "../src/server"
+require "../src/config"
 
 class State
-	@@hash = {} of String => String
+  @@hash = {} of String => String
 
-	def self.get(key)
-		@@hash[key]?
-	end
+  def self.get(key)
+    @@hash[key]?
+  end
 
-	def self.get!(key)
-		@@hash[key]
-	end
+  def self.get!(key)
+    @@hash[key]
+  end
 
-	def self.set(key, value)
-		return if value.nil?
-		@@hash[key] = value
-	end
+  def self.set(key, value)
+    return if value.nil?
+    @@hash[key] = value
+  end
 
-	def self.reset
-		@@hash.clear
-	end
+  def self.reset
+    @@hash.clear
+  end
 end
 
 def get_tempfile(name)
-	path = State.get name
-	if path.nil? || !File.exists? path
-		file = File.tempfile name
-		State.set name, file.path
-		return file
-	else
-		return File.new path
-	end
+  path = State.get name
+  if path.nil? || !File.exists? path
+    file = File.tempfile name
+    State.set name, file.path
+    file
+  else
+    File.new path
+  end
 end
 
 def with_default_config
-	temp_config = get_tempfile "mango-test-config"
-	config = Config.load temp_config.path
-	logger = MLogger.new config
-	yield config, logger, temp_config.path
-	temp_config.delete
+  temp_config = get_tempfile "mango-test-config"
+  config = Config.load temp_config.path
+  config.set_current
+  yield config, temp_config.path
+  temp_config.delete
 end
 
 def with_storage
-	with_default_config do |config, logger|
-		temp_db = get_tempfile "mango-test-db"
-		storage = Storage.new temp_db.path, logger
-		clear = yield storage, temp_db.path
-		if clear == true
-			temp_db.delete
-		end
-	end
+  with_default_config do
+    temp_db = get_tempfile "mango-test-db"
+    storage = Storage.new temp_db.path, false
+    clear = yield storage, temp_db.path
+    if clear == true
+      temp_db.delete
+    end
+  end
 end
 
 def with_queue
-	with_default_config do |config, logger|
-		temp_queue_db = get_tempfile "mango-test-queue-db"
-		queue = MangaDex::Queue.new temp_queue_db.path, logger
-		clear = yield queue, temp_queue_db.path
-		if clear == true
-			temp_queue_db.delete
-		end
-	end
+  with_default_config do
+    temp_queue_db = get_tempfile "mango-test-queue-db"
+    queue = MangaDex::Queue.new temp_queue_db.path
+    clear = yield queue, temp_queue_db.path
+    if clear == true
+      temp_queue_db.delete
+    end
+  end
 end

spec/storage_spec.cr

@@ -1,91 +1,91 @@
 require "./spec_helper"
 
 describe Storage do
-	it "creates DB at given path" do
-		with_storage do |storage, path|
-			File.exists?(path).should be_true
-		end
-	end
+  it "creates DB at given path" do
+    with_storage do |_, path|
+      File.exists?(path).should be_true
+    end
+  end
 
-	it "deletes user" do
-		with_storage do |storage|
-			storage.delete_user "admin"
-		end
-	end
+  it "deletes user" do
+    with_storage do |storage|
+      storage.delete_user "admin"
+    end
+  end
 
-	it "creates new user" do
-		with_storage do |storage|
-			storage.new_user "user", "123456", false
-			storage.new_user "admin", "123456", true
-		end
-	end
+  it "creates new user" do
+    with_storage do |storage|
+      storage.new_user "user", "123456", false
+      storage.new_user "admin", "123456", true
+    end
+  end
 
-	it "verifies username/password combination" do
-		with_storage do |storage|
-			user_token = storage.verify_user "user", "123456"
-			admin_token = storage.verify_user "admin", "123456"
-			user_token.should_not be_nil
-			admin_token.should_not be_nil
-			State.set "user_token", user_token
-			State.set "admin_token", admin_token
-		end
-	end
+  it "verifies username/password combination" do
+    with_storage do |storage|
+      user_token = storage.verify_user "user", "123456"
+      admin_token = storage.verify_user "admin", "123456"
+      user_token.should_not be_nil
+      admin_token.should_not be_nil
+      State.set "user_token", user_token
+      State.set "admin_token", admin_token
+    end
+  end
 
-	it "rejects duplicate username" do
-		with_storage do |storage|
-			expect_raises SQLite3::Exception,
-				"UNIQUE constraint failed: users.username" do
-				storage.new_user "admin", "123456", true
-			end
-		end
-	end
+  it "rejects duplicate username" do
+    with_storage do |storage|
+      expect_raises SQLite3::Exception,
+        "UNIQUE constraint failed: users.username" do
+        storage.new_user "admin", "123456", true
+      end
+    end
+  end
 
-	it "verifies token" do
-		with_storage do |storage|
-			user_token = State.get! "user_token"
-			user = storage.verify_token user_token
-			user.should eq "user"
-		end
-	end
+  it "verifies token" do
+    with_storage do |storage|
+      user_token = State.get! "user_token"
+      user = storage.verify_token user_token
+      user.should eq "user"
+    end
+  end
 
-	it "verfies admin token" do
-		with_storage do |storage|
-			admin_token = State.get! "admin_token"
-			storage.verify_admin(admin_token).should be_true
-		end
-	end
+  it "verfies admin token" do
+    with_storage do |storage|
+      admin_token = State.get! "admin_token"
+      storage.verify_admin(admin_token).should be_true
+    end
+  end
 
-	it "rejects non-admin token" do
-		with_storage do |storage|
-			user_token = State.get! "user_token"
-			storage.verify_admin(user_token).should be_false
-		end
-	end
+  it "rejects non-admin token" do
+    with_storage do |storage|
+      user_token = State.get! "user_token"
+      storage.verify_admin(user_token).should be_false
+    end
+  end
 
-	it "updates user" do
-		with_storage do |storage|
-			storage.update_user "admin", "admin", "654321", true
-			token = storage.verify_user "admin", "654321"
-			admin_token = State.get! "admin_token"
-			token.should eq admin_token
-		end
-	end
+  it "updates user" do
+    with_storage do |storage|
+      storage.update_user "admin", "admin", "654321", true
+      token = storage.verify_user "admin", "654321"
+      admin_token = State.get! "admin_token"
+      token.should eq admin_token
+    end
+  end
 
-	it "logs user out" do
-		with_storage do |storage|
-			user_token = State.get! "user_token"
-			admin_token = State.get! "admin_token"
-			storage.logout user_token
-			storage.logout admin_token
-			storage.verify_token(user_token).should be_nil
-			storage.verify_token(admin_token).should be_nil
-		end
-	end
+  it "logs user out" do
+    with_storage do |storage|
+      user_token = State.get! "user_token"
+      admin_token = State.get! "admin_token"
+      storage.logout user_token
+      storage.logout admin_token
+      storage.verify_token(user_token).should be_nil
+      storage.verify_token(admin_token).should be_nil
+    end
+  end
 
-	it "cleans up" do
-		with_storage do
-			true
-		end
-		State.reset
-	end
+  it "cleans up" do
+    with_storage do
+      true
+    end
+    State.reset
+  end
 end

spec/util_spec.cr

@@ -1,36 +1,36 @@
 require "./spec_helper"
 
 describe "compare_alphanumerically" do
-	it "sorts filenames with leading zeros correctly" do
-		ary = ["010.jpg", "001.jpg", "002.png"]
-		ary.sort! {|a, b|
-			compare_alphanumerically a, b
-		}
-		ary.should eq ["001.jpg", "002.png", "010.jpg"]
-	end
+  it "sorts filenames with leading zeros correctly" do
+    ary = ["010.jpg", "001.jpg", "002.png"]
+    ary.sort! { |a, b|
+      compare_alphanumerically a, b
+    }
+    ary.should eq ["001.jpg", "002.png", "010.jpg"]
+  end
 
-	it "sorts filenames without leading zeros correctly" do
-		ary = ["10.jpg", "1.jpg", "0.png", "0100.jpg"]
-		ary.sort! {|a, b|
-			compare_alphanumerically a, b
-		}
-		ary.should eq ["0.png", "1.jpg", "10.jpg", "0100.jpg"]
-	end
+  it "sorts filenames without leading zeros correctly" do
+    ary = ["10.jpg", "1.jpg", "0.png", "0100.jpg"]
+    ary.sort! { |a, b|
+      compare_alphanumerically a, b
+    }
+    ary.should eq ["0.png", "1.jpg", "10.jpg", "0100.jpg"]
+  end
 
-	# https://ux.stackexchange.com/a/95441
-	it "sorts like the stack exchange post" do
-		ary = ["2", "12", "200000", "1000000", "a", "a12", "b2", "text2",
-		 "text2a", "text2a2", "text2a12", "text2ab", "text12", "text12a"]
-		ary.reverse.sort {|a, b|
-			compare_alphanumerically a, b
-		}.should eq ary
-	end
+  # https://ux.stackexchange.com/a/95441
+  it "sorts like the stack exchange post" do
+    ary = ["2", "12", "200000", "1000000", "a", "a12", "b2", "text2",
+           "text2a", "text2a2", "text2a12", "text2ab", "text12", "text12a"]
+    ary.reverse.sort { |a, b|
+      compare_alphanumerically a, b
+    }.should eq ary
+  end
 
-	# https://github.com/hkalexling/Mango/issues/22
-	it "handles numbers larger than Int32" do
-		ary = ["14410155591588.jpg", "21410155591588.png", "104410155591588.jpg"]
-		ary.reverse.sort {|a, b|
-			compare_alphanumerically a, b
-		}.should eq ary
-	end
+  # https://github.com/hkalexling/Mango/issues/22
+  it "handles numbers larger than Int32" do
+    ary = ["14410155591588.jpg", "21410155591588.png", "104410155591588.jpg"]
+    ary.reverse.sort { |a, b|
+      compare_alphanumerically a, b
+    }.should eq ary
+  end
 end

src/archive.cr

@@ -0,0 +1,59 @@
+require "zip"
+require "archive"
+
+# A unified class to handle all supported archive formats. It uses the ::Zip
+#   module in crystal standard library if the target file is a zip archive.
+#   Otherwise it uses `archive.cr`.
+class ArchiveFile
+  def initialize(@filename : String)
+    if [".cbz", ".zip"].includes? File.extname filename
+      @archive_file = Zip::File.new filename
+    else
+      @archive_file = Archive::File.new filename
+    end
+  end
+
+  def self.open(filename : String, &)
+    s = self.new filename
+    yield s
+    s.close
+  end
+
+  def close
+    if @archive_file.is_a? Zip::File
+      @archive_file.as(Zip::File).close
+    end
+  end
+
+  # Lists all file entries
+  def entries
+    ary = [] of Zip::File::Entry | Archive::Entry
+    @archive_file.entries.map do |e|
+      if (e.is_a? Zip::File::Entry && e.file?) ||
+         (e.is_a? Archive::Entry && e.info.file?)
+        ary.push e
+      end
+    end
+    ary
+  end
+
+  def read_entry(e : Zip::File::Entry | Archive::Entry) : Bytes?
+    if e.is_a? Zip::File::Entry
+      data = nil
+      e.open do |io|
+        slice = Bytes.new e.uncompressed_size
+        bytes_read = io.read_fully? slice
+        data = slice if bytes_read
+      end
+      data
+    else
+      e.read
+    end
+  end
+
+  def check
+    if @archive_file.is_a? Archive::File
+      @archive_file.as(Archive::File).check
+    end
+  end
+end

src/assets/uikit.less

@@ -0,0 +1,33 @@
+@import "node_modules/uikit/src/less/uikit.theme.less";
+
+.label {
+    display: inline-block;
+    padding: @label-padding-vertical @label-padding-horizontal;
+    background: @label-background;
+    line-height: @label-line-height;
+    font-size: @label-font-size;
+    color: @label-color;
+    vertical-align: middle;
+    white-space: nowrap;
+    .hook-label;
+}
+
+.label-success {
+    background-color: @label-success-background;
+    color: @label-success-color;
+}
+
+.label-warning {
+    background-color: @label-warning-background;
+    color: @label-warning-color;
+}
+
+.label-danger {
+    background-color: @label-danger-background;
+    color: @label-danger-color;
+}
+
+.label-pending {
+    background-color: @global-secondary-background;
+    color: @global-inverse-color;
+}

src/auth_handler.cr

@@ -1,26 +0,0 @@
-require "kemal"
-require "./storage"
-require "./util"
-
-class AuthHandler < Kemal::Handler
-	def initialize(@storage : Storage)
-	end
-
-	def call(env)
-		return call_next(env) \
-			if request_path_startswith env, ["/login", "/logout"]
-
-		cookie = env.request.cookies.find { |c| c.name == "token" }
-		if cookie.nil? || ! @storage.verify_token cookie.value
-			return env.redirect "/login"
-		end
-
-		if request_path_startswith env, ["/admin", "/api/admin", "/download"]
-			unless @storage.verify_admin cookie.value
-				env.response.status_code = 403
-			end
-		end
-
-		call_next env
-	end
-end

src/config.cr

@@ -1,60 +1,89 @@
 require "yaml"
 
 class Config
-	include YAML::Serializable
+  include YAML::Serializable
 
-	property port : Int32 = 9000
-	property library_path : String = \
-		File.expand_path "~/mango/library", home: true
-	property db_path : String = \
-		File.expand_path "~/mango/mango.db", home: true
-	@[YAML::Field(key: "scan_interval_minutes")]
-	property scan_interval : Int32 = 5
-	property log_level : String = "info"
-	property mangadex = Hash(String, String|Int32).new
+  @[YAML::Field(ignore: true)]
+  property path : String = ""
+  property port : Int32 = 9000
+  property base_url : String = "/"
+  property session_secret : String = "mango-session-secret"
+  property library_path : String = File.expand_path "~/mango/library",
+    home: true
+  property db_path : String = File.expand_path "~/mango/mango.db", home: true
+  @[YAML::Field(key: "scan_interval_minutes")]
+  property scan_interval : Int32 = 5
+  property log_level : String = "info"
+  property upload_path : String = File.expand_path "~/mango/uploads",
+    home: true
+  property mangadex = Hash(String, String | Int32).new
 
-	@[YAML::Field(ignore: true)]
-	@mangadex_defaults = {
-		"base_url" => "https://mangadex.org",
-		"api_url" => "https://mangadex.org/api",
-		"download_wait_seconds" => 5,
-		"download_retries" => 4,
-		"download_queue_db_path" => File.expand_path "~/mango/queue.db",
-			home: true
-	}
+  @[YAML::Field(ignore: true)]
+  @mangadex_defaults = {
+    "base_url"               => "https://mangadex.org",
+    "api_url"                => "https://mangadex.org/api",
+    "download_wait_seconds"  => 5,
+    "download_retries"       => 4,
+    "download_queue_db_path" => File.expand_path("~/mango/queue.db",
+      home: true),
+    "chapter_rename_rule" => "[Vol.{volume} ][Ch.{chapter} ]{title|id}",
+    "manga_rename_rule"   => "{title}",
+  }
 
-	def self.load(path : String?)
-		path = "~/.config/mango/config.yml" if path.nil?
-		cfg_path = File.expand_path path, home: true
-		if File.exists? cfg_path
-			config = self.from_yaml File.read cfg_path
-			config.fill_defaults
-			return config
-		end
-		puts "The config file #{cfg_path} does not exist." \
-			" Do you want mango to dump the default config there? [Y/n]"
-		input = gets
-		if input && input.downcase == "n"
-			abort "Aborting..."
-		end
-		default = self.allocate
-		default.fill_defaults
-		cfg_dir = File.dirname cfg_path
-		unless Dir.exists? cfg_dir
-			Dir.mkdir_p cfg_dir
-		end
-		File.write cfg_path, default.to_yaml
-		puts "The config file has been created at #{cfg_path}."
-		default
-	end
+  @@singlet : Config?
 
-	def fill_defaults
-		{% for hash_name in ["mangadex"] %}
-			@{{hash_name.id}}_defaults.map do |k, v|
-				if @{{hash_name.id}}[k]?.nil?
-					@{{hash_name.id}}[k] = v
-				end
-			end
-		{% end %}
-	end
+  def self.current
+    @@singlet.not_nil!
+  end
+
+  def set_current
+    @@singlet = self
+  end
+
+  def self.load(path : String?)
+    path = "~/.config/mango/config.yml" if path.nil?
+    cfg_path = File.expand_path path, home: true
+    if File.exists? cfg_path
+      config = self.from_yaml File.read cfg_path
+      config.preprocess
+      config.path = path
+      config.fill_defaults
+      return config
+    end
+    puts "The config file #{cfg_path} does not exist." \
+         " Do you want mango to dump the default config there? [Y/n]"
+    input = gets
+    if input && input.downcase == "n"
+      abort "Aborting..."
+    end
+    default = self.allocate
+    default.path = path
+    default.fill_defaults
+    cfg_dir = File.dirname cfg_path
+    unless Dir.exists? cfg_dir
+      Dir.mkdir_p cfg_dir
+    end
+    File.write cfg_path, default.to_yaml
+    puts "The config file has been created at #{cfg_path}."
+    default
+  end
+
+  def fill_defaults
+    {% for hash_name in ["mangadex"] %}
+      @{{hash_name.id}}_defaults.map do |k, v|
+        if @{{hash_name.id}}[k]?.nil?
+          @{{hash_name.id}}[k] = v
+        end
+      end
+    {% end %}
+  end
+
+  def preprocess
+    unless base_url.starts_with? "/"
+      raise "base url (#{base_url}) should start with `/`"
+    end
+    unless base_url.ends_with? "/"
+      @base_url += "/"
+    end
+  end
 end

src/context.cr

@@ -1,21 +0,0 @@
-require "./config"
-require "./library"
-require "./storage"
-require "./logger"
-
-class Context
-	property config : Config
-	property library : Library
-	property storage : Storage
-	property logger : MLogger
-	property queue : MangaDex::Queue
-
-	def initialize(@config, @logger, @library, @storage, @queue)
-	end
-
-	{% for lvl in LEVELS %}
-		def {{lvl.id}}(msg)
-			@logger.{{lvl.id}} msg
-		end
-	{% end %}
-end

src/handlers/auth_handler.cr

@@ -0,0 +1,92 @@
+require "kemal"
+require "../storage"
+require "../util"
+
+class AuthHandler < Kemal::Handler
+  # Some of the code is copied form kemalcr/kemal-basic-auth on GitHub
+
+  BASIC        = "Basic"
+  AUTH         = "Authorization"
+  AUTH_MESSAGE = "Could not verify your access level for that URL.\n" \
+                 "You have to login with proper credentials"
+  HEADER_LOGIN_REQUIRED = "Basic realm=\"Login Required\""
+
+  def initialize(@storage : Storage)
+  end
+
+  def require_basic_auth(env)
+    env.response.status_code = 401
+    env.response.headers["WWW-Authenticate"] = HEADER_LOGIN_REQUIRED
+    env.response.print AUTH_MESSAGE
+    call_next env
+  end
+
+  def validate_token(env)
+    token = env.session.string? "token"
+    !token.nil? && @storage.verify_token token
+  end
+
+  def validate_token_admin(env)
+    token = env.session.string? "token"
+    !token.nil? && @storage.verify_admin token
+  end
+
+  def validate_auth_header(env)
+    if env.request.headers[AUTH]?
+      if value = env.request.headers[AUTH]
+        if value.size > 0 && value.starts_with?(BASIC)
+          token = verify_user value
+          return false if token.nil?
+
+          env.session.string "token", token
+          return true
+        end
+      end
+    end
+    false
+  end
+
+  def verify_user(value)
+    username, password = Base64.decode_string(value[BASIC.size + 1..-1])
+      .split(":")
+    @storage.verify_user username, password
+  end
+
+  def handle_opds_auth(env)
+    if validate_token(env) || validate_auth_header(env)
+      call_next env
+    else
+      env.response.status_code = 401
+      env.response.headers["WWW-Authenticate"] = HEADER_LOGIN_REQUIRED
+      env.response.print AUTH_MESSAGE
+    end
+  end
+
+  def handle_auth(env)
+    if request_path_startswith(env, ["/login", "/logout"]) ||
+       requesting_static_file env
+      return call_next(env)
+    end
+
+    unless validate_token env
+      env.session.string "callback", env.request.path
+      return redirect env, "/login"
+    end
+
+    if request_path_startswith env, ["/admin", "/api/admin", "/download"]
+      unless validate_token_admin env
+        env.response.status_code = 403
+      end
+    end
+
+    call_next env
+  end
+
+  def call(env)
+    if request_path_startswith env, ["/opds"]
+      handle_opds_auth env
+    else
+      handle_auth env
+    end
+  end
+end

src/handlers/log_handler.cr

@@ -0,0 +1,23 @@
+require "kemal"
+require "../logger"
+
+class LogHandler < Kemal::BaseLogHandler
+  def call(env)
+    elapsed_time = Time.measure { call_next env }
+    elapsed_text = elapsed_text elapsed_time
+    msg = "#{env.response.status_code} #{env.request.method}" \
+          " #{env.request.resource} #{elapsed_text}"
+    Logger.debug msg
+    env
+  end
+
+  def write(msg)
+    Logger.debug msg
+  end
+
+  private def elapsed_text(elapsed)
+    millis = elapsed.total_milliseconds
+    return "#{millis.round(2)}ms" if millis >= 1
+    "#{(millis * 1000).round(2)}µs"
+  end
+end

src/handlers/static_handler.cr

@@ -0,0 +1,30 @@
+require "baked_file_system"
+require "kemal"
+require "../util"
+
+class FS
+  extend BakedFileSystem
+  {% if flag?(:release) %}
+    {% if read_file? "#{__DIR__}/../../dist/favicon.ico" %}
+      {% puts "baking ../../dist" %}
+      bake_folder "../../dist"
+    {% else %}
+      {% puts "baking ../../public" %}
+      bake_folder "../../public"
+    {% end %}
+  {% end %}
+end
+
+class StaticHandler < Kemal::Handler
+  def call(env)
+    if requesting_static_file env
+      file = FS.get? env.request.path
+      return call_next env if file.nil?
+
+      slice = Bytes.new file.size
+      file.read slice
+      return send_file env, slice, file.mime_type
+    end
+    call_next env
+  end
+end

src/handlers/upload_handler.cr

@@ -0,0 +1,26 @@
+require "kemal"
+require "../util"
+
+class UploadHandler < Kemal::Handler
+  def initialize(@upload_dir : String)
+  end
+
+  def call(env)
+    unless request_path_startswith(env, [UPLOAD_URL_PREFIX]) &&
+           env.request.method == "GET"
+      return call_next env
+    end
+
+    ary = env.request.path.split(File::SEPARATOR).select do |part|
+      !part.empty?
+    end
+    ary[0] = @upload_dir
+    path = File.join ary
+
+    if File.exists? path
+      send_file env, path
+    else
+      env.response.status_code = 404
+    end
+  end
+end

src/library.cr

@@ -1,313 +1,599 @@
-require "zip"
 require "mime"
 require "json"
 require "uri"
 require "./util"
+require "./archive"
+
+SUPPORTED_IMG_TYPES = ["image/jpeg", "image/png", "image/webp"]
 
 struct Image
-	property data : Bytes
-	property mime : String
-	property filename : String
-	property size : Int32
+  property data : Bytes
+  property mime : String
+  property filename : String
+  property size : Int32
 
-	def initialize(@data, @mime, @filename, @size)
-	end
+  def initialize(@data, @mime, @filename, @size)
+  end
 end
 
 class Entry
-	property zip_path : String, book_title : String, title : String,
-		size : String, pages : Int32, cover_url : String, id : String,
-		title_id : String, encoded_path : String, encoded_title : String,
-		mtime : Time
+  property zip_path : String, book : Title, title : String,
+    size : String, pages : Int32, id : String, title_id : String,
+    encoded_path : String, encoded_title : String, mtime : Time
 
-	def initialize(path, @book_title, @title_id, storage)
-		@zip_path = path
-		@encoded_path = URI.encode path
-		@title = File.basename path, File.extname path
-		@encoded_title = URI.encode @title
-		@size = (File.size path).humanize_bytes
-		file = Zip::File.new path
-		@pages = file.entries
-			.select { |e|
-				["image/jpeg", "image/png"].includes? \
-				MIME.from_filename? e.filename
-			}
-			.size
-		file.close
-		@id = storage.get_id @zip_path, false
-		@cover_url = "/api/page/#{@title_id}/#{@id}/1"
-		@mtime = File.info(@zip_path).modification_time
-	end
+  def initialize(path, @book, @title_id, storage)
+    @zip_path = path
+    @encoded_path = URI.encode path
+    @title = File.basename path, File.extname path
+    @encoded_title = URI.encode @title
+    @size = (File.size path).humanize_bytes
+    file = ArchiveFile.new path
+    @pages = file.entries.count do |e|
+      SUPPORTED_IMG_TYPES.includes? \
+        MIME.from_filename? e.filename
+    end
+    file.close
+    @id = storage.get_id @zip_path, false
+    @mtime = File.info(@zip_path).modification_time
+  end
 
-	def to_json(json : JSON::Builder)
-		json.object do
-			{% for str in ["zip_path", "book_title", "title", "size",
-				"cover_url", "id", "title_id", "encoded_path",
-				"encoded_title"] %}
-				json.field {{str}}, @{{str.id}}
-			{% end %}
-			json.field "pages" {json.number @pages}
-			json.field "mtime" {json.number @mtime.to_unix}
-		end
-	end
+  def to_json(json : JSON::Builder)
+    json.object do
+      {% for str in ["zip_path", "title", "size", "id", "title_id",
+                     "encoded_path", "encoded_title"] %}
+        json.field {{str}}, @{{str.id}}
+      {% end %}
+      json.field "display_name", @book.display_name @title
+      json.field "cover_url", cover_url
+      json.field "pages" { json.number @pages }
+      json.field "mtime" { json.number @mtime.to_unix }
+    end
+  end
 
-	def read_page(page_num)
-		Zip::File.open @zip_path do |file|
-			page = file.entries
-				.select { |e|
-					["image/jpeg", "image/png"].includes? \
-					MIME.from_filename? e.filename
-				}
-				.sort { |a, b|
-					compare_alphanumerically a.filename, b.filename
-				}
-				.[page_num - 1]
-			page.open do |io|
-				slice = Bytes.new page.uncompressed_size
-				bytes_read = io.read_fully? slice
-				unless bytes_read
-					return nil
-				end
-				return Image.new slice, MIME.from_filename(page.filename),\
-					page.filename, bytes_read
-			end
-		end
-	end
+  def display_name
+    @book.display_name @title
+  end
+
+  def encoded_display_name
+    URI.encode display_name
+  end
+
+  def cover_url
+    url = "#{Config.current.base_url}api/page/#{@title_id}/#{@id}/1"
+    TitleInfo.new @book.dir do |info|
+      info_url = info.entry_cover_url[@title]?
+      unless info_url.nil? || info_url.empty?
+        url = File.join Config.current.base_url, info_url
+      end
+    end
+    url
+  end
+
+  def read_page(page_num)
+    img = nil
+    ArchiveFile.open @zip_path do |file|
+      page = file.entries
+        .select { |e|
+          SUPPORTED_IMG_TYPES.includes? \
+            MIME.from_filename? e.filename
+        }
+        .sort { |a, b|
+          compare_alphanumerically a.filename, b.filename
+        }
+        .[page_num - 1]
+      data = file.read_entry page
+      if data
+        img = Image.new data, MIME.from_filename(page.filename), page.filename,
+          data.size
+      end
+    end
+    img
+  end
+
+  def next_entry
+    idx = @book.entries.index self
+    return nil if idx.nil? || idx == @book.entries.size - 1
+    @book.entries[idx + 1]
+  end
+
+  def previous_entry
+    idx = @book.entries.index self
+    return nil if idx.nil? || idx == 0
+    @book.entries[idx - 1]
+  end
+
+  def date_added
+    date_added = nil
+    TitleInfo.new @book.dir do |info|
+      info_da = info.date_added[@title]?
+      if info_da.nil?
+        date_added = info.date_added[@title] = ctime @zip_path
+        info.save
+      else
+        date_added = info_da
+      end
+    end
+    date_added.not_nil! # is it ok to set not_nil! here?
+  end
+
+  # For backward backward compatibility with v0.1.0, we save entry titles
+  #   instead of IDs in info.json
+  def save_progress(username, page)
+    TitleInfo.new @book.dir do |info|
+      if info.progress[username]?.nil?
+        info.progress[username] = {@title => page}
+      else
+        info.progress[username][@title] = page
+      end
+      # save last_read timestamp
+      if info.last_read[username]?.nil?
+        info.last_read[username] = {@title => Time.utc}
+      else
+        info.last_read[username][@title] = Time.utc
+      end
+      info.save
+    end
+  end
+
+  def load_progress(username)
+    progress = 0
+    TitleInfo.new @book.dir do |info|
+      unless info.progress[username]?.nil? ||
+             info.progress[username][@title]?.nil?
+        progress = info.progress[username][@title]
+      end
+    end
+    [progress, @pages].min
+  end
+
+  def load_percentage(username)
+    page = load_progress username
+    page / @pages
+  end
+
+  def load_last_read(username)
+    last_read = nil
+    TitleInfo.new @book.dir do |info|
+      unless info.last_read[username]?.nil? ||
+             info.last_read[username][@title]?.nil?
+        last_read = info.last_read[username][@title]
+      end
+    end
+    last_read
+  end
+
+  def finished?(username)
+    load_progress(username) == @pages
+  end
+
+  def started?(username)
+    load_progress(username) > 0
+  end
 end
 
 class Title
-	property dir : String, parent_id : String, title_ids : Array(String),
-		entries : Array(Entry), title : String, id : String,
-		encoded_title : String, mtime : Time
+  property dir : String, parent_id : String, title_ids : Array(String),
+    entries : Array(Entry), title : String, id : String,
+    encoded_title : String, mtime : Time
 
-	def initialize(dir : String, @parent_id, storage,
-				   @logger : MLogger, @library : Library)
-		@dir = dir
-		@id = storage.get_id @dir, true
-		@title = File.basename dir
-		@encoded_title = URI.encode @title
-		@title_ids = [] of String
-		@entries = [] of Entry
+  def initialize(@dir : String, @parent_id, storage,
+                 @library : Library)
+    @id = storage.get_id @dir, true
+    @title = File.basename dir
+    @encoded_title = URI.encode @title
+    @title_ids = [] of String
+    @entries = [] of Entry
+    @mtime = File.info(dir).modification_time
 
-		Dir.entries(dir).each do |fn|
-			next if fn.starts_with? "."
-			path = File.join dir, fn
-			if File.directory? path
-				title = Title.new path, @id, storage, @logger, library
-				next if title.entries.size == 0 && title.titles.size == 0
-				@library.title_hash[title.id] = title
-				@title_ids << title.id
-				next
-			end
-			if [".zip", ".cbz"].includes? File.extname path
-				next if !valid_zip path
-				entry = Entry.new path, @title, @id, storage
-				@entries << entry if entry.pages > 0
-			end
-		end
+    Dir.entries(dir).each do |fn|
+      next if fn.starts_with? "."
+      path = File.join dir, fn
+      if File.directory? path
+        title = Title.new path, @id, storage, library
+        next if title.entries.size == 0 && title.titles.size == 0
+        @library.title_hash[title.id] = title
+        @title_ids << title.id
+        next
+      end
+      if [".zip", ".cbz", ".rar", ".cbr"].includes? File.extname path
+        unless File.readable? path
+          Logger.warn "File #{path} is not readable. Please make sure the " \
+                      "file permission is configured correctly."
+          next
+        end
+        archive_exception = validate_archive path
+        unless archive_exception.nil?
+          Logger.warn "Unable to extract archive #{path}. Ignoring it. " \
+                      "Archive error: #{archive_exception}"
+          next
+        end
+        entry = Entry.new path, self, @id, storage
+        @entries << entry if entry.pages > 0
+      end
+    end
 
-		@title_ids.sort! do |a, b|
-			compare_alphanumerically @library.title_hash[a].title,
-				@library.title_hash[b].title
-		end
-		@entries.sort! do |a, b|
-			compare_alphanumerically a.title, b.title
-		end
+    mtimes = [@mtime]
+    mtimes += @title_ids.map { |e| @library.title_hash[e].mtime }
+    mtimes += @entries.map { |e| e.mtime }
+    @mtime = mtimes.max
 
-		mtimes = [File.info(dir).modification_time]
-		mtimes += @title_ids.map{|e| @library.title_hash[e].mtime}
-		mtimes += @entries.map{|e| e.mtime}
-		@mtime = mtimes.max
-	end
+    @title_ids.sort! do |a, b|
+      compare_alphanumerically @library.title_hash[a].title,
+        @library.title_hash[b].title
+    end
+    @entries.sort! do |a, b|
+      compare_alphanumerically a.title, b.title
+    end
+  end
 
-	def to_json(json : JSON::Builder)
-		json.object do
-			{% for str in ["dir", "title", "id", "encoded_title"] %}
-				json.field {{str}}, @{{str.id}}
-			{% end %}
-			json.field "mtime" {json.number @mtime.to_unix}
-			json.field "titles" do
-				json.raw self.titles.to_json
-			end
-			json.field "entries" do
-				json.raw @entries.to_json
-			end
-			json.field "parents" do
-				json.array do
-					self.parents.each do |title|
-						json.object do
-							json.field "title", title.title
-							json.field "id", title.id
-						end
-					end
-				end
-			end
-		end
-	end
+  def to_json(json : JSON::Builder)
+    json.object do
+      {% for str in ["dir", "title", "id", "encoded_title"] %}
+        json.field {{str}}, @{{str.id}}
+      {% end %}
+      json.field "display_name", display_name
+      json.field "cover_url", cover_url
+      json.field "mtime" { json.number @mtime.to_unix }
+      json.field "titles" do
+        json.raw self.titles.to_json
+      end
+      json.field "entries" do
+        json.raw @entries.to_json
+      end
+      json.field "parents" do
+        json.array do
+          self.parents.each do |title|
+            json.object do
+              json.field "title", title.title
+              json.field "id", title.id
+            end
+          end
+        end
+      end
+    end
+  end
 
-	def titles
-		@title_ids.map {|tid| @library.get_title! tid}
-	end
+  def titles
+    @title_ids.map { |tid| @library.get_title! tid }
+  end
 
-	def parents
-		ary = [] of Title
-		tid = @parent_id
-		while !tid.empty?
-			title = @library.get_title! tid
-			ary << title
-			tid = title.parent_id
-		end
-		ary
-	end
+  # Get all entries, including entries in nested titles
+  def deep_entries
+    return @entries if title_ids.empty?
+    @entries + titles.map { |t| t.deep_entries }.flatten
+  end
 
-	def size
-		@entries.size + @title_ids.size
-	end
+  def deep_titles
+    return [] of Title if titles.empty?
+    titles + titles.map { |t| t.deep_titles }.flatten
+  end
 
-	# When downloading from MangaDex, the zip/cbz file would not be valid
-	#	before the download is completed. If we scan the zip file,
-	#	Entry.new would throw, so we use this method to check before
-	#	constructing Entry
-	private def valid_zip(path : String)
-		begin
-			file = Zip::File.new path
-			file.close
-			return true
-		rescue
-			@logger.warn "File #{path} is corrupted or is not a valid zip "\
-				"archive. Ignoring it."
-			return false
-		end
-	end
-	def get_entry(eid)
-		@entries.find { |e| e.id == eid }
-	end
-	# For backward backward compatibility with v0.1.0, we save entry titles
-	#	instead of IDs in info.json
-	def save_progress(username, entry, page)
-		info = TitleInfo.new @dir
-		if info.progress[username]?.nil?
-			info.progress[username] = {entry => page}
-			info.save @dir
-			return
-		end
-		info.progress[username][entry] = page
-		info.save @dir
-	end
-	def load_progress(username, entry)
-		info = TitleInfo.new @dir
-		if info.progress[username]?.nil?
-			return 0
-		end
-		if info.progress[username][entry]?.nil?
-			return 0
-		end
-		info.progress[username][entry]
-	end
-	def load_percetage(username, entry)
-		info = TitleInfo.new @dir
-		page = load_progress username, entry
-		entry_obj = @entries.find{|e| e.title == entry}
-		return 0.0 if entry_obj.nil?
-		page / entry_obj.pages
-	end
-	def load_percetage(username)
-		return 0.0 if @entries.empty?
-		read_pages = total_pages = 0
-		@entries.each do |e|
-			read_pages += load_progress username, e.title
-			total_pages += e.pages
-		end
-		read_pages / total_pages
-	end
-	def next_entry(current_entry_obj)
-		idx = @entries.index current_entry_obj
-		return nil if idx.nil? || idx == @entries.size - 1
-		@entries[idx + 1]
-	end
+  def parents
+    ary = [] of Title
+    tid = @parent_id
+    while !tid.empty?
+      title = @library.get_title! tid
+      ary << title
+      tid = title.parent_id
+    end
+    ary.reverse
+  end
+
+  def size
+    @entries.size + @title_ids.size
+  end
+
+  def get_entry(eid)
+    @entries.find { |e| e.id == eid }
+  end
+
+  def display_name
+    dn = @title
+    TitleInfo.new @dir do |info|
+      info_dn = info.display_name
+      dn = info_dn unless info_dn.empty?
+    end
+    dn
+  end
+
+  def encoded_display_name
+    URI.encode display_name
+  end
+
+  def display_name(entry_name)
+    dn = entry_name
+    TitleInfo.new @dir do |info|
+      info_dn = info.entry_display_name[entry_name]?
+      unless info_dn.nil? || info_dn.empty?
+        dn = info_dn
+      end
+    end
+    dn
+  end
+
+  def set_display_name(dn)
+    TitleInfo.new @dir do |info|
+      info.display_name = dn
+      info.save
+    end
+  end
+
+  def set_display_name(entry_name : String, dn)
+    TitleInfo.new @dir do |info|
+      info.entry_display_name[entry_name] = dn
+      info.save
+    end
+  end
+
+  def cover_url
+    url = "#{Config.current.base_url}img/icon.png"
+    if @entries.size > 0
+      url = @entries[0].cover_url
+    end
+    TitleInfo.new @dir do |info|
+      info_url = info.cover_url
+      unless info_url.nil? || info_url.empty?
+        url = File.join Config.current.base_url, info_url
+      end
+    end
+    url
+  end
+
+  def set_cover_url(url : String)
+    TitleInfo.new @dir do |info|
+      info.cover_url = url
+      info.save
+    end
+  end
+
+  def set_cover_url(entry_name : String, url : String)
+    TitleInfo.new @dir do |info|
+      info.entry_cover_url[entry_name] = url
+      info.save
+    end
+  end
+
+  # Set the reading progress of all entries and nested libraries to 100%
+  def read_all(username)
+    @entries.each do |e|
+      e.save_progress username, e.pages
+    end
+    titles.each do |t|
+      t.read_all username
+    end
+  end
+
+  # Set the reading progress of all entries and nested libraries to 0%
+  def unread_all(username)
+    @entries.each do |e|
+      e.save_progress username, 0
+    end
+    titles.each do |t|
+      t.unread_all username
+    end
+  end
+
+  def deep_read_page_count(username) : Int32
+    entries.map { |e| e.load_progress username }.sum +
+      titles.map { |t| t.deep_read_page_count username }.flatten.sum
+  end
+
+  def deep_total_page_count : Int32
+    entries.map { |e| e.pages }.sum +
+      titles.map { |t| t.deep_total_page_count }.flatten.sum
+  end
+
+  def load_percentage(username)
+    deep_read_page_count(username) / deep_total_page_count
+  end
+
+  def get_continue_reading_entry(username)
+    in_progress_entries = @entries.select do |e|
+      load_progress(username, e.title) > 0
+    end
+    return nil if in_progress_entries.empty?
+
+    latest_read_entry = in_progress_entries[-1]
+    if load_progress(username, latest_read_entry.title) ==
+         latest_read_entry.pages
+      next_entry latest_read_entry
+    else
+      latest_read_entry
+    end
+  end
 end
 
 class TitleInfo
-	# { user1: { entry1: 10, entry2: 0 } }
-	include JSON::Serializable
+  include JSON::Serializable
 
-	property comment = "Generated by Mango. DO NOT EDIT!"
-	property progress : Hash(String, Hash(String, Int32))
+  property comment = "Generated by Mango. DO NOT EDIT!"
+  property progress = {} of String => Hash(String, Int32)
+  property display_name = ""
+  property entry_display_name = {} of String => String
+  property cover_url = ""
+  property entry_cover_url = {} of String => String
+  property last_read = {} of String => Hash(String, Time)
+  property date_added = {} of String => Time
 
-	def initialize(title_dir)
-		info = nil
+  @[JSON::Field(ignore: true)]
+  property dir : String = ""
 
-		json_path = File.join title_dir, "info.json"
-		if File.exists? json_path
-			info = TitleInfo.from_json File.read json_path
-		else
-			info = TitleInfo.from_json "{\"progress\": {}}"
-		end
+  @@mutex_hash = {} of String => Mutex
 
-		@progress = info.progress.clone
-	end
-	def save(title_dir)
-		json_path = File.join title_dir, "info.json"
-		File.write json_path, self.to_pretty_json
-	end
+  def self.new(dir, &)
+    if @@mutex_hash[dir]?
+      mutex = @@mutex_hash[dir]
+    else
+      mutex = Mutex.new
+      @@mutex_hash[dir] = mutex
+    end
+    mutex.synchronize do
+      instance = TitleInfo.allocate
+      json_path = File.join dir, "info.json"
+      if File.exists? json_path
+        instance = TitleInfo.from_json File.read json_path
+      end
+      instance.dir = dir
+      yield instance
+    end
+  end
+
+  def save
+    json_path = File.join @dir, "info.json"
+    File.write json_path, self.to_pretty_json
+  end
 end
 
 class Library
-	property dir : String, title_ids : Array(String), scan_interval : Int32,
-		logger : MLogger, storage : Storage, title_hash : Hash(String, Title)
+  property dir : String, title_ids : Array(String), scan_interval : Int32,
+    storage : Storage, title_hash : Hash(String, Title)
 
-	def initialize(@dir, @scan_interval, @logger, @storage)
-		# explicitly initialize @titles to bypass the compiler check. it will
-		#	be filled with actual Titles in the `scan` call below
-		@title_ids = [] of String
-		@title_hash = {} of String => Title
+  def self.default : self
+    unless @@default
+      @@default = new
+    end
+    @@default.not_nil!
+  end
 
-		return scan if @scan_interval < 1
-		spawn do
-			loop do
-				start = Time.local
-				scan
-				ms = (Time.local - start).total_milliseconds
-				@logger.info "Scanned #{@title_ids.size} titles in #{ms}ms"
-				sleep @scan_interval * 60
-			end
-		end
-	end
-	def titles
-		@title_ids.map {|tid| self.get_title!(tid) }
-	end
-	def to_json(json : JSON::Builder)
-		json.object do
-			json.field "dir", @dir
-			json.field "titles" do
-				json.raw self.titles.to_json
-			end
-		end
-	end
-	def get_title(tid)
-		@title_hash[tid]?
-	end
-	def get_title!(tid)
-		@title_hash[tid]
-	end
-	def scan
-		unless Dir.exists? @dir
-			@logger.info "The library directory #{@dir} does not exist. " \
-				"Attempting to create it"
-			Dir.mkdir_p @dir
-		end
-		@title_ids.clear
-		(Dir.entries @dir)
-			.select { |fn| !fn.starts_with? "." }
-			.map { |fn| File.join @dir, fn }
-			.select { |path| File.directory? path }
-			.map { |path| Title.new path, "", @storage, @logger, self }
-			.select { |title| !(title.entries.empty? && title.titles.empty?) }
-			.sort { |a, b| a.title <=> b.title }
-			.each do |title|
-				@title_hash[title.id] = title
-				@title_ids << title.id
-			end
-		@logger.debug "Scan completed"
-	end
+  def initialize
+    @storage = Storage.default
+    @dir = Config.current.library_path
+    @scan_interval = Config.current.scan_interval
+    # explicitly initialize @titles to bypass the compiler check. it will
+    #   be filled with actual Titles in the `scan` call below
+    @title_ids = [] of String
+    @title_hash = {} of String => Title
+
+    return scan if @scan_interval < 1
+    spawn do
+      loop do
+        start = Time.local
+        scan
+        ms = (Time.local - start).total_milliseconds
+        Logger.info "Scanned #{@title_ids.size} titles in #{ms}ms"
+        sleep @scan_interval * 60
+      end
+    end
+  end
+
+  def titles
+    @title_ids.map { |tid| self.get_title!(tid) }
+  end
+
+  def deep_titles
+    titles + titles.map { |t| t.deep_titles }.flatten
+  end
+
+  def to_json(json : JSON::Builder)
+    json.object do
+      json.field "dir", @dir
+      json.field "titles" do
+        json.raw self.titles.to_json
+      end
+    end
+  end
+
+  def get_title(tid)
+    @title_hash[tid]?
+  end
+
+  def get_title!(tid)
+    @title_hash[tid]
+  end
+
+  def scan
+    unless Dir.exists? @dir
+      Logger.info "The library directory #{@dir} does not exist. " \
+                  "Attempting to create it"
+      Dir.mkdir_p @dir
+    end
+    @title_ids.clear
+    (Dir.entries @dir)
+      .select { |fn| !fn.starts_with? "." }
+      .map { |fn| File.join @dir, fn }
+      .select { |path| File.directory? path }
+      .map { |path| Title.new path, "", @storage, self }
+      .select { |title| !(title.entries.empty? && title.titles.empty?) }
+      .sort { |a, b| a.title <=> b.title }
+      .each do |title|
+        @title_hash[title.id] = title
+        @title_ids << title.id
+      end
+    Logger.debug "Scan completed"
+  end
+
+  def get_continue_reading_entries(username)
+    cr_entries = deep_titles
+      # For each Title, get the last read entry. If the user has finished
+      #   reading this entry, get the next entry
+      .map { |t|
+        last_read_entry = t.entries.reverse_each.find do |e|
+          e.started? username
+        end
+        if last_read_entry && last_read_entry.finished? username
+          last_read_entry = last_read_entry.next_entry
+        end
+        last_read_entry
+      }
+      # Select elements with type `Entry` from the array and ignore all `Nil`s
+      .select(Entry)
+      .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
+        last_read = e.load_last_read username
+        pe = e.previous_entry
+        if last_read.nil? && pe
+          last_read = pe.load_last_read username
+        end
+        {
+          entry:      e,
+          percentage: e.load_percentage(username),
+          last_read:  last_read,
+        }
+      }
+
+    # Sort by by last_read, most recent first (nils at the end)
+    cr_entries.sort { |a, b|
+      next 0 if a[:last_read].nil? && b[:last_read].nil?
+      next 1 if a[:last_read].nil?
+      next -1 if b[:last_read].nil?
+      b[:last_read].not_nil! <=> a[:last_read].not_nil!
+    }[0..11]
+  end
+
+  alias RA = NamedTuple(
+    entry: Entry,
+    percentage: Float64,
+    grouped_count: Int32)
+
+  def get_recently_added_entries(username)
+    recently_added = [] of RA
+
+    titles.map { |t| t.deep_entries }
+      .flatten
+      .select { |e| e.date_added > 1.month.ago }
+      .sort { |a, b| b.date_added <=> a.date_added }
+      .each do |e|
+        last = recently_added.last?
+        if last && e.title_id == last[:entry].title_id &&
+           (e.date_added - last[:entry].date_added).duration < 1.day
+          # A NamedTuple is immutable, so we have to cast it to a Hash first
+          last_hash = last.to_h
+          count = last_hash[:grouped_count].as(Int32)
+          last_hash[:grouped_count] = count + 1
+          # Setting the percentage to a negative value will hide the
+          #   percentage badge on the card
+          last_hash[:percentage] = -1.0
+          recently_added[recently_added.size - 1] = RA.from last_hash
+        else
+          recently_added << {
+            entry:         e,
+            percentage:    e.load_percentage(username),
+            grouped_count: 1,
+          }
+        end
+      end
+
+    recently_added[0..11]
+  end
 end

src/log_handler.cr

@@ -1,26 +0,0 @@
-require "kemal"
-require "./logger"
-
-class LogHandler < Kemal::BaseLogHandler
-	def initialize(@logger : MLogger)
-	end
-
-	def call(env)
-		elapsed_time = Time.measure { call_next env }
-		elapsed_text = elapsed_text elapsed_time
-		msg = "#{env.response.status_code} #{env.request.method}" \
-			" #{env.request.resource} #{elapsed_text}"
-		@logger.debug(msg)
-		env
-	end
-
-	def write(msg)
-		@logger.debug(msg)
-	end
-
-	private def elapsed_text(elapsed)
-		millis = elapsed.total_milliseconds
-		return "#{millis.round(2)}ms" if millis >= 1
-		"#{(millis * 1000).round(2)}µs"
-	end
-end

src/logger.cr

@@ -1,59 +1,73 @@
-require "./config"
-require "logger"
+require "log"
 require "colorize"
 
-LEVELS = ["debug", "error", "fatal", "info", "warn"]
-COLORS = [:light_cyan, :light_red, :red, :light_yellow, :light_magenta]
+class Logger
+  LEVELS       = ["debug", "error", "fatal", "info", "warn"]
+  SEVERITY_IDS = [0, 4, 5, 2, 3]
+  COLORS       = [:light_cyan, :light_red, :red, :light_yellow, :light_magenta]
 
-class MLogger
-	def initialize(config : Config)
-		@logger = Logger.new STDOUT
+  @@severity : Log::Severity = :info
 
-		@log_off = false
-		log_level = config.log_level
-		if log_level == "off"
-			@log_off = true
-			return
-		end
+  def self.default : self
+    unless @@default
+      @@default = new
+    end
+    @@default.not_nil!
+  end
 
-		{% begin %}
-			case log_level
-				{% for lvl in LEVELS %}
-				when {{lvl}}
-					@logger.level = Logger::{{lvl.upcase.id}}
-				{% end %}
-			else
-				raise "Unknown log level #{log_level}"
-			end
-		{% end %}
+  def initialize
+    level = Config.current.log_level
+    {% begin %}
+      case level.downcase
+      when "off"
+        @@severity = :none
+        {% for lvl, i in LEVELS %}
+        when {{lvl}}
+          @@severity = Log::Severity.new SEVERITY_IDS[{{i}}]
+        {% end %}
+      else
+        raise "Unknown log level #{level}"
+      end
+    {% end %}
 
-		@logger.formatter = Logger::Formatter.new do \
-			|severity, datetime, progname, message, io|
+    @log = Log.for("")
 
-			color = :default
-			{% begin %}
-				case severity.to_s().downcase
-					{% for lvl, i in LEVELS %}
-					when {{lvl}}
-						color = COLORS[{{i}}]
-					{% end %}
-				end
-			{% end %}
+    @backend = Log::IOBackend.new
+    @backend.formatter = ->(entry : Log::Entry, io : IO) do
+      color = :default
+      {% begin %}
+        case entry.severity.label.to_s().downcase
+          {% for lvl, i in LEVELS %}
+          when {{lvl}}, "#{{{lvl}}}ing"
+            color = COLORS[{{i}}]
+          {% end %}
+        else
+        end
+      {% end %}
 
-			io << "[#{severity}]".ljust(8).colorize(color)
-			io << datetime.to_s("%Y/%m/%d %H:%M:%S") << " | "
-			io << message
-		end
-	end
+      io << "[#{entry.severity.label}]".ljust(10).colorize(color)
+      io << entry.timestamp.to_s("%Y/%m/%d %H:%M:%S") << " | "
+      io << entry.message
+    end
 
-	{% for lvl in LEVELS %}
-		def {{lvl.id}}(msg)
-			return if @log_off
-			@logger.{{lvl.id}} msg
-		end
-	{% end %}
+    Log.builder.bind "*", @@severity, @backend
+  end
 
-	def to_json(json : JSON::Builder)
-		json.string self
-	end
+  # Ignores @@severity and always log msg
+  def log(msg)
+    @backend.write Log::Entry.new "", Log::Severity::None, msg, nil
+  end
+
+  def self.log(msg)
+    default.log msg
+  end
+
+  {% for lvl in LEVELS %}
+    def {{lvl.id}}(msg)
+      @log.{{lvl.id}} { msg }
+    end
+    def self.{{lvl.id}}(msg)
+      default.not_nil!.{{lvl.id}} msg
+    end
+  {% end %}
 end

src/mangadex/api.cr

@@ -1,203 +1,223 @@
 require "http/client"
 require "json"
 require "csv"
+require "../rename"
 
-macro string_properties (names)
-	{% for name in names %}
-		property {{name.id}} = ""
-	{% end %}
+macro string_properties(names)
+  {% for name in names %}
+    property {{name.id}} = ""
+  {% end %}
 end
 
-macro parse_strings_from_json (names)
-	{% for name in names %}
-		@{{name.id}} = obj[{{name}}].as_s
-	{% end %}
+macro parse_strings_from_json(names)
+  {% for name in names %}
+    @{{name.id}} = obj[{{name}}].as_s
+  {% end %}
+end
+
+macro properties_to_hash(names)
+  {
+    {% for name in names %}
+      "{{name.id}}" => @{{name.id}}.to_s,
+    {% end %}
+  }
 end
 
 module MangaDex
-	class Chapter
-		string_properties ["lang_code", "title", "volume", "chapter"]
-		property manga : Manga
-		property time = Time.local
-		property id : String
-		property full_title = ""
-		property language = ""
-		property pages = [] of {String, String} # filename, url
-		property groups = [] of {Int32, String} # group_id, group_name
+  class Chapter
+    string_properties ["lang_code", "title", "volume", "chapter"]
+    property manga : Manga
+    property time = Time.local
+    property id : String
+    property full_title = ""
+    property language = ""
+    property pages = [] of {String, String} # filename, url
+    property groups = [] of {Int32, String} # group_id, group_name
 
-		def initialize(@id, json_obj : JSON::Any, @manga, lang :
-					   Hash(String, String))
-			self.parse_json json_obj, lang
-		end
+    def initialize(@id, json_obj : JSON::Any, @manga,
+                   lang : Hash(String, String))
+      self.parse_json json_obj, lang
+    end
 
-		def to_info_json
-			JSON.build do |json|
-				json.object do
-					{% for name in ["id", "title", "volume", "chapter",
-							"language", "full_title"] %}
-						json.field {{name}}, @{{name.id}}
-					{% end %}
-					json.field "time", @time.to_unix.to_s
-					json.field "manga_title", @manga.title
-					json.field "manga_id", @manga.id
-					json.field "groups" do
-						json.object do
-							@groups.each do |gid, gname|
-								json.field gname, gid
-							end
-						end
-					end
-				end
-			end
-		end
+    def to_info_json
+      JSON.build do |json|
+        json.object do
+          {% for name in ["id", "title", "volume", "chapter",
+                          "language", "full_title"] %}
+          json.field {{name}}, @{{name.id}}
+        {% end %}
+          json.field "time", @time.to_unix.to_s
+          json.field "manga_title", @manga.title
+          json.field "manga_id", @manga.id
+          json.field "groups" do
+            json.object do
+              @groups.each do |gid, gname|
+                json.field gname, gid
+              end
+            end
+          end
+        end
+      end
+    end
 
-		def parse_json(obj, lang)
-			begin
-				parse_strings_from_json ["lang_code", "title", "volume",
-							 "chapter"]
-				language = lang[@lang_code]?
-				@language = language if language
-				@time = Time.unix obj["timestamp"].as_i
-				suffixes = ["", "_2", "_3"]
-				suffixes.each do |s|
-					gid = obj["group_id#{s}"].as_i
-					next if gid == 0
-					gname = obj["group_name#{s}"].as_s
-					@groups << {gid, gname}
-				end
-				@full_title = @title
-				unless @chapter.empty?
-					@full_title = "Ch.#{@chapter} " + @full_title
-				end
-				unless @volume.empty?
-					@full_title = "Vol.#{@volume} " + @full_title
-				end
-			rescue e
-				raise "failed to parse json: #{e}"
-			end
-		end
-	end
-	class Manga
-		string_properties ["cover_url", "description", "title", "author",
-					"artist"]
-		property chapters = [] of Chapter
-		property id : String
+    def parse_json(obj, lang)
+      parse_strings_from_json ["lang_code", "title", "volume",
+                               "chapter"]
+      language = lang[@lang_code]?
+      @language = language if language
+      @time = Time.unix obj["timestamp"].as_i
+      suffixes = ["", "_2", "_3"]
+      suffixes.each do |s|
+        gid = obj["group_id#{s}"].as_i
+        next if gid == 0
+        gname = obj["group_name#{s}"].as_s
+        @groups << {gid, gname}
+      end
 
-		def initialize(@id, json_obj : JSON::Any)
-			self.parse_json json_obj
-		end
+      rename_rule = Rename::Rule.new \
+        Config.current.mangadex["chapter_rename_rule"].to_s
+      @full_title = rename rename_rule
+    rescue e
+      raise "failed to parse json: #{e}"
+    end
 
-		def to_info_json(with_chapters = true)
-			JSON.build do |json|
-				json.object do
-					{% for name in ["id", "title", "description",
-							"author", "artist", "cover_url"] %}
-						json.field {{name}}, @{{name.id}}
-					{% end %}
-					if with_chapters
-						json.field "chapters" do
-							json.array do
-								@chapters.each do |c|
-									json.raw c.to_info_json
-								end
-							end
-						end
-					end
-				end
-			end
-		end
+    def rename(rule : Rename::Rule)
+      hash = properties_to_hash ["id", "title", "volume", "chapter",
+                                 "lang_code", "language", "pages"]
+      hash["groups"] = @groups.map { |g| g[1] }.join ","
+      rule.render hash
+    end
+  end
 
-		def parse_json(obj)
-			begin
-				parse_strings_from_json ["cover_url", "description", "title",
-							 "author", "artist"]
-			rescue e
-				raise "failed to parse json: #{e}"
-			end
-		end
-	end
-	class API
-		def initialize(@base_url = "https://mangadex.org/api/")
-			@lang = {} of String => String
-			CSV.each_row {{read_file "src/assets/lang_codes.csv"}} do |row|
-				@lang[row[1]] = row[0]
-			end
-		end
+  class Manga
+    string_properties ["cover_url", "description", "title", "author", "artist"]
+    property chapters = [] of Chapter
+    property id : String
 
-		def get(url)
-			headers = HTTP::Headers {
-				"User-agent" => "Mangadex.cr"
-			}
-			res = HTTP::Client.get url, headers
-			raise "Failed to get #{url}. [#{res.status_code}] "\
-				"#{res.status_message}" if !res.success?
-			JSON.parse res.body
-		end
+    def initialize(@id, json_obj : JSON::Any)
+      self.parse_json json_obj
+    end
 
-		def get_manga(id)
-			obj = self.get File.join @base_url, "manga/#{id}"
-			if obj["status"]? != "OK"
-				raise "Expecting `OK` in the `status` field. " \
-					"Got `#{obj["status"]?}`"
-			end
-			begin
-				manga = Manga.new id, obj["manga"]
-				obj["chapter"].as_h.map do |k, v|
-					chapter = Chapter.new k, v, manga, @lang
-					manga.chapters << chapter
-				end
-				return manga
-			rescue
-				raise "Failed to parse JSON"
-			end
-		end
+    def to_info_json(with_chapters = true)
+      JSON.build do |json|
+        json.object do
+          {% for name in ["id", "title", "description", "author", "artist",
+                          "cover_url"] %}
+            json.field {{name}}, @{{name.id}}
+          {% end %}
+          if with_chapters
+            json.field "chapters" do
+              json.array do
+                @chapters.each do |c|
+                  json.raw c.to_info_json
+                end
+              end
+            end
+          end
+        end
+      end
+    end
 
-		def get_chapter(chapter : Chapter)
-			obj = self.get File.join @base_url, "chapter/#{chapter.id}"
-			if obj["status"]? == "external"
-				raise "This chapter is hosted on an external site " \
-					"#{obj["external"]?}, and Mango does not support " \
-					"external chapters."
-			end
-			if obj["status"]? != "OK"
-				raise "Expecting `OK` in the `status` field. " \
-					"Got `#{obj["status"]?}`"
-			end
-			begin
-				server = obj["server"].as_s
-				hash = obj["hash"].as_s
-				chapter.pages = obj["page_array"].as_a.map do |fn|
-					{
-						fn.as_s,
-						"#{server}#{hash}/#{fn.as_s}"
-					}
-				end
-			rescue
-				raise "Failed to parse JSON"
-			end
-		end
+    def parse_json(obj)
+      parse_strings_from_json ["cover_url", "description", "title", "author",
+                               "artist"]
+    rescue e
+      raise "failed to parse json: #{e}"
+    end
 
-		def get_chapter(id : String)
-			obj = self.get File.join @base_url, "chapter/#{id}"
-			if obj["status"]? == "external"
-				raise "This chapter is hosted on an external site " \
-					"#{obj["external"]?}, and Mango does not support " \
-					"external chapters."
-			end
-			if obj["status"]? != "OK"
-				raise "Expecting `OK` in the `status` field. " \
-					"Got `#{obj["status"]?}`"
-			end
-			manga_id = ""
-			begin
-				manga_id = obj["manga_id"].as_i.to_s
-			rescue
-				raise "Failed to parse JSON"
-			end
-			manga = self.get_manga manga_id
-			chapter = manga.chapters.find {|c| c.id == id}.not_nil!
-			self.get_chapter chapter
-			return chapter
-		end
-	end
+    def rename(rule : Rename::Rule)
+      rule.render properties_to_hash ["id", "title", "author", "artist"]
+    end
+  end
+
+  class API
+    def self.default : self
+      unless @@default
+        @@default = new
+      end
+      @@default.not_nil!
+    end
+
+    def initialize
+      @base_url = Config.current.mangadex["api_url"].to_s ||
+                  "https://mangadex.org/api/"
+      @lang = {} of String => String
+      CSV.each_row {{read_file "src/assets/lang_codes.csv"}} do |row|
+        @lang[row[1]] = row[0]
+      end
+    end
+
+    def get(url)
+      headers = HTTP::Headers{
+        "User-agent" => "Mangadex.cr",
+      }
+      res = HTTP::Client.get url, headers
+      raise "Failed to get #{url}. [#{res.status_code}] " \
+            "#{res.status_message}" if !res.success?
+      JSON.parse res.body
+    end
+
+    def get_manga(id)
+      obj = self.get File.join @base_url, "manga/#{id}"
+      if obj["status"]? != "OK"
+        raise "Expecting `OK` in the `status` field. Got `#{obj["status"]?}`"
+      end
+      begin
+        manga = Manga.new id, obj["manga"]
+        obj["chapter"].as_h.map do |k, v|
+          chapter = Chapter.new k, v, manga, @lang
+          manga.chapters << chapter
+        end
+        manga
+      rescue
+        raise "Failed to parse JSON"
+      end
+    end
+
+    def get_chapter(chapter : Chapter)
+      obj = self.get File.join @base_url, "chapter/#{chapter.id}"
+      if obj["status"]? == "external"
+        raise "This chapter is hosted on an external site " \
+              "#{obj["external"]?}, and Mango does not support " \
+              "external chapters."
+      end
+      if obj["status"]? != "OK"
+        raise "Expecting `OK` in the `status` field. Got `#{obj["status"]?}`"
+      end
+      begin
+        server = obj["server"].as_s
+        hash = obj["hash"].as_s
+        chapter.pages = obj["page_array"].as_a.map do |fn|
+          {
+            fn.as_s,
+            "#{server}#{hash}/#{fn.as_s}",
+          }
+        end
+      rescue
+        raise "Failed to parse JSON"
+      end
+    end
+
+    def get_chapter(id : String)
+      obj = self.get File.join @base_url, "chapter/#{id}"
+      if obj["status"]? == "external"
+        raise "This chapter is hosted on an external site " \
+              "#{obj["external"]?}, and Mango does not support " \
+              "external chapters."
+      end
+      if obj["status"]? != "OK"
+        raise "Expecting `OK` in the `status` field. Got `#{obj["status"]?}`"
+      end
+      manga_id = ""
+      begin
+        manga_id = obj["manga_id"].as_i.to_s
+      rescue
+        raise "Failed to parse JSON"
+      end
+      manga = self.get_manga manga_id
+      chapter = manga.chapters.find { |c| c.id == id }.not_nil!
+      self.get_chapter chapter
+      chapter
+    end
+  end
 end

src/mangadex/downloader.cr

@@ -1,374 +1,408 @@
 require "./api"
 require "sqlite3"
+require "zip"
 
 module MangaDex
-	class PageJob
-		property success = false
-		property url : String
-		property filename : String
-		property writer : Zip::Writer
-		property tries_remaning : Int32
-		def initialize(@url, @filename, @writer, @tries_remaning)
-		end
-	end
+  class PageJob
+    property success = false
+    property url : String
+    property filename : String
+    property writer : Zip::Writer
+    property tries_remaning : Int32
 
-	enum JobStatus
-		Pending      # 0
-		Downloading  # 1
-		Error        # 2
-		Completed    # 3
-		MissingPages # 4
-	end
+    def initialize(@url, @filename, @writer, @tries_remaning)
+    end
+  end
 
-	struct Job
-		property id : String
-		property manga_id : String
-		property title : String
-		property manga_title : String
-		property status : JobStatus
-		property status_message : String = ""
-		property pages : Int32 = 0
-		property success_count : Int32 = 0
-		property fail_count : Int32 = 0
-		property time : Time
+  enum JobStatus
+    Pending      # 0
+    Downloading  # 1
+    Error        # 2
+    Completed    # 3
+    MissingPages # 4
+  end
 
-		def parse_query_result(res : DB::ResultSet)
-			@id = res.read String
-			@manga_id = res.read String
-			@title = res.read String
-			@manga_title = res.read String
-			status = res.read Int32
-			@status_message = res.read String
-			@pages = res.read Int32
-			@success_count = res.read Int32
-			@fail_count = res.read Int32
-			time = res.read Int64
-			@status = JobStatus.new status
-			@time = Time.unix_ms time
-		end
+  struct Job
+    property id : String
+    property manga_id : String
+    property title : String
+    property manga_title : String
+    property status : JobStatus
+    property status_message : String = ""
+    property pages : Int32 = 0
+    property success_count : Int32 = 0
+    property fail_count : Int32 = 0
+    property time : Time
 
-		# Raises if the result set does not contain the correct set of columns
-		def self.from_query_result(res : DB::ResultSet)
-			job = Job.allocate
-			job.parse_query_result res
-			return job
-		end
+    def parse_query_result(res : DB::ResultSet)
+      @id = res.read String
+      @manga_id = res.read String
+      @title = res.read String
+      @manga_title = res.read String
+      status = res.read Int32
+      @status_message = res.read String
+      @pages = res.read Int32
+      @success_count = res.read Int32
+      @fail_count = res.read Int32
+      time = res.read Int64
+      @status = JobStatus.new status
+      @time = Time.unix_ms time
+    end
 
-		def initialize(@id, @manga_id, @title, @manga_title, @status, @time)
-		end
+    # Raises if the result set does not contain the correct set of columns
+    def self.from_query_result(res : DB::ResultSet)
+      job = Job.allocate
+      job.parse_query_result res
+      job
+    end
 
-		def to_json(json)
-			json.object do
-				{% for name in ["id", "manga_id", "title", "manga_title",
-					"status_message"] %}
-					json.field {{name}}, @{{name.id}}
-				{% end %}
-				{% for name in ["pages", "success_count", "fail_count"] %}
-					json.field {{name}} do
-						json.number @{{name.id}}
-					end
-				{% end %}
-				json.field "status", @status.to_s
-				json.field "time" do
-					json.number @time.to_unix_ms
-				end
-			end
-		end
-	end
+    def initialize(@id, @manga_id, @title, @manga_title, @status, @time)
+    end
 
-	class Queue
-		property downloader : Downloader?
+    def to_json(json)
+      json.object do
+        {% for name in ["id", "manga_id", "title", "manga_title",
+                        "status_message"] %}
+          json.field {{name}}, @{{name.id}}
+        {% end %}
+        {% for name in ["pages", "success_count", "fail_count"] %}
+          json.field {{name}} do
+            json.number @{{name.id}}
+          end
+        {% end %}
+        json.field "status", @status.to_s
+        json.field "time" do
+          json.number @time.to_unix_ms
+        end
+      end
+    end
+  end
 
-		def initialize(@path : String, @logger : MLogger)
-			dir = File.dirname path
-			unless Dir.exists? dir
-				@logger.info "The queue DB directory #{dir} does not exist. " \
-					"Attepmting to create it"
-				Dir.mkdir_p dir
-			end
-			DB.open "sqlite3://#{@path}" do |db|
-				begin
-					db.exec "create table if not exists queue " \
-						"(id text, manga_id text, title text, manga_title " \
-						"text, status integer, status_message text, " \
-						"pages integer, success_count integer, " \
-						"fail_count integer, time integer)"
-					db.exec "create unique index if not exists id_idx " \
-						"on queue (id)"
-					db.exec "create index if not exists manga_id_idx " \
-						"on queue (manga_id)"
-					db.exec "create index if not exists status_idx " \
-						"on queue (status)"
-				rescue e
-					@logger.error "Error when checking tables in DB: #{e}"
-					raise e
-				end
-			end
-		end
+  class Queue
+    property downloader : Downloader?
+    @path : String
 
-		# Returns the earliest job in queue or nil if the job cannot be parsed.
-		#	Returns nil if queue is empty
-		def pop
-			job = nil
-			DB.open "sqlite3://#{@path}" do |db|
-				begin
-					db.query_one "select * from queue where status = 0 "\
-						"or status = 1 order by time limit 1" do |res|
-						job = Job.from_query_result res
-					end
-				rescue
-				end
-			end
-			return job
-		end
+    def self.default : self
+      unless @@default
+        @@default = new
+      end
+      @@default.not_nil!
+    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
-			DB.open "sqlite3://#{@path}" do |db|
-				jobs.each do |job|
-					db.exec "insert or ignore into queue values "\
-						"(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
-						job.id, job.manga_id, job.title, job.manga_title,
-						job.status.to_i, job.status_message, job.pages,
-						job.success_count, job.fail_count, job.time.to_unix_ms
-				end
-			end
-			self.count - start_count
-		end
+    def initialize(db_path : String? = nil)
+      @path = db_path || Config.current.mangadex["download_queue_db_path"].to_s
+      dir = File.dirname @path
+      unless Dir.exists? dir
+        Logger.info "The queue DB directory #{dir} does not exist. " \
+                    "Attepmting to create it"
+        Dir.mkdir_p dir
+      end
+      DB.open "sqlite3://#{@path}" do |db|
+        begin
+          db.exec "create table if not exists queue " \
+                  "(id text, manga_id text, title text, manga_title " \
+                  "text, status integer, status_message text, " \
+                  "pages integer, success_count integer, " \
+                  "fail_count integer, time integer)"
+          db.exec "create unique index if not exists id_idx " \
+                  "on queue (id)"
+          db.exec "create index if not exists manga_id_idx " \
+                  "on queue (manga_id)"
+          db.exec "create index if not exists status_idx " \
+                  "on queue (status)"
+        rescue e
+          Logger.error "Error when checking tables in DB: #{e}"
+          raise e
+        end
+      end
+    end
 
-		def reset(id : String)
-			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
+    # Returns the earliest job in queue or nil if the job cannot be parsed.
+    #   Returns nil if queue is empty
+    def pop
+      job = nil
+      DB.open "sqlite3://#{@path}" do |db|
+        begin
+          db.query_one "select * from queue where status = 0 " \
+                       "or status = 1 order by time limit 1" do |res|
+            job = Job.from_query_result res
+          end
+        rescue
+        end
+      end
+      job
+    end
 
-		def reset (job : Job)
-			self.reset job.id
-		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
+      DB.open "sqlite3://#{@path}" do |db|
+        jobs.each do |job|
+          db.exec "insert or ignore into queue values " \
+                  "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+            job.id, job.manga_id, job.title, job.manga_title,
+            job.status.to_i, job.status_message, job.pages,
+            job.success_count, job.fail_count, job.time.to_unix_ms
+        end
+      end
+      self.count - start_count
+    end
 
-		# Reset all failed tasks (missing pages and error)
-		def reset
-			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
+    def reset(id : String)
+      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
 
-		def delete(id : String)
-			DB.open "sqlite3://#{@path}" do |db|
-				db.exec "delete from queue where id = (?)", id
-			end
-		end
+    def reset(job : Job)
+      self.reset job.id
+    end
 
-		def delete(job : Job)
-			self.delete job.id
-		end
+    # Reset all failed tasks (missing pages and error)
+    def reset
+      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
 
-		def delete_status(status : JobStatus)
-			DB.open "sqlite3://#{@path}" do |db|
-				db.exec "delete from queue where status = (?)", status.to_i
-			end
-		end
+    def delete(id : String)
+      DB.open "sqlite3://#{@path}" do |db|
+        db.exec "delete from queue where id = (?)", id
+      end
+    end
 
-		def count_status(status : JobStatus)
-			DB.open "sqlite3://#{@path}" do |db|
-				return db.query_one "select count(*) from queue where "\
-					"status = (?)", status.to_i, as: Int32
-			end
-		end
+    def delete(job : Job)
+      self.delete job.id
+    end
 
-		def count
-			DB.open "sqlite3://#{@path}" do |db|
-				return db.query_one "select count(*) from queue", as: Int32
-			end
-		end
+    def delete_status(status : JobStatus)
+      DB.open "sqlite3://#{@path}" do |db|
+        db.exec "delete from queue where status = (?)", status.to_i
+      end
+    end
 
-		def set_status(status : JobStatus, job : Job)
-			DB.open "sqlite3://#{@path}" do |db|
-				db.exec "update queue set status = (?) where id = (?)",
-					status.to_i, job.id
-			end
-		end
+    def count_status(status : JobStatus)
+      num = 0
+      DB.open "sqlite3://#{@path}" do |db|
+        num = db.query_one "select count(*) from queue where " \
+                           "status = (?)", status.to_i, as: Int32
+      end
+      num
+    end
 
-		def get_all
-			jobs = [] of Job
-			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
-			return jobs
-		end
+    def count
+      num = 0
+      DB.open "sqlite3://#{@path}" do |db|
+        num = db.query_one "select count(*) from queue", as: Int32
+      end
+      num
+    end
 
-		def add_success(job : Job)
-			DB.open "sqlite3://#{@path}" do |db|
-				db.exec "update queue set success_count = success_count + 1 " \
-					"where id = (?)", job.id
-			end
-		end
+    def set_status(status : JobStatus, job : Job)
+      DB.open "sqlite3://#{@path}" do |db|
+        db.exec "update queue set status = (?) where id = (?)",
+          status.to_i, job.id
+      end
+    end
 
-		def add_fail(job : Job)
-			DB.open "sqlite3://#{@path}" do |db|
-				db.exec "update queue set fail_count = fail_count + 1 " \
-					"where id = (?)", job.id
-			end
-		end
+    def get_all
+      jobs = [] of Job
+      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
+      jobs
+    end
 
-		def set_pages(pages : Int32, job : Job)
-			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
+    def add_success(job : Job)
+      DB.open "sqlite3://#{@path}" do |db|
+        db.exec "update queue set success_count = success_count + 1 " \
+                "where id = (?)", job.id
+      end
+    end
 
-		def add_message(msg : String, job : Job)
-			DB.open "sqlite3://#{@path}" do |db|
-				db.exec "update queue set status_message = " \
-					"status_message || (?) || (?) where id = (?)",
-					"\n", msg, job.id
-			end
-		end
+    def add_fail(job : Job)
+      DB.open "sqlite3://#{@path}" do |db|
+        db.exec "update queue set fail_count = fail_count + 1 " \
+                "where id = (?)", job.id
+      end
+    end
 
-		def pause
-			@downloader.not_nil!.stopped = true
-		end
+    def set_pages(pages : Int32, job : Job)
+      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
 
-		def resume
-			@downloader.not_nil!.stopped = false
-		end
+    def add_message(msg : String, job : Job)
+      DB.open "sqlite3://#{@path}" do |db|
+        db.exec "update queue set status_message = " \
+                "status_message || (?) || (?) where id = (?)",
+          "\n", msg, job.id
+      end
+    end
 
-		def paused?
-			@downloader.not_nil!.stopped
-		end
-	end
+    def pause
+      @downloader.not_nil!.stopped = true
+    end
 
-	class Downloader
-		property stopped = false
-		@downloading = false
+    def resume
+      @downloader.not_nil!.stopped = false
+    end
 
-		def initialize(@queue : Queue, @api : API, @library_path : String,
-					   @wait_seconds : Int32, @retries : Int32,
-					   @logger : MLogger)
-			@queue.downloader = self
+    def paused?
+      @downloader.not_nil!.stopped
+    end
+  end
 
-			spawn do
-				loop do
-					sleep 1.second
-					next if @stopped || @downloading
-					begin
-						job = @queue.pop
-						next if job.nil?
-						download job
-					rescue e
-						@logger.error e
-					end
-				end
-			end
-		end
+  class Downloader
+    property stopped = false
+    @wait_seconds : Int32 = Config.current.mangadex["download_wait_seconds"]
+      .to_i32
+    @retries : Int32 = Config.current.mangadex["download_retries"].to_i32
+    @library_path : String = Config.current.library_path
+    @downloading = false
 
-		private def download(job : Job)
-			@downloading = true
-			@queue.set_status JobStatus::Downloading, job
-			begin
-				chapter = @api.get_chapter(job.id)
-			rescue e
-				@logger.error e
-				@queue.set_status JobStatus::Error, job
-				unless e.message.nil?
-					@queue.add_message e.message.not_nil!, job
-				end
-				@downloading = false
-				return
-			end
-			@queue.set_pages chapter.pages.size, job
-			lib_dir = @library_path
-			manga_dir = File.join lib_dir, chapter.manga.title
-			unless File.exists? manga_dir
-				Dir.mkdir_p manga_dir
-			end
-			zip_path = File.join manga_dir, "#{job.title}.cbz"
+    def self.default : self
+      unless @@default
+        @@default = new
+      end
+      @@default.not_nil!
+    end
 
-			# Find the number of digits needed to store the number of pages
-			len = Math.log10(chapter.pages.size).to_i + 1
+    def initialize
+      @queue = Queue.default
+      @api = API.default
+      @queue.downloader = self
 
-			writer = Zip::Writer.new zip_path
-			# Create a buffered channel. It works as an FIFO queue
-			channel = Channel(PageJob).new chapter.pages.size
-			spawn do
-				chapter.pages.each_with_index do |tuple, i|
-					fn, url = tuple
-					ext = File.extname fn
-					fn = "#{i.to_s.rjust len, '0'}#{ext}"
-					page_job = PageJob.new url, fn, writer, @retries
-					@logger.debug "Downloading #{url}"
-					loop do
-						sleep @wait_seconds.seconds
-						download_page page_job
-						break if page_job.success ||
-							page_job.tries_remaning <= 0
-						page_job.tries_remaning -= 1
-						@logger.warn "Failed to download page #{url}. " \
-							"Retrying... Remaining retries: " \
-							"#{page_job.tries_remaning}"
-					end
+      spawn do
+        loop do
+          sleep 1.second
+          next if @stopped || @downloading
+          begin
+            job = @queue.pop
+            next if job.nil?
+            download job
+          rescue e
+            Logger.error e
+          end
+        end
+      end
+    end
 
-					channel.send page_job
-				end
-			end
+    private def download(job : Job)
+      @downloading = true
+      @queue.set_status JobStatus::Downloading, job
+      begin
+        chapter = @api.get_chapter(job.id)
+      rescue e
+        Logger.error e
+        @queue.set_status JobStatus::Error, job
+        unless e.message.nil?
+          @queue.add_message e.message.not_nil!, job
+        end
+        @downloading = false
+        return
+      end
+      @queue.set_pages chapter.pages.size, job
+      lib_dir = @library_path
+      rename_rule = Rename::Rule.new \
+        Config.current.mangadex["manga_rename_rule"].to_s
+      manga_dir = File.join lib_dir, chapter.manga.rename rename_rule
+      unless File.exists? manga_dir
+        Dir.mkdir_p manga_dir
+      end
+      zip_path = File.join manga_dir, "#{job.title}.cbz"
 
-			spawn do
-				page_jobs = [] of PageJob
-				chapter.pages.size.times do
-					page_job = channel.receive
-					@logger.debug "[#{page_job.success ? "success" : "failed"}] " \
-						"#{page_job.url}"
-					page_jobs << page_job
-					if page_job.success
-						@queue.add_success job
-					else
-						@queue.add_fail job
-						msg = "Failed to download page #{page_job.url}"
-						@queue.add_message msg, job
-						@logger.error msg
-					end
-				end
-				fail_count = page_jobs.select{|j| !j.success}.size
-				@logger.debug "Download completed. "\
-					"#{fail_count}/#{page_jobs.size} failed"
-				writer.close
-				@logger.debug "cbz File created at #{zip_path}"
-				if fail_count == 0
-					@queue.set_status JobStatus::Completed, job
-				else
-					@queue.set_status JobStatus::MissingPages, job
-				end
-				@downloading = false
-			end
-		end
+      # Find the number of digits needed to store the number of pages
+      len = Math.log10(chapter.pages.size).to_i + 1
 
-		private def download_page(job : PageJob)
-			@logger.debug "downloading #{job.url}"
-			headers = HTTP::Headers {
-				"User-agent" => "Mangadex.cr"
-			}
-			begin
-				HTTP::Client.get job.url, headers do |res|
-					unless res.success?
-						raise "Failed to download page #{job.url}. " \
-							"[#{res.status_code}] #{res.status_message}"
-					end
-					job.writer.add job.filename, res.body_io
-				end
-				job.success = true
-			rescue e
-				@logger.error e
-				job.success = false
-			end
-		end
-	end
+      writer = Zip::Writer.new zip_path
+      # Create a buffered channel. It works as an FIFO queue
+      channel = Channel(PageJob).new chapter.pages.size
+      spawn do
+        chapter.pages.each_with_index do |tuple, i|
+          fn, url = tuple
+          ext = File.extname fn
+          fn = "#{i.to_s.rjust len, '0'}#{ext}"
+          page_job = PageJob.new url, fn, writer, @retries
+          Logger.debug "Downloading #{url}"
+          loop do
+            sleep @wait_seconds.seconds
+            download_page page_job
+            break if page_job.success ||
+                     page_job.tries_remaning <= 0
+            page_job.tries_remaning -= 1
+            Logger.warn "Failed to download page #{url}. " \
+                        "Retrying... Remaining retries: " \
+                        "#{page_job.tries_remaning}"
+          end
+
+          channel.send page_job
+        end
+      end
+
+      spawn do
+        page_jobs = [] of PageJob
+        chapter.pages.size.times do
+          page_job = channel.receive
+          Logger.debug "[#{page_job.success ? "success" : "failed"}] " \
+                       "#{page_job.url}"
+          page_jobs << page_job
+          if page_job.success
+            @queue.add_success job
+          else
+            @queue.add_fail job
+            msg = "Failed to download page #{page_job.url}"
+            @queue.add_message msg, job
+            Logger.error msg
+          end
+        end
+        fail_count = page_jobs.count { |j| !j.success }
+        Logger.debug "Download completed. " \
+                     "#{fail_count}/#{page_jobs.size} failed"
+        writer.close
+        Logger.debug "cbz File created at #{zip_path}"
+
+        zip_exception = validate_archive zip_path
+        if !zip_exception.nil?
+          @queue.add_message "The downloaded archive is corrupted. " \
+                             "Error: #{zip_exception}", job
+          @queue.set_status JobStatus::Error, job
+        elsif fail_count > 0
+          @queue.set_status JobStatus::MissingPages, job
+        else
+          @queue.set_status JobStatus::Completed, job
+        end
+        @downloading = false
+      end
+    end
+
+    private def download_page(job : PageJob)
+      Logger.debug "downloading #{job.url}"
+      headers = HTTP::Headers{
+        "User-agent" => "Mangadex.cr",
+      }
+      begin
+        HTTP::Client.get job.url, headers do |res|
+          unless res.success?
+            raise "Failed to download page #{job.url}. " \
+                  "[#{res.status_code}] #{res.status_message}"
+          end
+          job.writer.add job.filename, res.body_io
+        end
+        job.success = true
+      rescue e
+        Logger.error e
+        job.success = false
+      end
+    end
+  end
 end

src/mango.cr

@@ -1,41 +1,103 @@
+require "./config"
 require "./server"
-require "./context"
 require "./mangadex/*"
 require "option_parser"
+require "clim"
 
-VERSION = "0.2.5"
+MANGO_VERSION = "0.7.1"
 
-config_path = nil
-
-parser = OptionParser.parse do |parser|
-	parser.banner = "Mango e-manga server/reader. Version #{VERSION}\n"
-
-	parser.on "-v", "--version", "Show version" do
-		puts "Version #{VERSION}"
-		exit
-	end
-	parser.on "-h", "--help", "Show help" do
-		puts parser
-		exit
-	end
-	parser.on "-c PATH", "--config=PATH", "Path to the config file. " \
-		"Default is `~/.config/mango/config.yml`" do |path|
-		config_path = path
-	end
+macro common_option
+  option "-c PATH", "--config=PATH", type: String,
+    desc: "Path to the config file"
 end
 
-config = Config.load config_path
-logger = MLogger.new config
-storage = Storage.new config.db_path, logger
-library = Library.new config.library_path, config.scan_interval, logger, storage
-queue = MangaDex::Queue.new config.mangadex["download_queue_db_path"].to_s,
-	logger
-api = MangaDex::API.new  config.mangadex["api_url"].to_s
-downloader = MangaDex::Downloader.new queue, api, config.library_path,
-	config.mangadex["download_wait_seconds"].to_i,
-	config.mangadex["download_retries"].to_i, logger
+macro throw(msg)
+  puts "ERROR: #{{{msg}}}"
+  puts
+  puts "Please see the `--help`."
+  exit 1
+end
 
-context = Context.new config, logger, library, storage, queue
+class CLI < Clim
+  main do
+    desc "Mango - Manga Server and Web Reader. Version #{MANGO_VERSION}"
+    usage "mango [sub_command] [options]"
+    help short: "-h"
+    version "Version #{MANGO_VERSION}", short: "-v"
+    common_option
+    run do |opts|
+      Config.load(opts.config).set_current
+      MangaDex::Downloader.default
 
-server = Server.new context
-server.start
+      # empty ARGV so it won't be passed to Kemal
+      ARGV.clear
+      server = Server.new
+      server.start
+    end
+
+    sub "admin" do
+      desc "Run admin tools"
+      usage "mango admin [tool]"
+      help short: "-h"
+      run do |opts|
+        puts opts.help_string
+      end
+      sub "user" do
+        desc "User management tool"
+        usage "mango admin user [arguments] [options]"
+        help short: "-h"
+        argument "action", type: String,
+          desc: "Action to perform. Can be add/delete/update/list"
+        argument "username", type: String,
+          desc: "Username to update or delete"
+        option "-u USERNAME", "--username=USERNAME", type: String,
+          desc: "Username"
+        option "-p PASSWORD", "--password=PASSWORD", type: String,
+          desc: "Password"
+        option "-a", "--admin", desc: "Admin flag", type: Bool, default: false
+        common_option
+        run do |opts, args|
+          Config.load(opts.config).set_current
+          storage = Storage.new nil, false
+
+          case args.action
+          when "add"
+            throw "Options `-u` and `-p` required." if opts.username.nil? ||
+                                                       opts.password.nil?
+            storage.new_user opts.username.not_nil!,
+              opts.password.not_nil!, opts.admin
+          when "delete"
+            throw "Argument `username` required." if args.username.nil?
+            storage.delete_user args.username
+          when "update"
+            throw "Argument `username` required." if args.username.nil?
+            username = opts.username || args.username
+            password = opts.password || ""
+            storage.update_user args.username, username.not_nil!,
+              password.not_nil!, opts.admin
+          when "list"
+            users = storage.list_users
+            name_length = users.map(&.[0].size).max? || 0
+            l_cell_width = ["username".size, name_length].max
+            r_cell_width = "admin access".size
+            header = " #{"username".ljust l_cell_width} | admin access "
+            puts "-" * header.size
+            puts header
+            puts "-" * header.size
+            users.each do |name, admin|
+              puts " #{name.ljust l_cell_width} | " \
+                   "#{admin.to_s.ljust r_cell_width} "
+            end
+            puts "-" * header.size
+          when nil
+            puts opts.help_string
+          else
+            throw "Unknown action \"#{args.action}\"."
+          end
+        end
+      end
+    end
+  end
+end
+
+CLI.start(ARGV)

src/rename.cr

@@ -0,0 +1,147 @@
+module Rename
+  alias VHash = Hash(String, String)
+
+  abstract class Base(T)
+    @ary = [] of T
+
+    def push(var)
+      @ary.push var
+    end
+
+    abstract def render(hash : VHash)
+  end
+
+  class Variable < Base(String)
+    property id : String
+
+    def initialize(@id)
+    end
+
+    def render(hash : VHash)
+      hash[@id]? || ""
+    end
+  end
+
+  class Pattern < Base(Variable)
+    def render(hash : VHash)
+      @ary.each do |v|
+        if hash.has_key? v.id
+          return v.render hash
+        end
+      end
+      ""
+    end
+  end
+
+  class Group < Base(Pattern | String)
+    def render(hash : VHash)
+      return "" if @ary.select(&.is_a? Pattern)
+                     .any? &.as(Pattern).render(hash).empty?
+      @ary.map do |e|
+        if e.is_a? Pattern
+          e.render hash
+        else
+          e
+        end
+      end.join
+    end
+  end
+
+  class Rule < Base(Group | String | Pattern)
+    ESCAPE = ['/']
+
+    def initialize(str : String)
+      parse! str
+    rescue e
+      raise "Failed to parse rename rule #{str}. Error: #{e}"
+    end
+
+    private def parse!(str : String)
+      chars = [] of Char
+      pattern : Pattern? = nil
+      group : Group? = nil
+
+      str.each_char_with_index do |char, i|
+        if ['[', ']', '{', '}', '|'].includes?(char) && !chars.empty?
+          string = chars.join
+          if !pattern.nil?
+            pattern.push Variable.new string.strip
+          elsif !group.nil?
+            group.push string
+          else
+            @ary.push string
+          end
+          chars = [] of Char
+        end
+
+        case char
+        when '['
+          if !group.nil? || !pattern.nil?
+            raise "nested groups are not allowed"
+          end
+          group = Group.new
+        when ']'
+          if group.nil?
+            raise "unmatched ] at position #{i}"
+          end
+          if !pattern.nil?
+            raise "patterns (`{}`) should be closed before closing the " \
+                  "group (`[]`)"
+          end
+          @ary.push group
+          group = nil
+        when '{'
+          if !pattern.nil?
+            raise "nested patterns are not allowed"
+          end
+          pattern = Pattern.new
+        when '}'
+          if pattern.nil?
+            raise "unmatched } at position #{i}"
+          end
+          if !group.nil?
+            group.push pattern
+          else
+            @ary.push pattern
+          end
+          pattern = nil
+        when '|'
+          if pattern.nil?
+            chars.push char
+          end
+        else
+          if ESCAPE.includes? char
+            raise "the character #{char} at position #{i} is not allowed"
+          end
+          chars.push char
+        end
+      end
+
+      unless chars.empty?
+        @ary.push chars.join
+      end
+      if !pattern.nil?
+        raise "unclosed pattern {"
+      end
+      if !group.nil?
+        raise "unclosed group ["
+      end
+    end
+
+    def render(hash : VHash)
+      str = @ary.map do |e|
+        if e.is_a? String
+          e
+        else
+          e.render hash
+        end
+      end.join.strip
+      post_process str
+    end
+
+    private def post_process(str)
+      return "_" if str == ".."
+      str.gsub "/", "_"
+    end
+  end
+end

src/routes/admin.cr

@@ -1,108 +1,72 @@
 require "./router"
 
 class AdminRouter < Router
-	def setup
-		get "/admin" do |env|
-			layout "admin"
-		end
+  def initialize
+    get "/admin" do |env|
+      layout "admin"
+    end
 
-		get "/admin/user" do |env|
-			users = @context.storage.list_users
-			username = get_username env
-			layout "user"
-		end
+    get "/admin/user" do |env|
+      users = @context.storage.list_users
+      username = get_username env
+      layout "user"
+    end
 
-		get "/admin/user/edit" do |env|
-			username = env.params.query["username"]?
-			admin = env.params.query["admin"]?
-			if admin
-				admin = admin == "true"
-			end
-			error = env.params.query["error"]?
-				current_user = get_username env
-			new_user = username.nil? && admin.nil?
-			layout "user-edit"
-		end
+    get "/admin/user/edit" do |env|
+      username = env.params.query["username"]?
+      admin = env.params.query["admin"]?
+      if admin
+        admin = admin == "true"
+      end
+      error = env.params.query["error"]?
+      current_user = get_username env
+      new_user = username.nil? && admin.nil?
+      layout "user-edit"
+    end
 
-		post "/admin/user/edit" do |env|
-			# creating new user
-			begin
-				username = env.params.body["username"]
-				password = env.params.body["password"]
-				# if `admin` is unchecked, the body hash
-				# 	would not contain `admin`
-				admin = !env.params.body["admin"]?.nil?
+    post "/admin/user/edit" do |env|
+      # creating new user
+      username = env.params.body["username"]
+      password = env.params.body["password"]
+      # if `admin` is unchecked, the body hash
+      #   would not contain `admin`
+      admin = !env.params.body["admin"]?.nil?
 
-				if username.size < 3
-					raise "Username should contain at least 3 characters"
-				end
-				if (username =~ /^[A-Za-z0-9_]+$/).nil?
-					raise "Username should contain alphanumeric characters "\
-						"and underscores only"
-				end
-				if password.size < 6
-					raise "Password should contain at least 6 characters"
-				end
-				if (password =~ /^[[:ascii:]]+$/).nil?
-					raise "password should contain ASCII characters only"
-				end
+      @context.storage.new_user username, password, admin
 
-				@context.storage.new_user username, password, admin
+      redirect env, "/admin/user"
+    rescue e
+      @context.error e
+      redirect_url = URI.new \
+        path: "/admin/user/edit",
+        query: hash_to_query({"error" => e.message})
+      redirect env, redirect_url.to_s
+    end
 
-				env.redirect "/admin/user"
-			rescue e
-				@context.error e
-				redirect_url = URI.new \
-					path: "/admin/user/edit",\
-					query: hash_to_query({"error" => e.message})
-				env.redirect redirect_url.to_s
-			end
-		end
+    post "/admin/user/edit/:original_username" do |env|
+      # editing existing user
+      username = env.params.body["username"]
+      password = env.params.body["password"]
+      # if `admin` is unchecked, the body hash would not contain `admin`
+      admin = !env.params.body["admin"]?.nil?
+      original_username = env.params.url["original_username"]
 
-		post "/admin/user/edit/:original_username" do |env|
-			# editing existing user
-			begin
-				username = env.params.body["username"]
-				password = env.params.body["password"]
-				# if `admin` is unchecked, the body
-				#	hash would not contain `admin`
-				admin = !env.params.body["admin"]?.nil?
-				original_username = env.params.url["original_username"]
+      @context.storage.update_user \
+        original_username, username, password, admin
 
-				if username.size < 3
-					raise "Username should contain at least 3 characters"
-				end
-				if (username =~ /^[A-Za-z0-9_]+$/).nil?
-					raise "Username should contain alphanumeric characters "\
-						"and underscores only"
-				end
+      redirect env, "/admin/user"
+    rescue e
+      @context.error e
+      redirect_url = URI.new \
+        path: "/admin/user/edit",
+        query: hash_to_query({"username" => original_username, \
+                                 "admin" => admin, "error" => e.message})
+      redirect env, redirect_url.to_s
+    end
 
-				if password.size != 0
-					if password.size < 6
-						raise "Password should contain at least 6 characters"
-					end
-					if (password =~ /^[[:ascii:]]+$/).nil?
-						raise "password should contain ASCII characters only"
-					end
-				end
-
-				@context.storage.update_user \
-					original_username, username, password, admin
-
-				env.redirect "/admin/user"
-			rescue e
-				@context.error e
-				redirect_url = URI.new \
-					path: "/admin/user/edit",\
-					query: hash_to_query({"username" => original_username, \
-						   "admin" => admin, "error" => e.message})
-					env.redirect redirect_url.to_s
-			end
-		end
-
-		get "/admin/downloads" do |env|
-			base_url = @context.config.mangadex["base_url"];
-			layout "download-manager"
-		end
-	end
+    get "/admin/downloads" do |env|
+      mangadex_base_url = Config.current.mangadex["base_url"]
+      layout "download-manager"
+    end
+  end
 end

src/routes/api.cr

@@ -1,180 +1,263 @@
 require "./router"
 require "../mangadex/*"
+require "../upload"
 
 class APIRouter < Router
-	def setup
-		get "/api/page/:tid/:eid/:page" do |env|
-			begin
-				tid = env.params.url["tid"]
-				eid = env.params.url["eid"]
-				page = env.params.url["page"].to_i
+  def initialize
+    get "/api/page/:tid/:eid/:page" do |env|
+      begin
+        tid = env.params.url["tid"]
+        eid = env.params.url["eid"]
+        page = env.params.url["page"].to_i
 
-				title = @context.library.get_title tid
-				raise "Title ID `#{tid}` not found" if title.nil?
-				entry = title.get_entry eid
-				raise "Entry ID `#{eid}` of `#{title.title}` not found" if \
-					entry.nil?
-				img = entry.read_page page
-				raise "Failed to load page #{page} of " \
-					"`#{title.title}/#{entry.title}`" if img.nil?
+        title = @context.library.get_title tid
+        raise "Title ID `#{tid}` not found" if title.nil?
+        entry = title.get_entry eid
+        raise "Entry ID `#{eid}` of `#{title.title}` not found" if entry.nil?
+        img = entry.read_page page
+        raise "Failed to load page #{page} of " \
+              "`#{title.title}/#{entry.title}`" if img.nil?
 
-				send_img env, img
-			rescue e
-				@context.error e
-				env.response.status_code = 500
-				e.message
-			end
-		end
+        send_img env, img
+      rescue e
+        @context.error e
+        env.response.status_code = 500
+        e.message
+      end
+    end
 
-		get "/api/book/:tid" do |env|
-			begin
-				tid = env.params.url["tid"]
-				title = @context.library.get_title tid
-				raise "Title ID `#{tid}` not found" if title.nil?
+    get "/api/book/:tid" do |env|
+      begin
+        tid = env.params.url["tid"]
+        title = @context.library.get_title tid
+        raise "Title ID `#{tid}` not found" if title.nil?
 
-				send_json env, title.to_json
-			rescue e
-				@context.error e
-				env.response.status_code = 500
-				e.message
-			end
-		end
+        send_json env, title.to_json
+      rescue e
+        @context.error e
+        env.response.status_code = 500
+        e.message
+      end
+    end
 
-		get "/api/book" do |env|
-			send_json env, @context.library.to_json
-		end
+    get "/api/book" do |env|
+      send_json env, @context.library.to_json
+    end
 
-		post "/api/admin/scan" do |env|
-			start = Time.utc
-			@context.library.scan
-			ms = (Time.utc - start).total_milliseconds
-			send_json env, {
-				"milliseconds" => ms,
-				"titles" => @context.library.titles.size
-			}.to_json
-		end
+    post "/api/admin/scan" do |env|
+      start = Time.utc
+      @context.library.scan
+      ms = (Time.utc - start).total_milliseconds
+      send_json env, {
+        "milliseconds" => ms,
+        "titles"       => @context.library.titles.size,
+      }.to_json
+    end
 
-		post "/api/admin/user/delete/:username" do |env|
-			begin
-				username = env.params.url["username"]
-				@context.storage.delete_user 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/user/delete/:username" do |env|
+      begin
+        username = env.params.url["username"]
+        @context.storage.delete_user 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/progress/:title/:entry/:page" do |env|
-			begin
-				username = get_username env
-				title = (@context.library.get_title env.params.url["title"])
-					.not_nil!
-				entry = (title.get_entry env.params.url["entry"]).not_nil!
-				page = env.params.url["page"].to_i
+    post "/api/progress/:title/:page" do |env|
+      begin
+        username = get_username env
+        title = (@context.library.get_title env.params.url["title"])
+          .not_nil!
+        page = env.params.url["page"].to_i
+        entry_id = env.params.query["entry"]?
 
-				raise "incorrect page value" if page < 0 || page > entry.pages
-				title.save_progress username, entry.title, page
-			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
+        if !entry_id.nil?
+          entry = title.get_entry(entry_id).not_nil!
+          raise "incorrect page value" if page < 0 || page > entry.pages
+          entry.save_progress username, page
+        elsif page == 0
+          title.unread_all username
+        else
+          title.read_all username
+        end
+      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
 
-		get "/api/admin/mangadex/manga/:id" do |env|
-			begin
-				id = env.params.url["id"]
-				api = MangaDex::API.new \
-					@context.config.mangadex["api_url"].to_s
-				manga = api.get_manga id
-				send_json env, manga.to_info_json
-			rescue e
-				@context.error e
-				send_json env, {"error" => e.message}.to_json
-			end
-		end
+    post "/api/admin/display_name/:title/:name" do |env|
+      begin
+        title = (@context.library.get_title env.params.url["title"])
+          .not_nil!
+        name = env.params.url["name"]
+        entry = env.params.query["entry"]?
+        if entry.nil?
+          title.set_display_name name
+        else
+          eobj = title.get_entry entry
+          title.set_display_name eobj.not_nil!.title, name
+        end
+      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/mangadex/download" do |env|
-			begin
-				chapters = env.params.json["chapters"].as(Array).map{|c| c.as_h}
-				jobs = chapters.map {|chapter|
-					MangaDex::Job.new(
-						chapter["id"].as_s,
-						chapter["manga_id"].as_s,
-						chapter["full_title"].as_s,
-						chapter["manga_title"].as_s,
-						MangaDex::JobStatus::Pending,
-						Time.unix chapter["time"].as_s.to_i
-					)
-				}
-				inserted_count = @context.queue.push jobs
-				send_json env, {
-					"success": inserted_count,
-					"fail": jobs.size - inserted_count
-				}.to_json
-			rescue e
-				@context.error e
-				send_json env, {"error" => e.message}.to_json
-			end
-		end
+    get "/api/admin/mangadex/manga/:id" do |env|
+      begin
+        id = env.params.url["id"]
+        api = MangaDex::API.default
+        manga = api.get_manga id
+        send_json env, manga.to_info_json
+      rescue e
+        @context.error e
+        send_json env, {"error" => e.message}.to_json
+      end
+    end
 
-		get "/api/admin/mangadex/queue" do |env|
-			begin
-				jobs = @context.queue.get_all
-				send_json env, {
-					"jobs" => jobs,
-					"paused" => @context.queue.paused?,
-					"success" => true
-				}.to_json
-			rescue e
-				send_json env, {
-					"success" => false,
-					"error" => e.message
-				}.to_json
-			end
-		end
+    post "/api/admin/mangadex/download" do |env|
+      begin
+        chapters = env.params.json["chapters"].as(Array).map { |c| c.as_h }
+        jobs = chapters.map { |chapter|
+          MangaDex::Job.new(
+            chapter["id"].as_s,
+            chapter["manga_id"].as_s,
+            chapter["full_title"].as_s,
+            chapter["manga_title"].as_s,
+            MangaDex::JobStatus::Pending,
+            Time.unix chapter["time"].as_s.to_i
+          )
+        }
+        inserted_count = @context.queue.push jobs
+        send_json env, {
+          "success": inserted_count,
+          "fail":    jobs.size - inserted_count,
+        }.to_json
+      rescue e
+        @context.error e
+        send_json env, {"error" => e.message}.to_json
+      end
+    end
 
-		post "/api/admin/mangadex/queue/:action" do |env|
-			begin
-				action = env.params.url["action"]
-				id = env.params.query["id"]?
-				case action
-				when "delete"
-					if id.nil?
-						@context.queue.delete_status MangaDex::JobStatus::Completed
-					else
-						@context.queue.delete id
-					end
-				when "retry"
-					if id.nil?
-						@context.queue.reset
-					else
-						@context.queue.reset id
-					end
-				when "pause"
-					@context.queue.pause
-				when "resume"
-					@context.queue.resume
-				else
-					raise "Unknown queue action #{action}"
-				end
+    get "/api/admin/mangadex/queue" do |env|
+      begin
+        jobs = @context.queue.get_all
+        send_json env, {
+          "jobs"    => jobs,
+          "paused"  => @context.queue.paused?,
+          "success" => true,
+        }.to_json
+      rescue e
+        send_json env, {
+          "success" => false,
+          "error"   => e.message,
+        }.to_json
+      end
+    end
 
-				send_json env, {"success" => true}.to_json
-			rescue e
-				send_json env, {
-					"success" => false,
-					"error" => e.message
-				}.to_json
-			end
-		end
-	end
+    post "/api/admin/mangadex/queue/:action" do |env|
+      begin
+        action = env.params.url["action"]
+        id = env.params.query["id"]?
+        case action
+        when "delete"
+          if id.nil?
+            @context.queue.delete_status MangaDex::JobStatus::Completed
+          else
+            @context.queue.delete id
+          end
+        when "retry"
+          if id.nil?
+            @context.queue.reset
+          else
+            @context.queue.reset id
+          end
+        when "pause"
+          @context.queue.pause
+        when "resume"
+          @context.queue.resume
+        else
+          raise "Unknown queue action #{action}"
+        end
+
+        send_json env, {"success" => true}.to_json
+      rescue e
+        send_json env, {
+          "success" => false,
+          "error"   => e.message,
+        }.to_json
+      end
+    end
+
+    post "/api/admin/upload/:target" do |env|
+      begin
+        target = env.params.url["target"]
+
+        HTTP::FormData.parse env.request do |part|
+          next if part.name != "file"
+
+          filename = part.filename
+          if filename.nil?
+            raise "No file uploaded"
+          end
+
+          case target
+          when "cover"
+            title_id = env.params.query["title"]
+            entry_id = env.params.query["entry"]?
+            title = @context.library.get_title(title_id).not_nil!
+
+            unless SUPPORTED_IMG_TYPES.includes? \
+                     MIME.from_filename? filename
+              raise "The uploaded image must be either JPEG or PNG"
+            end
+
+            ext = File.extname filename
+            upload = Upload.new Config.current.upload_path
+            url = upload.path_to_url upload.save "img", ext, part.body
+
+            if url.nil?
+              raise "Failed to generate a public URL for the uploaded file"
+            end
+
+            if entry_id.nil?
+              title.set_cover_url url
+            else
+              entry_name = title.get_entry(entry_id).not_nil!.title
+              title.set_cover_url entry_name, url
+            end
+          else
+            raise "Unkown upload target #{target}"
+          end
+
+          send_json env, {"success" => true}.to_json
+          env.response.close
+        end
+
+        raise "No part with name `file` found"
+      rescue e
+        send_json env, {
+          "success" => false,
+          "error"   => e.message,
+        }.to_json
+      end
+    end
+  end
 end

src/routes/main.cr

@@ -1,63 +1,86 @@
 require "./router"
 
 class MainRouter < Router
-	def setup
-		get "/login" do |env|
-			render "src/views/login.ecr"
-		end
+  def initialize
+    get "/login" do |env|
+      base_url = Config.current.base_url
+      render "src/views/login.html.ecr"
+    end
 
-		get "/logout" do |env|
-			begin
-				cookie = env.request.cookies
-					.find { |c| c.name == "token" }.not_nil!
-				@context.storage.logout cookie.value
-			rescue e
-				@context.error "Error when attempting to log out: #{e}"
-			ensure
-				env.redirect "/login"
-			end
-		end
+    get "/logout" do |env|
+      begin
+        env.session.delete_string "token"
+      rescue e
+        @context.error "Error when attempting to log out: #{e}"
+      ensure
+        redirect env, "/login"
+      end
+    end
 
-		post "/login" do |env|
-			begin
-				username = env.params.body["username"]
-				password = env.params.body["password"]
-				token = @context.storage.verify_user(username, password)
-					.not_nil!
+    post "/login" do |env|
+      begin
+        username = env.params.body["username"]
+        password = env.params.body["password"]
+        token = @context.storage.verify_user(username, password).not_nil!
 
-				cookie = HTTP::Cookie.new "token", token
-				cookie.expires = Time.local.shift years: 1
-				env.response.cookies << cookie
-				env.redirect "/"
-			rescue
-				env.redirect "/login"
-			end
-		end
+        env.session.string "token", token
 
-		get "/" do |env|
-			titles = @context.library.titles
-			username = get_username env
-			percentage = titles.map &.load_percetage username
-			layout "index"
-		end
+        callback = env.session.string? "callback"
+        if callback
+          env.session.delete_string "callback"
+          redirect env, callback
+        else
+          redirect env, "/"
+        end
+      rescue
+        redirect env, "/login"
+      end
+    end
 
-		get "/book/:title" do |env|
-			begin
-				title = (@context.library.get_title env.params.url["title"])
-					.not_nil!
-				username = get_username env
-				percentage = title.entries.map { |e|
-					title.load_percetage username, e.title }
-				layout "title"
-			rescue e
-				@context.error e
-				env.response.status_code = 404
-			end
-		end
+    get "/library" do |env|
+      begin
+        titles = @context.library.titles
+        username = get_username env
+        percentage = titles.map &.load_percentage username
+        layout "library"
+      rescue e
+        @context.error e
+        env.response.status_code = 500
+      end
+    end
 
-		get "/download" do |env|
-			base_url = @context.config.mangadex["base_url"];
-			layout "download"
-		end
-	end
+    get "/book/:title" do |env|
+      begin
+        title = (@context.library.get_title env.params.url["title"]).not_nil!
+        username = get_username env
+        percentage = title.entries.map &.load_percentage username
+        title_percentage = title.titles.map &.load_percentage username
+        layout "title"
+      rescue e
+        @context.error e
+        env.response.status_code = 404
+      end
+    end
+
+    get "/download" do |env|
+      mangadex_base_url = Config.current.mangadex["base_url"]
+      layout "download"
+    end
+
+    get "/" do |env|
+      begin
+        username = get_username env
+        continue_reading = @context
+          .library.get_continue_reading_entries username
+        recently_added = @context.library.get_recently_added_entries username
+        titles = @context.library.titles
+        new_user = !titles.any? { |t| t.load_percentage(username) > 0 }
+        empty_library = titles.size == 0
+        layout "home"
+      rescue e
+        @context.error e
+        env.response.status_code = 500
+      end
+    end
+  end
 end

src/routes/opds.cr

@@ -0,0 +1,32 @@
+require "./router"
+
+class OPDSRouter < Router
+  def initialize
+    get "/opds" do |env|
+      titles = @context.library.titles
+      render_xml "src/views/opds/index.xml.ecr"
+    end
+
+    get "/opds/book/:title_id" do |env|
+      begin
+        title = @context.library.get_title(env.params.url["title_id"]).not_nil!
+        render_xml "src/views/opds/title.xml.ecr"
+      rescue e
+        @context.error e
+        env.response.status_code = 404
+      end
+    end
+
+    get "/opds/download/:title/:entry" do |env|
+      begin
+        title = (@context.library.get_title env.params.url["title"]).not_nil!
+        entry = (title.get_entry env.params.url["entry"]).not_nil!
+
+        send_attachment env, entry.zip_path
+      rescue e
+        @context.error e
+        env.response.status_code = 404
+      end
+    end
+  end
+end

src/routes/reader.cr

@@ -1,58 +1,66 @@
 require "./router"
 
 class ReaderRouter < Router
-	def setup
-		get "/reader/:title/:entry" do |env|
-			begin
-				title = (@context.library.get_title env.params.url["title"])
-					.not_nil!
-				entry = (title.get_entry env.params.url["entry"]).not_nil!
+  def initialize
+    get "/reader/:title/:entry" do |env|
+      begin
+        title = (@context.library.get_title env.params.url["title"]).not_nil!
+        entry = (title.get_entry env.params.url["entry"]).not_nil!
 
-				# load progress
-				username = get_username env
-				page = title.load_progress username, entry.title
-				# we go back 2 * `IMGS_PER_PAGE` pages. the infinite scroll
-				# 	library perloads a few pages in advance, and the user
-				# 	might not have actually read them
-				page = [page - 2 * IMGS_PER_PAGE, 1].max
+        # load progress
+        username = get_username env
+        page = entry.load_progress username
+        # we go back 2 * `IMGS_PER_PAGE` pages. the infinite scroll
+        #   library perloads a few pages in advance, and the user
+        #   might not have actually read them
+        page = [page - 2 * IMGS_PER_PAGE, 1].max
 
-				env.redirect "/reader/#{title.id}/#{entry.id}/#{page}"
-			rescue e
-				@context.error e
-				env.response.status_code = 404
-			end
-		end
+        # start from page 1 if the user has finished reading the entry
+        page = 1 if entry.finished? username
 
-		get "/reader/:title/:entry/:page" do |env|
-			begin
-				title = (@context.library.get_title env.params.url["title"])
-					.not_nil!
-				entry = (title.get_entry env.params.url["entry"]).not_nil!
-				page = env.params.url["page"].to_i
-				raise "" if page > entry.pages || page <= 0
+        redirect env, "/reader/#{title.id}/#{entry.id}/#{page}"
+      rescue e
+        @context.error e
+        env.response.status_code = 404
+      end
+    end
 
-				# save progress
-				username = get_username env
-				title.save_progress username, entry.title, page
+    get "/reader/:title/:entry/:page" do |env|
+      begin
+        base_url = Config.current.base_url
 
-				pages = (page...[entry.pages + 1, page + IMGS_PER_PAGE].min)
-				urls = pages.map { |idx|
-					"/api/page/#{title.id}/#{entry.id}/#{idx}" }
-				reader_urls = pages.map { |idx|
-					"/reader/#{title.id}/#{entry.id}/#{idx}" }
-				next_page = page + IMGS_PER_PAGE
-				next_url = next_page > entry.pages ? nil :
-					"/reader/#{title.id}/#{entry.id}/#{next_page}"
-				exit_url = "/book/#{title.id}"
-				next_entry = title.next_entry entry
-				next_entry_url = next_entry.nil? ? nil : \
-					"/reader/#{title.id}/#{next_entry.id}"
+        title = (@context.library.get_title env.params.url["title"]).not_nil!
+        entry = (title.get_entry env.params.url["entry"]).not_nil!
+        page = env.params.url["page"].to_i
+        raise "" if page > entry.pages || page <= 0
 
-				render "src/views/reader.ecr"
-			rescue e
-				@context.error e
-				env.response.status_code = 404
-			end
-		end
-	end
+        # save progress
+        username = get_username env
+        entry.save_progress username, page
+
+        pages = (page...[entry.pages + 1, page + IMGS_PER_PAGE].min)
+        urls = pages.map { |idx|
+          "#{base_url}api/page/#{title.id}/#{entry.id}/#{idx}"
+        }
+        reader_urls = pages.map { |idx|
+          "#{base_url}reader/#{title.id}/#{entry.id}/#{idx}"
+        }
+        next_page = page + IMGS_PER_PAGE
+        next_url = next_entry_url = nil
+        exit_url = "#{base_url}book/#{title.id}"
+        next_entry = entry.next_entry
+        unless next_page > entry.pages
+          next_url = "#{base_url}reader/#{title.id}/#{entry.id}/#{next_page}"
+        end
+        unless next_entry.nil?
+          next_entry_url = "#{base_url}reader/#{title.id}/#{next_entry.id}"
+        end
+
+        render "src/views/reader.html.ecr"
+      rescue e
+        @context.error e
+        env.response.status_code = 404
+      end
+    end
+  end
 end

src/routes/router.cr

@@ -1,6 +1,3 @@
-require "../context"
-
 class Router
-	def initialize(@context : Context)
-	end
+  @context : Context = Context.default
 end

src/server.cr

@@ -1,50 +1,86 @@
 require "kemal"
-require "./context"
-require "./auth_handler"
-require "./static_handler"
-require "./log_handler"
+require "kemal-session"
+require "./library"
+require "./handlers/*"
 require "./util"
 require "./routes/*"
 
-class Server
-	def initialize(@context : Context)
+class Context
+  property library : Library
+  property storage : Storage
+  property queue : MangaDex::Queue
 
-		error 403 do |env|
-			message = "HTTP 403: You are not authorized to visit " \
-				"#{env.request.path}"
-			layout "message"
-		end
-		error 404 do |env|
-			message = "HTTP 404: Mango cannot find the page #{env.request.path}"
-			layout "message"
-		end
-		error 500 do |env|
-			message = "HTTP 500: Internal server error. Please try again later."
-			layout "message"
-		end
+  def self.default : self
+    unless @@default
+      @@default = new
+    end
+    @@default.not_nil!
+  end
 
-		MainRouter.new(@context).setup
-		AdminRouter.new(@context).setup
-		ReaderRouter.new(@context).setup
-		APIRouter.new(@context).setup
+  def initialize
+    @storage = Storage.default
+    @library = Library.default
+    @queue = MangaDex::Queue.default
+  end
 
-		Kemal.config.logging = false
-		add_handler LogHandler.new @context.logger
-		add_handler AuthHandler.new @context.storage
-		{% if flag?(:release) %}
-			# when building for relase, embed the static files in binary
-			@context.debug "We are in release mode. Using embedded static files."
-			serve_static false
-			add_handler StaticHandler.new
-		{% end %}
-	end
-
-	def start
-		@context.debug "Starting Kemal server"
-		{% if flag?(:release) %}
-			Kemal.config.env = "production"
-		{% end %}
-		Kemal.config.port = @context.config.port
-		Kemal.run
-	end
+  {% for lvl in Logger::LEVELS %}
+      def {{lvl.id}}(msg)
+          Logger.{{lvl.id}} msg
+      end
+  {% end %}
+end
+
+class Server
+  @context : Context = Context.default
+
+  def initialize
+    error 403 do |env|
+      message = "HTTP 403: You are not authorized to visit #{env.request.path}"
+      layout "message"
+    end
+    error 404 do |env|
+      message = "HTTP 404: Mango cannot find the page #{env.request.path}"
+      layout "message"
+    end
+
+    {% if flag?(:release) %}
+      error 500 do |env|
+        message = "HTTP 500: Internal server error. Please try again later."
+        layout "message"
+      end
+    {% end %}
+
+    MainRouter.new
+    AdminRouter.new
+    ReaderRouter.new
+    APIRouter.new
+    OPDSRouter.new
+
+    Kemal.config.logging = false
+    add_handler LogHandler.new
+    add_handler AuthHandler.new @context.storage
+    add_handler UploadHandler.new Config.current.upload_path
+    {% if flag?(:release) %}
+      # when building for relase, embed the static files in binary
+      @context.debug "We are in release mode. Using embedded static files."
+      serve_static false
+      add_handler StaticHandler.new
+    {% end %}
+
+    Kemal::Session.config do |c|
+      c.timeout = 365.days
+      c.secret = Config.current.session_secret
+      c.cookie_name = "mango-sessid-#{Config.current.port}"
+      c.path = Config.current.base_url
+    end
+  end
+
+  def start
+    @context.debug "Starting Kemal server"
+    {% if flag?(:release) %}
+      Kemal.config.env = "production"
+    {% end %}
+    Kemal.config.port = Config.current.port
+    Kemal.run
+  end
 end

src/static_handler.cr

@@ -1,32 +0,0 @@
-require "baked_file_system"
-require "kemal"
-require "./util"
-
-class FS
-	extend BakedFileSystem
-	{% if flag?(:release) %}
-		{% if read_file? "#{__DIR__}/../dist/favicon.ico" %}
-			{% puts "baking ../dist" %}
-			bake_folder "../dist"
-		{% else %}
-			{% puts "baking ../public" %}
-			bake_folder "../public"
-		{% end %}
-	{% end %}
-end
-
-class StaticHandler < Kemal::Handler
-	@dirs = ["/css", "/js", "/img", "/favicon.ico"]
-
-	def call(env)
-		if request_path_startswith env, @dirs
-			file = FS.get? env.request.path
-			return call_next env if file.nil?
-
-			slice = Bytes.new file.size
-			file.read slice
-			return send_file env, slice, file.mime_type
-		end
-		call_next env
-	end
-end

src/storage.cr

@@ -2,176 +2,195 @@ require "sqlite3"
 require "crypto/bcrypt"
 require "uuid"
 require "base64"
+require "./util"
 
 def hash_password(pw)
-	Crypto::Bcrypt::Password.create(pw).to_s
+  Crypto::Bcrypt::Password.create(pw).to_s
 end
 
 def verify_password(hash, pw)
-	(Crypto::Bcrypt::Password.new hash).verify pw
-end
-
-def random_str
-	UUID.random.to_s.gsub "-", ""
+  (Crypto::Bcrypt::Password.new hash).verify pw
 end
 
 class Storage
-	def initialize(@path : String, @logger : MLogger)
-		dir = File.dirname path
-		unless Dir.exists? dir
-			@logger.info "The DB directory #{dir} does not exist. " \
-				"Attepmting to create it"
-			Dir.mkdir_p dir
-		end
-		DB.open "sqlite3://#{path}" do |db|
-			begin
-				# We create the `ids` table first. even if the uses has an
-				#	early version installed and has the `user` table only,
-				#	we will still be able to create `ids`
-				db.exec "create table ids" \
-					"(path text, id text, is_title integer)"
-				db.exec "create unique index path_idx on ids (path)"
-				db.exec "create unique index id_idx on ids (id)"
+  @path : String
 
-				db.exec "create table users" \
-					"(username text, password text, token text, admin integer)"
-			rescue e
-				unless e.message.not_nil!.ends_with? "already exists"
-					@logger.fatal "Error when checking tables in DB: #{e}"
-					raise e
-				end
-			else
-				@logger.debug "Creating DB file at #{@path}"
-				db.exec "create unique index username_idx on users (username)"
-				db.exec "create unique index token_idx on users (token)"
-				random_pw = random_str
-				hash = hash_password random_pw
-				db.exec "insert into users values (?, ?, ?, ?)",
-					"admin", hash, nil, 1
-				puts "Initial user created. You can log in with " \
-					"#{{"username" => "admin", "password" => random_pw}}"
-			end
-		end
-	end
+  def self.default : self
+    unless @@default
+      @@default = new
+    end
+    @@default.not_nil!
+  end
 
-	def verify_user(username, password)
-		DB.open "sqlite3://#{@path}" do |db|
-			begin
-				hash, token = db.query_one "select password, token from "\
-					"users where username = (?)", \
-					username, as: {String, String?}
-				unless verify_password hash, password
-					@logger.debug "Password does not match the hash"
-					return nil
-				end
-				@logger.debug "User #{username} verified"
-				return token if token
-				token = random_str
-				@logger.debug "Updating token for #{username}"
-				db.exec "update users set token = (?) where username = (?)",
-					token, username
-				return token
-			rescue e
-				@logger.error "Error when verifying user #{username}: #{e}"
-				return nil
-			end
-		end
-	end
+  def initialize(db_path : String? = nil, init_user = true)
+    @path = db_path || Config.current.db_path
+    dir = File.dirname @path
+    unless Dir.exists? dir
+      Logger.info "The DB directory #{dir} does not exist. " \
+                  "Attepmting to create it"
+      Dir.mkdir_p dir
+    end
+    DB.open "sqlite3://#{@path}" do |db|
+      begin
+        # We create the `ids` table first. even if the uses has an
+        #   early version installed and has the `user` table only,
+        #   we will still be able to create `ids`
+        db.exec "create table ids" \
+                "(path text, id text, is_title integer)"
+        db.exec "create unique index path_idx on ids (path)"
+        db.exec "create unique index id_idx on ids (id)"
 
-	def verify_token(token)
-		DB.open "sqlite3://#{@path}" do |db|
-			begin
-				username = db.query_one "select username from users where " \
-					"token = (?)", token, as: String
-				return username
-			rescue e
-				@logger.debug "Unable to verify token"
-				return nil
-			end
-		end
-	end
+        db.exec "create table users" \
+                "(username text, password text, token text, admin integer)"
+      rescue e
+        unless e.message.not_nil!.ends_with? "already exists"
+          Logger.fatal "Error when checking tables in DB: #{e}"
+          raise e
+        end
 
-	def verify_admin(token)
-		DB.open "sqlite3://#{@path}" do |db|
-			begin
-				return db.query_one "select admin from users where " \
-					"token = (?)", token, as: Bool
-			rescue e
-				@logger.debug "Unable to verify user as admin"
-				return false
-			end
-		end
-	end
+        # If the DB is initialized through CLI but no user is added, we need
+        #   to create the admin user when first starting the app
+        user_count = db.query_one "select count(*) from users", as: Int32
+        init_admin if init_user && user_count == 0
+      else
+        Logger.debug "Creating DB file at #{@path}"
+        db.exec "create unique index username_idx on users (username)"
+        db.exec "create unique index token_idx on users (token)"
 
-	def list_users
-		results = Array(Tuple(String, Bool)).new
-		DB.open "sqlite3://#{@path}" do |db|
-			db.query "select username, admin from users" do |rs|
-				rs.each do
-					results << {rs.read(String), rs.read(Bool)}
-				end
-			end
-		end
-		results
-	end
+        init_admin if init_user
+      end
+    end
+  end
 
-	def new_user(username, password, admin)
-		admin = (admin ? 1 : 0)
-		DB.open "sqlite3://#{@path}" do |db|
-			hash = hash_password password
-			db.exec "insert into users values (?, ?, ?, ?)",
-				username, hash, nil, admin
-		end
-	end
+  macro init_admin
+    random_pw = random_str
+    hash = hash_password random_pw
+    db.exec "insert into users values (?, ?, ?, ?)",
+      "admin", hash, nil, 1
+    Logger.log "Initial user created. You can log in with " \
+               "#{{"username" => "admin", "password" => random_pw}}"
+  end
 
-	def update_user(original_username, username, password, admin)
-		admin = (admin ? 1 : 0)
-		DB.open "sqlite3://#{@path}" do |db|
-			if password.size == 0
-				db.exec "update users set username = (?), admin = (?) "\
-					"where username = (?)",\
-					username, admin, original_username
-			else
-				hash = hash_password password
-				db.exec "update users set username = (?), admin = (?),"\
-					"password = (?) where username = (?)",\
-					username, admin, hash, original_username
-			end
-		end
-	end
+  def verify_user(username, password)
+    DB.open "sqlite3://#{@path}" do |db|
+      begin
+        hash, token = db.query_one "select password, token from " \
+                                   "users where username = (?)",
+          username, as: {String, String?}
+        unless verify_password hash, password
+          Logger.debug "Password does not match the hash"
+          return nil
+        end
+        Logger.debug "User #{username} verified"
+        return token if token
+        token = random_str
+        Logger.debug "Updating token for #{username}"
+        db.exec "update users set token = (?) where username = (?)",
+          token, username
+        return token
+      rescue e
+        Logger.error "Error when verifying user #{username}: #{e}"
+        return nil
+      end
+    end
+  end
 
-	def delete_user(username)
-		DB.open "sqlite3://#{@path}" do |db|
-			db.exec "delete from users where username = (?)", username
-		end
-	end
+  def verify_token(token)
+    username = nil
+    DB.open "sqlite3://#{@path}" do |db|
+      begin
+        username = db.query_one "select username from users where " \
+                                "token = (?)", token, as: String
+      rescue e
+        Logger.debug "Unable to verify token"
+      end
+    end
+    username
+  end
 
-	def logout(token)
-		DB.open "sqlite3://#{@path}" do |db|
-			begin
-				db.exec "update users set token = (?) where token = (?)", \
-					nil, token
-			rescue
-			end
-		end
-	end
+  def verify_admin(token)
+    is_admin = false
+    DB.open "sqlite3://#{@path}" do |db|
+      begin
+        is_admin = db.query_one "select admin from users where " \
+                                "token = (?)", token, as: Bool
+      rescue e
+        Logger.debug "Unable to verify user as admin"
+      end
+    end
+    is_admin
+  end
 
-	def get_id(path, is_title)
-		DB.open "sqlite3://#{@path}" do |db|
-			begin
-				id = db.query_one "select id from ids where path = (?)",
-					path, as: {String}
-				return id
-			rescue
-				id = random_str
-				db.exec "insert into ids values (?, ?, ?)", path, id,
-					is_title ? 1 : 0
-				return id
-			end
-		end
-	end
+  def list_users
+    results = Array(Tuple(String, Bool)).new
+    DB.open "sqlite3://#{@path}" do |db|
+      db.query "select username, admin from users" do |rs|
+        rs.each do
+          results << {rs.read(String), rs.read(Bool)}
+        end
+      end
+    end
+    results
+  end
 
-	def to_json(json : JSON::Builder)
-		json.string self
-	end
+  def new_user(username, password, admin)
+    validate_username username
+    validate_password password
+    admin = (admin ? 1 : 0)
+    DB.open "sqlite3://#{@path}" do |db|
+      hash = hash_password password
+      db.exec "insert into users values (?, ?, ?, ?)",
+        username, hash, nil, admin
+    end
+  end
+
+  def update_user(original_username, username, password, admin)
+    admin = (admin ? 1 : 0)
+    validate_username username
+    validate_password password unless password.empty?
+    DB.open "sqlite3://#{@path}" do |db|
+      if password.empty?
+        db.exec "update users set username = (?), admin = (?) " \
+                "where username = (?)",
+          username, admin, original_username
+      else
+        hash = hash_password password
+        db.exec "update users set username = (?), admin = (?)," \
+                "password = (?) where username = (?)",
+          username, admin, hash, original_username
+      end
+    end
+  end
+
+  def delete_user(username)
+    DB.open "sqlite3://#{@path}" do |db|
+      db.exec "delete from users where username = (?)", username
+    end
+  end
+
+  def logout(token)
+    DB.open "sqlite3://#{@path}" do |db|
+      begin
+        db.exec "update users set token = (?) where token = (?)", nil, token
+      rescue
+      end
+    end
+  end
+
+  def get_id(path, is_title)
+    id = random_str
+    DB.open "sqlite3://#{@path}" do |db|
+      begin
+        id = db.query_one "select id from ids where path = (?)", path,
+          as: {String}
+      rescue
+        db.exec "insert into ids values (?, ?, ?)", path, id, is_title ? 1 : 0
+      end
+    end
+    id
+  end
+
+  def to_json(json : JSON::Builder)
+    json.string self
+  end
 end

src/upload.cr

@@ -0,0 +1,60 @@
+require "./util"
+
+class Upload
+  def initialize(@dir : String)
+    unless Dir.exists? @dir
+      Logger.info "The uploads directory #{@dir} does not exist. " \
+                  "Attempting to create it"
+      Dir.mkdir_p @dir
+    end
+  end
+
+  # Writes IO to a file with random filename in the uploads directory and
+  #	  returns the full path of created file
+  # e.g., save("image", ".png", <io>)
+  #	  ==> "~/mango/uploads/image/<random string>.png"
+  def save(sub_dir : String, ext : String, io : IO)
+    full_dir = File.join @dir, sub_dir
+    filename = random_str + ext
+    file_path = File.join full_dir, filename
+
+    unless Dir.exists? full_dir
+      Logger.debug "creating directory #{full_dir}"
+      Dir.mkdir_p full_dir
+    end
+
+    File.open file_path, "w" do |f|
+      IO.copy io, f
+    end
+
+    file_path
+  end
+
+  # Converts path to a file in the uploads directory to the URL path for
+  #   accessing the file.
+  def path_to_url(path : String)
+    dir_mathed = false
+    ary = [] of String
+    # We fill it with parts until it equals to @upload_dir
+    dir_ary = [] of String
+
+    Path.new(path).each_part do |part|
+      if dir_mathed
+        ary << part
+      else
+        dir_ary << part
+        if File.same? @dir, File.join dir_ary
+          dir_mathed = true
+        end
+      end
+    end
+
+    if ary.empty?
+      Logger.warn "File #{path} is not in the upload directory #{@dir}"
+      return
+    end
+
+    ary.unshift UPLOAD_URL_PREFIX
+    File.join(ary).to_s
+  end
+end

src/util.cr

@@ -1,73 +1,156 @@
 require "big"
 
-IMGS_PER_PAGE = 5
+IMGS_PER_PAGE     = 5
+UPLOAD_URL_PREFIX = "/uploads"
+STATIC_DIRS       = ["/css", "/js", "/img", "/favicon.ico"]
+
+def requesting_static_file(env)
+  request_path_startswith env, STATIC_DIRS
+end
 
 macro layout(name)
-	render "src/views/#{{{name}}}.ecr", "src/views/layout.ecr"
+  base_url = Config.current.base_url
+  begin
+    is_admin = false
+    if token = env.session.string? "token"
+      is_admin = @context.storage.verify_admin token
+    end
+    page = {{name}}
+    render "src/views/#{{{name}}}.html.ecr", "src/views/layout.html.ecr"
+  rescue e
+    message = e.to_s
+    @context.error message
+    render "src/views/message.html.ecr", "src/views/layout.html.ecr"
+  end
 end
 
 macro send_img(env, img)
-	send_file {{env}}, {{img}}.data, {{img}}.mime
+  send_file {{env}}, {{img}}.data, {{img}}.mime
 end
 
 macro get_username(env)
-	# if the request gets here, it has gone through the auth handler, and
-	# 	we can be sure that a valid token exists, so we can use not_nil! here
-	cookie = {{env}}.request.cookies.find { |c| c.name == "token" }.not_nil!
-	(@context.storage.verify_token cookie.value).not_nil!
+  # if the request gets here, it has gone through the auth handler, and
+  #   we can be sure that a valid token exists, so we can use not_nil! here
+  token = env.session.string "token"
+  (@context.storage.verify_token token).not_nil!
 end
 
-macro send_json(env, json)
-	{{env}}.response.content_type = "application/json"
-	{{json}}
+def send_json(env, json)
+  env.response.content_type = "application/json"
+  env.response.print json
+end
+
+def send_attachment(env, path)
+  MIME.register ".cbz", "application/vnd.comicbook+zip"
+  MIME.register ".cbr", "application/vnd.comicbook-rar"
+  send_file env, path, filename: File.basename(path), disposition: "attachment"
 end
 
 def hash_to_query(hash)
-	hash.map { |k, v| "#{k}=#{v}" }.join("&")
+  hash.map { |k, v| "#{k}=#{v}" }.join("&")
 end
 
 def request_path_startswith(env, ary)
-	ary.each do |prefix|
-		if env.request.path.starts_with? prefix
-			return true
-		end
-	end
-	return false
+  ary.each do |prefix|
+    if env.request.path.starts_with? prefix
+      return true
+    end
+  end
+  false
 end
 
 def is_numeric(str)
-	/^\d+/.match(str) != nil
+  /^\d+/.match(str) != nil
 end
 
 def split_by_alphanumeric(str)
-	arr = [] of String
-	str.scan(/([^\d\n\r]*)(\d*)([^\d\n\r]*)/) do |match|
-		arr += match.captures.select{|s| s != ""}
-	end
-	arr
+  arr = [] of String
+  str.scan(/([^\d\n\r]*)(\d*)([^\d\n\r]*)/) do |match|
+    arr += match.captures.select { |s| s != "" }
+  end
+  arr
 end
 
 def compare_alphanumerically(c, d)
-	is_c_bigger = c.size <=> d.size
-	if c.size > d.size
-		d += [nil] * (c.size - d.size)
-	elsif c.size < d.size
-		c += [nil] * (d.size - c.size)
-	end
-	c.zip(d) do |a, b|
-		return -1 if a.nil?
-		return 1 if b.nil?
-		if is_numeric(a) && is_numeric(b)
-			compare = a.to_big_i <=> b.to_big_i
-			return compare if compare != 0
-		else
-			compare = a <=> b
-			return compare if compare != 0
-		end
-	end
-	is_c_bigger
+  is_c_bigger = c.size <=> d.size
+  if c.size > d.size
+    d += [nil] * (c.size - d.size)
+  elsif c.size < d.size
+    c += [nil] * (d.size - c.size)
+  end
+  c.zip(d) do |a, b|
+    return -1 if a.nil?
+    return 1 if b.nil?
+    if is_numeric(a) && is_numeric(b)
+      compare = a.to_big_i <=> b.to_big_i
+      return compare if compare != 0
+    else
+      compare = a <=> b
+      return compare if compare != 0
+    end
+  end
+  is_c_bigger
 end
 
 def compare_alphanumerically(a : String, b : String)
-	compare_alphanumerically split_by_alphanumeric(a), split_by_alphanumeric(b)
+  compare_alphanumerically split_by_alphanumeric(a), split_by_alphanumeric(b)
+end
+
+def validate_archive(path : String) : Exception?
+  file = ArchiveFile.new path
+  file.check
+  file.close
+  return
+rescue e
+  e
+end
+
+def random_str
+  UUID.random.to_s.gsub "-", ""
+end
+
+def redirect(env, path)
+  base = Config.current.base_url
+  env.redirect File.join base, path
+end
+
+def validate_username(username)
+  if username.size < 3
+    raise "Username should contain at least 3 characters"
+  end
+  if (username =~ /^[A-Za-z0-9_]+$/).nil?
+    raise "Username should contain alphanumeric characters " \
+          "and underscores only"
+  end
+end
+
+def validate_password(password)
+  if password.size < 6
+    raise "Password should contain at least 6 characters"
+  end
+  if (password =~ /^[[:ascii:]]+$/).nil?
+    raise "password should contain ASCII characters only"
+  end
+end
+
+macro render_xml(path)
+  base_url = Config.current.base_url
+  send_file env, ECR.render({{path}}).to_slice, "application/xml"
+end
+
+macro render_component(filename)
+  render "src/views/components/#{{{filename}}}.html.ecr"
+end
+
+# Works in all Unix systems. Follows https://github.com/crystal-lang/crystal/
+#   blob/master/src/crystal/system/unix/file_info.cr#L42-L48
+def ctime(file_path : String) : Time
+  res = LibC.stat(file_path, out stat)
+  raise "Unable to get ctime of file #{file_path}" if res != 0
+
+  {% if flag?(:darwin) %}
+    Time.new stat.st_ctimespec, Time::Location::UTC
+  {% else %}
+    Time.new stat.st_ctim, Time::Location::UTC
+  {% end %}
 end

src/views/admin.html.ecr

@@ -1,5 +1,5 @@
 <ul class="uk-list uk-list-large uk-list-divider">
-  <li data-url="/admin/user">User Managerment</li>
+  <li data-url="<%= base_url %>admin/user">User Managerment</li>
   <li onclick="if(!scanning){scan()}">
     <span id="scan">Scan Library Files</span>
     <span id="scan-status" class="uk-align-right">
@@ -7,12 +7,13 @@
       <span hidden></span>
     </span>
   </li>
-  <li data-url="/admin/downloads">Download Manager</li>
+  <li data-url="<%= base_url %>admin/downloads">Download Manager</li>
 </ul>
 
 <hr class="uk-divider-icon">
-<a class="uk-button uk-button-danger" href="/logout">Log Out</a>
+<p class="uk-text-meta">Version: v<%= MANGO_VERSION %></p>
+<a class="uk-button uk-button-danger" href="<%= base_url %>logout">Log Out</a>
 
 <% content_for "script" do %>
-<script src="/js/admin.js"></script>
+  <script src="<%= base_url %>js/admin.js"></script>
 <% end %>

src/views/components/card.html.ecr

@@ -0,0 +1,50 @@
+<% if item.is_a? NamedTuple(entry: Entry, percentage: Float64, grouped_count: Int32) %>
+  <% grouped_count = item[:grouped_count] %>
+  <% if grouped_count == 1 %>
+    <% item = item[:entry] %>
+  <% else %>
+    <% item = item[:entry].book %>
+  <% end %>
+<% else %>
+  <% grouped_count = 1 %>
+<% end %>
+
+<div class="item" data-mtime="<%= item.mtime.to_unix %>" data-progress="<%= progress %>" 
+  <% if item.is_a? Entry %> 
+    id="<%= item.id %>"
+  <% end %>>
+
+  <a class="acard" 
+    <% unless item.is_a? Entry %> 
+      href="<%= base_url %>book/<%= item.id %>" 
+    <% end %>>
+
+    <div class="uk-card uk-card-default" 
+      <% if item.is_a? Entry %> 
+        onclick="showModal(&quot;<%= item.encoded_path %>&quot;, '<%= item.pages %>', <%= (progress * 100).round(1) %>, &quot;<%= item.book.encoded_display_name %>&quot;, &quot;<%= item.encoded_display_name %>&quot;, '<%= item.title_id %>', '<%= item.id %>')" 
+      <% end %>>
+
+      <div class="uk-card-media-top">
+        <img data-src="<%= item.cover_url %>" data-width data-height alt="" uk-img>
+      </div>
+
+      <div class="uk-card-body">
+        <% unless progress < 0 || progress > 100 %>
+          <div class="uk-card-badge uk-label"><%= (progress * 100).round(1) %>%</div>
+        <% end %>
+
+        <h3 class="uk-card-title break-word" data-title="<%= item.display_name.gsub("\"", "&quot;") %>"><%= item.display_name %></h3>
+        <% if item.is_a? Entry %>
+          <p><%= item.pages %> pages</p>
+        <% end %>
+        <% if item.is_a? Title %>
+          <% if grouped_count == 1 %>
+            <p><%= item.size %> entries</p>
+          <% else %>
+            <p><%= grouped_count %> new entries</p>
+          <% end %>
+        <% end %>
+      </div>
+    </div>
+  </a>
+</div>

src/views/components/entry-modal.html.ecr

@@ -0,0 +1,35 @@
+<div id="modal" class="uk-flex-top" uk-modal>
+  <div class="uk-modal-dialog uk-margin-auto-vertical">
+    <button class="uk-modal-close-default" type="button" uk-close></button>
+    <div class="uk-modal-header">
+      <div>
+        <% if page == "home" %>
+          <h4 class="uk-margin-remove-bottom"><a id="modal-title-link"></a></h4>
+        <% end %>
+        <h3 class="uk-modal-title break-word uk-margin-remove-top" id="modal-entry-title"><span></span>
+          &nbsp;
+          <% unless page == "home" %>
+            <% if is_admin %>
+              <a id="modal-edit-btn" class="uk-icon-button" uk-icon="icon:pencil"></a>
+            <% end %>
+          <% end %>
+          <a id="modal-download-btn" class="uk-icon-button" uk-icon="icon:download"></a>
+        </h3>
+      </div>
+      <p class="uk-text-meta uk-margin-remove-bottom break-word" id="path-text"></p>
+      <p class="uk-text-meta uk-margin-remove-top" id="pages-text"></p>
+    </div>
+    <div class="uk-modal-body">
+      <p>Read</p>
+      <p uk-margin>
+      <a id="beginning-btn" class="uk-button uk-button-default">From beginning</a>
+      <a id="continue-btn" class="uk-button uk-button-primary"></a>
+      </p>
+      <p>Progress</p>
+      <p uk-margin>
+      <button id="read-btn" class="uk-button uk-button-default">Mark as read (100%)</button>
+      <button id="unread-btn" class="uk-button uk-button-default">Mark as unread (0%)</button>
+      </p>
+    </div>
+  </div>
+</div>

src/views/components/head.html.ecr

@@ -0,0 +1,14 @@
+<head>
+  <meta charset="utf-8">
+  <meta name="X-UA-Compatible" content="IE=edge">
+  <title>Mango</title>
+  <meta name="description" content="Mango - Manga Server and Web Reader">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="stylesheet" href="<%= base_url %>css/uikit.css" />
+  <link rel="stylesheet" href="<%= base_url %>css/mango.css" />
+  <link rel="icon" href="<%= base_url %>favicon.ico">
+  <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="<%= base_url %>js/theme.js"></script>
+</head>

src/views/components/sort-form.html.ecr

@@ -0,0 +1,8 @@
+<div class="uk-form-horizontal">
+  <select class="uk-select" id="sort-select">
+    <% hash.each do |k, v| %>
+      <option id="<%= k %>-up">▲ <%= v %></option>
+      <option id="<%= k %>-down">▼ <%= v %></option>
+    <% end %>
+  </select>
+</div>

src/views/download-manager.ecr

@@ -1,32 +0,0 @@
-<div class="uk-margin">
-	<div id="actions" class="uk-margin">
-		<button class="uk-button uk-button-default" onclick="remove()">Delete Completed Tasks</button>
-		<button class="uk-button uk-button-default" onclick="refresh()">Retry Failed Tasks</button>
-		<button class="uk-button uk-button-default" onclick="load()">Refresh Queue</button>
-		<button class="uk-button uk-button-default" onclick="toggle()" id="pause-resume-btn" hidden></button>
-	</div>
-	<div id="config" class="uk-margin">
-		<label><input id="auto-refresh" class="uk-checkbox" type="checkbox" checked> Auto Refresh</label>
-	</div>
-</div>
-<table class="uk-table uk-table-striped uk-overflow-auto">
-    <thead>
-        <tr>
-			<th>Chapter</th>
-			<th>Manga</th>
-			<th>Progress</th>
-			<th>Time</th>
-			<th>Status</th>
-			<th>Actions</th>
-        </tr>
-    </thead>
-</table>
-
-<% content_for "script" do %>
-<script>
-	var baseURL = "<%= base_url %>".replace(/\/$/, "");
-</script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment.min.js"></script>
-<script src="/js/alert.js"></script>
-<script src="/js/download-manager.js"></script>
-<% end %>

src/views/download-manager.html.ecr

@@ -0,0 +1,32 @@
+<div class="uk-margin">
+  <div id="actions" class="uk-margin">
+    <button class="uk-button uk-button-default" onclick="remove()">Delete Completed Tasks</button>
+    <button class="uk-button uk-button-default" onclick="refresh()">Retry Failed Tasks</button>
+    <button class="uk-button uk-button-default" onclick="load()">Refresh Queue</button>
+    <button class="uk-button uk-button-default" onclick="toggle()" id="pause-resume-btn" hidden></button>
+  </div>
+  <div id="config" class="uk-margin">
+    <label><input id="auto-refresh" class="uk-checkbox" type="checkbox" checked> Auto Refresh</label>
+  </div>
+</div>
+<table class="uk-table uk-table-striped uk-overflow-auto">
+  <thead>
+    <tr>
+      <th>Chapter</th>
+      <th>Manga</th>
+      <th>Progress</th>
+      <th>Time</th>
+      <th>Status</th>
+      <th>Actions</th>
+    </tr>
+  </thead>
+</table>
+
+<% content_for "script" do %>
+  <script>
+    var baseURL = "<%= mangadex_base_url %>".replace(/\/$/, "");
+  </script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment.min.js"></script>
+  <script src="<%= base_url %>js/alert.js"></script>
+  <script src="<%= base_url %>js/download-manager.js"></script>
+<% end %>

src/views/download.ecr

@@ -1,83 +0,0 @@
-<h2 class=uk-title>Download from MangaDex</h2>
-<div class="uk-grid-small" uk-grid>
-	<div class="uk-width-3-4">
-		<input id="search-input" class="uk-input" type="text" placeholder="MangaDex manga ID or URL">
-	</div>
-	<div class="uk-width-1-4">
-		<div id="spinner" uk-spinner class="uk-align-center" hidden></div>
-		<button id="search-btn" class="uk-button uk-button-default" onclick="search()">Search</button>
-	</div>
-</div>
-<div class"uk-grid-small" uk-grid hidden id="manga-details">
-	<div class="uk-width-1-4@s">
-		<img id="cover">
-	</div>
-	<div class="uk-width-1-4@s">
-		<p id="title"></p>
-		<p id="artist"></p>
-		<p id="author"></p>
-	</div>
-	<div id="filter-form" class="uk-form-stacked uk-width-1-2@s" hidden>
-		<p class="uk-text-lead uk-margin-remove-bottom">Filter Chapters</p>
-		<p class="uk-text-meta uk-margin-remove-top" id="count-text"></p>
-			<div class="uk-margin">
-				<label class="uk-form-label" for="lang-select">Language</label>
-				<div class="uk-form-controls">
-					<select class="uk-select filter-field" id="lang-select">
-					</select>
-				</div>
-			</div>
-			<div class="uk-margin">
-				<label class="uk-form-label" for="group-select">Group</label>
-				<div class="uk-form-controls">
-					<select class="uk-select filter-field" id="group-select">
-					</select>
-				</div>
-			</div>
-			<div class="uk-margin">
-				<label class="uk-form-label" for="volume-range">Volume</label>
-				<div class="uk-form-controls">
-					<input class="uk-input filter-field" type="text" id="volume-range" placeholder="e.g., 127, 10-14, >30, <=212, or leave it empty.">
-				</div>
-			</div>
-			<div class="uk-margin">
-				<label class="uk-form-label" for="chapter-range">Chapter</label>
-				<div class="uk-form-controls">
-					<input class="uk-input filter-field" type="text" id="chapter-range" placeholder="e.g., 127, 10-14, >30, <=212, or leave it empty.">
-				</div>
-			</div>
-	</div>
-</div>
-<div id="selection-controls" class="uk-margin" hidden>
-	<div class="uk-margin">
-		<button class="uk-button uk-button-default" onclick="selectAll()">Select All</button>
-		<button class="uk-button uk-button-default" onclick="unselect()">Clear Selections</button>
-		<button class="uk-button uk-button-primary" id="download-btn" onclick="download()">Download Selected</button>
-		<div id="download-spinner" uk-spinner class="uk-margin-left" hidden></div>
-	</div>
-	<p class="uk-text-meta">Click on a table row to select the chapter. Drag your mouse over multiple rows to select them all. Hold Ctrl to make multiple non-adjacent selections.</p>
-</div>
-<p id="filter-notification" hidden></p>
-<table class="uk-table uk-table-striped uk-overflow-auto" hidden>
-    <thead>
-        <tr>
-            <th>ID</th>
-            <th>Title</th>
-            <th>Language</th>
-			<th>Group</th>
-			<th>Volume</th>
-			<th>Chapter</th>
-			<th>Timestamp</th>
-        </tr>
-    </thead>
-</table>
-
-<% content_for "script" do %>
-<script>
-	var baseURL = "<%= base_url %>".replace(/\/$/, "");
-</script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
-<script src="/js/alert.js"></script>
-<script src="/js/download.js"></script>
-<% end %>

src/views/download.html.ecr

@@ -0,0 +1,83 @@
+<h2 class=uk-title>Download from MangaDex</h2>
+<div class="uk-grid-small" uk-grid>
+  <div class="uk-width-3-4">
+    <input id="search-input" class="uk-input" type="text" placeholder="MangaDex manga ID or URL">
+  </div>
+  <div class="uk-width-1-4">
+    <div id="spinner" uk-spinner class="uk-align-center" hidden></div>
+    <button id="search-btn" class="uk-button uk-button-default" onclick="search()">Search</button>
+  </div>
+</div>
+<div class"uk-grid-small" uk-grid hidden id="manga-details">
+  <div class="uk-width-1-4@s">
+    <img id="cover">
+  </div>
+  <div class="uk-width-1-4@s">
+    <p id="title"></p>
+    <p id="artist"></p>
+    <p id="author"></p>
+  </div>
+  <div id="filter-form" class="uk-form-stacked uk-width-1-2@s" hidden>
+    <p class="uk-text-lead uk-margin-remove-bottom">Filter Chapters</p>
+    <p class="uk-text-meta uk-margin-remove-top" id="count-text"></p>
+    <div class="uk-margin">
+      <label class="uk-form-label" for="lang-select">Language</label>
+      <div class="uk-form-controls">
+        <select class="uk-select filter-field" id="lang-select">
+        </select>
+      </div>
+    </div>
+    <div class="uk-margin">
+      <label class="uk-form-label" for="group-select">Group</label>
+      <div class="uk-form-controls">
+        <select class="uk-select filter-field" id="group-select">
+        </select>
+      </div>
+    </div>
+    <div class="uk-margin">
+      <label class="uk-form-label" for="volume-range">Volume</label>
+      <div class="uk-form-controls">
+        <input class="uk-input filter-field" type="text" id="volume-range" placeholder="e.g., 127, 10-14, >30, <=212, or leave it empty.">
+      </div>
+    </div>
+    <div class="uk-margin">
+      <label class="uk-form-label" for="chapter-range">Chapter</label>
+      <div class="uk-form-controls">
+        <input class="uk-input filter-field" type="text" id="chapter-range" placeholder="e.g., 127, 10-14, >30, <=212, or leave it empty.">
+      </div>
+    </div>
+  </div>
+</div>
+<div id="selection-controls" class="uk-margin" hidden>
+  <div class="uk-margin">
+    <button class="uk-button uk-button-default" onclick="selectAll()">Select All</button>
+    <button class="uk-button uk-button-default" onclick="unselect()">Clear Selections</button>
+    <button class="uk-button uk-button-primary" id="download-btn" onclick="download()">Download Selected</button>
+    <div id="download-spinner" uk-spinner class="uk-margin-left" hidden></div>
+  </div>
+  <p class="uk-text-meta">Click on a table row to select the chapter. Drag your mouse over multiple rows to select them all. Hold Ctrl to make multiple non-adjacent selections.</p>
+</div>
+<p id="filter-notification" hidden></p>
+<table class="uk-table uk-table-striped uk-overflow-auto" hidden>
+  <thead>
+    <tr>
+      <th>ID</th>
+      <th>Title</th>
+      <th>Language</th>
+      <th>Group</th>
+      <th>Volume</th>
+      <th>Chapter</th>
+      <th>Timestamp</th>
+    </tr>
+  </thead>
+</table>
+
+<% content_for "script" do %>
+  <script>
+    var baseURL = "<%= mangadex_base_url %>".replace(/\/$/, "");
+  </script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment.min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
+  <script src="<%= base_url %>js/alert.js"></script>
+  <script src="<%= base_url %>js/download.js"></script>
+<% end %>

src/views/home.html.ecr

@@ -0,0 +1,73 @@
+<%- if new_user && empty_library -%>
+
+  <div class="uk-container uk-text-center">
+    <i class="fas fa-plus" style="font-size: 80px;"></i>
+    <h2>Add your first manga</h2>
+    <p style="margin-bottom: 40px;">We can't find any files yet. Add some to your library and they'll appear here.</p>
+    <dl class="uk-description-list">
+      <dt style="font-weight: 500;">Current library path</dt>
+      <dd><code><%= Config.current.library_path %></code></dd>
+      <dt style="font-weight: 500;">Want to change your library path?</dt>
+      <dd>Update <code>config.yml</code> located at: <code><%= Config.current.path %></code></dd>
+      <dt style="font-weight: 500;">Can't see your files yet?</dt>
+      <dd>
+      You must wait <%= Config.current.scan_interval %> minutes for the library scan to complete
+      <% if is_admin %>
+        , or manually re-scan from <a href="<%= base_url %>admin">Admin</a>
+      <% end %>.
+      </dd>
+    </dl>
+  </div>
+
+<%- elsif new_user && empty_library == false -%>
+
+  <div class="uk-container uk-text-center">
+    <i class="fas fa-book-open" style="font-size: 80px;"></i>
+    <h2>Read your first manga</h2>
+    <p>Once you start reading, Mango will remember where you left off
+    and show your entries here.</p>
+    <a href="<%= base_url %>library" class="uk-button uk-button-default">View library</a>
+  </div>
+
+<%- elsif new_user == false && empty_library == false -%>
+
+  <%- if continue_reading.empty? && recently_added.empty? -%>
+    <div class="uk-container uk-text-center">
+      <img src="<%= base_url %>img/banner.png" style="max-width: 400px; padding: 0 20px;">
+      <p>A self-hosted manga server and reader</p>
+      <a href="<%= base_url %>library" class="uk-button uk-button-default">View library</a>
+    </div>
+  <%- end -%>
+
+  <%- 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>
+      <%- continue_reading.each do |cr| -%>
+        <% item = cr[:entry] %>
+        <% progress = cr[:percentage] %>
+        <%= 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>
+      <%- recently_added.each do |ra| -%>
+        <% item = ra %>
+        <% progress = ra[:percentage] %>
+        <%= render_component "card" %>
+      <%- end -%>
+    </div>
+  <%- end -%>
+
+  <%= render_component "entry-modal" %>
+
+<%- end -%>
+
+<% content_for "script" do %>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery.dotdotdot/4.0.11/dotdotdot.js"></script>
+  <script src="<%= base_url %>js/dots.js"></script>
+  <script src="<%= base_url %>js/alert.js"></script>
+  <script src="<%= base_url %>js/title.js"></script>
+<% end %>

src/views/index.ecr

@@ -1,53 +0,0 @@
-<h2 class=uk-title>Library</h2>
-<p class="uk-text-meta"><%= titles.size %> titles found</p>
-<div class="uk-grid-small" uk-grid>
-	<div class="uk-margin-bottom uk-width-3-4@s">
-		<form class="uk-search uk-search-default">
-			<span uk-search-icon></span>
-			<input class="uk-search-input" type="search" placeholder="Search">
-		</form>
-	</div>
-	<div class="uk-margin-bottom uk-width-1-4@s">
-		<div class="uk-form-horizontal">
-			<select class="uk-select" id="sort-select">
-				<option id="name-up">▲ Name</option>
-				<option id="name-down">▼ Name</option>
-				<option id="date-up">▲ Date Modified</option>
-				<option id="date-down">▼ Date Modified</option>
-				<option id="progress-up">▲ Progress</option>
-				<option id="progress-down">▼ Progress</option>
-			</select>
-		</div>
-	</div>
-</div>
-<div id="item-container" class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
-  <%- titles.each_with_index do |t, i| -%>
-  <div class="item" data-mtime="<%= t.mtime.to_unix %>" data-progress="<%= percentage[i] %>">
-      <a class="acard" href="/book/<%= t.id %>">
-        <div class="uk-card uk-card-default">
-            <div class="uk-card-media-top">
-			<%- if t.entries.size > 0 -%>
-              <img data-src="<%= t.entries[0].cover_url %>" data-width data-height alt="" uk-img>
-			<%- else -%>
-              <img data-src="/img/icon.png" data-width data-height alt="" uk-img>
-			<%- end -%>
-            </div>
-            <div class="uk-card-body">
-			<%- if t.entries.size > 0 -%>
-              <div class="uk-card-badge uk-label"><%= (percentage[i] * 100).round(1) %>%</div>
-			<%- end -%>
-			<h3 class="uk-card-title break-word" data-title="<%= t.title.gsub("\"", "&quot;") %>"><%= t.title %></h3>
-              <p><%= t.size %> entries</p>
-            </div>
-        </div>
-      </a>
-    </div>
-  <%- end -%>
-</div>
-
-<% content_for "script" do %>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery.dotdotdot/4.0.11/dotdotdot.js"></script>
-<script src="/js/dots.js"></script>
-<script src="/js/search.js"></script>
-<script src="/js/sort-items.js"></script>
-<% end %>

src/views/layout.html.ecr

@@ -1,18 +1,7 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="X-UA-Compatible" content="IE=edge">
-    <title>Mango</title>
-    <meta name="description" content="Mango Manga Server">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/css/uikit.min.css" />
-    <link rel="stylesheet" href="/css/mango.css" />
-	<script defer src="/js/fontawesome.min.js"></script>
-	<script defer src="/js/solid.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
-	<script src="/js/theme.js"></script>
-  </head>
+
+  <%= render_component "head" %>
 
   <body>
     <div class="uk-offcanvas-content">
@@ -20,12 +9,15 @@
         <div id="mobile-nav" uk-offcanvas="overlay: true">
           <div class="uk-offcanvas-bar uk-flex uk-flex-column">
             <ul class="uk-nav uk-nav-primary uk-nav-center uk-margin-auto-vertical">
-              <li><a href="/">Home</a></li>
-              <li><a href="/admin">Admin</a></li>
-			  <li><a href="/download">Download</a></li>
+              <li><a href="<%= base_url %>">Home</a></li>
+              <li><a href="<%= base_url %>library">Library</a></li>
+              <% if is_admin %>
+                <li><a href="<%= base_url %>admin">Admin</a></li>
+                <li><a href="<%= base_url %>download">Download</a></li>
+              <% end %>
               <hr uk-divider>
-			  <li><a onclick="toggleTheme()"><i class="fas fa-adjust"></i></a></li>
-              <li><a href="/logout">Logout</a></li>
+              <li><a onclick="toggleTheme()"><i class="fas fa-adjust"></i></a></li>
+              <li><a href="<%= base_url %>logout">Logout</a></li>
             </ul>
           </div>
         </div>
@@ -37,17 +29,20 @@
           <div class="uk-navbar-toggle" uk-navbar-toggle-icon="uk-navbar-toggle-icon" uk-toggle="target: #mobile-nav"></div>
         </div>
         <div class="uk-navbar-left uk-visible@s">
-          <a class="uk-navbar-item uk-logo" href="/"><img src="/img/icon.png"></a>
+          <a class="uk-navbar-item uk-logo" href="<%= base_url %>"><img src="<%= base_url %>img/icon.png"></a>
           <ul class="uk-navbar-nav">
-            <li><a href="/">Home</a></li>
-            <li><a href="/admin">Admin</a></li>
-            <li><a href="/download">Download</a></li>
+            <li><a href="<%= base_url %>">Home</a></li>
+            <li><a href="<%= base_url %>library">Library</a></li>
+            <% if is_admin %>
+              <li><a href="<%= base_url %>admin">Admin</a></li>
+              <li><a href="<%= base_url %>download">Download</a></li>
+            <% end %>
           </ul>
         </div>
         <div class="uk-navbar-right uk-visible@s">
           <ul class="uk-navbar-nav">
-			  <li><a onclick="toggleTheme()"><i class="fas fa-adjust"></i></a></li>
-            <li><a href="/logout">Logout</a></li>
+            <li><a onclick="toggleTheme()"><i class="fas fa-adjust"></i></a></li>
+            <li><a href="<%= base_url %>logout">Logout</a></li>
           </ul>
         </div>
       </div>
@@ -56,16 +51,18 @@
     </div>
     <div class="uk-section uk-section-small">
       <div class="uk-container uk-container-small">
-		  <div id="alert"></div>
+        <div id="alert"></div>
         <%= content %>
       </div>
     </div>
-	<script>
-		setTheme(getTheme());
-	</script>
+    <script>
+      setTheme(getTheme());
+      const base_url = "<%= base_url %>";
+    </script>
     <script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit-icons.min.js"></script>
 
     <%= yield_content "script" %>
   </body>
+
 </html>

src/views/library.html.ecr

@@ -0,0 +1,31 @@
+<h2 class=uk-title>Library</h2>
+<p class="uk-text-meta"><%= titles.size %> titles found</p>
+<div class="uk-grid-small" uk-grid>
+  <div class="uk-margin-bottom uk-width-3-4@s">
+    <form class="uk-search uk-search-default">
+      <span uk-search-icon></span>
+      <input class="uk-search-input" type="search" placeholder="Search">
+    </form>
+  </div>
+  <div class="uk-margin-bottom uk-width-1-4@s">
+    <% hash = {
+      "name" => "Name",
+      "date" => "Date Modified",
+      "progress" => "Progress"
+    } %>
+    <%= render_component "sort-form" %>
+  </div>
+</div>
+<div id="item-container" 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" %>
+  <% end %>
+</div>
+
+<% content_for "script" do %>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery.dotdotdot/4.0.11/dotdotdot.js"></script>
+  <script src="<%= base_url %>js/dots.js"></script>
+  <script src="<%= base_url %>js/search.js"></script>
+  <script src="<%= base_url %>js/sort-items.js"></script>
+<% end %>

src/views/login.ecr

@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <meta name="X-UA-Compatible" content="IE=edge">
-    <title>Mango</title>
-    <meta name="description" content="Mango Manga Server">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/css/uikit.min.css" />
-</head>
-<body>
-	<script src="/js/theme.js"></script>
-    <div class="uk-section uk-flex uk-flex-middle uk-animation-fade" uk-height-viewport="">
-        <div class="uk-width-1-1">
-            <div class="uk-container">
-                <div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid="">
-                    <div class="uk-width-1-1@m">
-                        <div class="uk-margin uk-width-large uk-margin-auto uk-card uk-card-default uk-card-body uk-box-shadow-large">
-                            <h3 class="uk-card-title uk-text-center">Log In</h3>
-                            <form action="/login" method="post">
-                                <div class="uk-margin">
-                                    <div class="uk-inline uk-width-1-1"><span class="uk-form-icon" uk-icon="icon:user"></span><input class="uk-input uk-form-large" type="text" name="username"></div>
-                                </div>
-                                <div class="uk-margin">
-                                    <div class="uk-inline uk-width-1-1"><span class="uk-form-icon" uk-icon="icon:lock"></span><input class="uk-input uk-form-large" type="password" name="password"></div>
-                                </div>
-                                <div class="uk-margin"><button class="uk-button uk-button-primary uk-button-large uk-width-1-1">Login</button></div>
-                            </form>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit-icons.min.js"></script>
-</body>
-</html>

src/views/login.html.ecr

@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+
+  <%= render_component "head" %>
+
+  <body>
+    <div class="uk-section uk-flex uk-flex-middle uk-animation-fade" uk-height-viewport="">
+      <div class="uk-width-1-1">
+        <div class="uk-container">
+          <div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid="">
+            <div class="uk-width-1-1@m">
+              <div class="uk-margin uk-width-large uk-margin-auto uk-card uk-card-default uk-card-body uk-box-shadow-large">
+                <h3 class="uk-card-title uk-text-center">Log In</h3>
+                <form action="<%= base_url %>login" method="post">
+                  <div class="uk-margin">
+                    <div class="uk-inline uk-width-1-1"><span class="uk-form-icon" uk-icon="icon:user"></span><input class="uk-input uk-form-large" type="text" name="username"></div>
+                  </div>
+                  <div class="uk-margin">
+                    <div class="uk-inline uk-width-1-1"><span class="uk-form-icon" uk-icon="icon:lock"></span><input class="uk-input uk-form-large" type="password" name="password"></div>
+                  </div>
+                  <div class="uk-margin"><button class="uk-button uk-button-primary uk-button-large uk-width-1-1">Login</button></div>
+                </form>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <script>
+      setTheme(getTheme());
+    </script>
+    <script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit-icons.min.js"></script>
+  </body>
+
+</html>

src/views/opds/index.xml.ecr

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+  <id>urn:mango:index</id>
+
+  <link rel="self" href="<%= base_url %>opds/" type="application/atom+xml;profile=opds-catalog;kind=navigation" />
+  <link rel="start" href="<%= base_url %>opds/" type="application/atom+xml;profile=opds-catalog;kind=navigation" />
+
+  <title>Library</title>
+
+  <author>
+    <name>Mango</name>
+    <uri>https://github.com/hkalexling/Mango</uri>
+  </author>
+
+  <% titles.each do |t| %>
+    <entry>
+      <title><%= t.display_name %></title>
+      <id>urn:mango:<%= t.id %></id>
+      <link type="application/atom+xml;profile=opds-catalog;kind=navigation" rel="subsection" href="<%= base_url %>opds/book/<%= t.id %>" />
+    </entry>
+  <% end %>
+</feed>

src/views/opds/title.xml.ecr

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+  <id>urn:mango:<%= title.id %></id>
+
+  <link rel="self" href="<%= base_url %>opds/book/<%= title.id %>" type="application/atom+xml;profile=opds-catalog;kind=navigation" />
+  <link rel="start" href="<%= base_url %>opds/" type="application/atom+xml;profile=opds-catalog;kind=navigation" />
+
+  <title><%= title.display_name %></title>
+
+  <author>
+    <name>Mango</name>
+    <uri>https://github.com/hkalexling/Mango</uri>
+  </author>
+
+  <% title.titles.each do |t| %>
+    <entry>
+      <title><%= t.display_name %></title>
+      <id>urn:mango:<%= t.id %></id>
+      <link type="application/atom+xml;profile=opds-catalog;kind=navigation" rel="subsection" href="<%= base_url %>opds/book/<%= t.id %>" />
+    </entry>
+  <% end %>
+
+  <% title.entries.each do |e| %>
+    <entry>
+      <title><%= e.display_name %></title>
+      <id>urn:mango:<%= e.id %></id>
+
+      <link rel="http://opds-spec.org/image" href="<%= e.cover_url %>" />
+      <link rel="http://opds-spec.org/image/thumbnail" href="<%= e.cover_url %>" />
+
+      <link rel="http://opds-spec.org/acquisition" href="<%= base_url %>opds/download/<%= e.title_id %>/<%= e.id %>" title="Read" type="<%= MIME.from_filename e.zip_path %>" />
+
+      <link type="text/html" rel="alternate" title="Read in Mango" href="<%= base_url %>reader/<%= e.title_id %>/<%= e.id %>" />
+      <link type="text/html" rel="alternate" title="Open in Mango" href="<%= base_url %>book/<%= e.title_id %>" />
+    </entry>
+  <% end %>
+
+</feed>

src/views/reader.html.ecr

@@ -1,30 +1,22 @@
 <!DOCTYPE html>
 <html class="reader-bg">
-  <head>
-    <meta charset="utf-8">
-    <meta name="X-UA-Compatible" content="IE=edge">
-    <title>Mango</title>
-    <meta name="description" content="Mango Manga Server">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/css/uikit.min.css" />
-    <link rel="stylesheet" href="/css/mango.css" />
-  </head>
+
+  <%= render_component "head" %>
 
   <body>
-	  <script src="/js/theme.js"></script>
     <div class="uk-section uk-section-default uk-section-small reader-bg">
       <div class="uk-container uk-container-small">
-          <%- urls.each_with_index do |url, i| -%>
+        <%- urls.each_with_index do |url, i| -%>
           <img class="uk-align-center" data-src="<%= url %>" data-width data-height uk-img id="<%= reader_urls[i] %>" onclick="showControl(<%= pages.to_a[i] %>);">
-          <%- end -%>
-          <%- if next_url -%>
+        <%- end -%>
+        <%- if next_url -%>
           <a class="next-url" href="<%= next_url %>"></a>
-          <%- end -%>
+        <%- end -%>
       </div>
       <%- if next_entry_url -%>
-      <button id="next-btn" class="uk-align-center uk-button uk-button-primary" hidden onclick="redirect('<%= next_entry_url %>')">Next Entry</button>
+        <button id="next-btn" class="uk-align-center uk-button uk-button-primary" hidden onclick="redirect('<%= next_entry_url %>')">Next Entry</button>
       <%- else -%>
-      <button id="next-btn" class="uk-align-center uk-button uk-button-primary" hidden onclick="redirect('<%= exit_url %>')">Exit Reader</button>
+        <button id="next-btn" class="uk-align-center uk-button uk-button-primary" hidden onclick="redirect('<%= exit_url %>')">Exit Reader</button>
       <%- end -%>
     </div>
 
@@ -34,18 +26,19 @@
       <div class="uk-modal-dialog uk-margin-auto-vertical">
         <button class="uk-modal-close-default" type="button" uk-close></button>
         <div class="uk-modal-header">
-          <h3 class="uk-modal-title">Options</h3>
+          <h3 class="uk-modal-title break-word"><%= entry.display_name %></h3>
+          <p class="uk-text-meta uk-margin-remove-bottom break-word"><%= entry.zip_path %></p>
         </div>
         <div class="uk-modal-body">
-			<div class="uk-margin">
-				<p id="progress-label"></p>
-			</div>
+          <div class="uk-margin">
+            <p id="progress-label"></p>
+          </div>
           <div class="uk-margin">
             <label class="uk-form-label" for="form-stacked-select">Jump to page</label>
             <div class="uk-form-controls">
               <select id="page-select" class="uk-select">
                 <%- (1..entry.pages).each do |p| -%>
-                <option value="<%= p %>"><%= p %></option>
+                  <option value="<%= p %>"><%= p %></option>
                 <%- end -%>
               </select>
             </div>
@@ -56,10 +49,14 @@
         </div>
       </div>
     </div>
+    <script>
+      const base_url = "<%= base_url %>"
+    </script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit-icons.min.js"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/ScrollMagic/2.0.7/ScrollMagic.min.js"></script>
-    <script src="/js/reader.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/ScrollMagic/2.0.7/ScrollMagic.min.js"></script>
+    <script src="<%= base_url %>js/reader.js"></script>
   </body>
+
 </html>

src/views/title.ecr

@@ -1,100 +0,0 @@
-<h2 class=uk-title><%= title.title %></h2>
-<ul class="uk-breadcrumb">
-	<li><a href="/">Library</a></li>
-	<%- title.parents.each do |t| -%>
-	<li><a href="/book/<%= t.id %>"><%= t.title %></a></li>
-	<%- end -%>
-	<li class="uk-disabled"><a><%= title.title %></a></li>
-</ul>
-<p class="uk-text-meta"><%= title.size %> entries found</p>
-<div class="uk-grid-small" uk-grid>
-	<div class="uk-margin-bottom uk-width-3-4@s">
-		<form class="uk-search uk-search-default">
-			<span uk-search-icon></span>
-			<input class="uk-search-input" type="search" placeholder="Search">
-		</form>
-	</div>
-	<div class="uk-margin-bottom uk-width-1-4@s">
-		<div class="uk-form-horizontal">
-			<select class="uk-select" id="sort-select">
-				<option id="auto-up">▲ Auto</option>
-				<option id="auto-down">▼ Auto</option>
-				<option id="name-up">▲ Name</option>
-				<option id="name-down">▼ Name</option>
-				<option id="date-up">▲ Date Modified</option>
-				<option id="date-down">▼ Date Modified</option>
-				<option id="progress-up">▲ Progress</option>
-				<option id="progress-down">▼ Progress</option>
-			</select>
-		</div>
-	</div>
-</div>
-<div id="item-container" class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
-	<%- title.titles.each_with_index do |t, i| -%>
-	<div class="item" data-mtime="<%= t.mtime.to_unix %>" data-progress="0.0">
-      <a class="acard" href="/book/<%= t.id %>">
-        <div class="uk-card uk-card-default">
-            <div class="uk-card-media-top">
-			<%- if t.entries.size > 0 -%>
-              <img data-src="<%= t.entries[0].cover_url %>" data-width data-height alt="" uk-img>
-			<%- else -%>
-              <img data-src="/img/icon.png" data-width data-height alt="" uk-img>
-			<%- end -%>
-            </div>
-            <div class="uk-card-body">
-			<h3 class="uk-card-title break-word" data-title="<%= t.title.gsub("\"", "&quot;") %>"><%= t.title %></h3>
-              <p><%= t.size %> entries</p>
-            </div>
-        </div>
-      </a>
-	</div>
-	<%- end -%>
-  <%- title.entries.each_with_index do |e, i| -%>
-  <div class="item" data-mtime="<%= e.mtime.to_unix %>" data-progress="<%= percentage[i] %>">
-      <a class="acard">
-		  <div class="uk-card uk-card-default" onclick="showModal(&quot;<%= e.encoded_path %>&quot;, '<%= e.pages %>', <%= (percentage[i] * 100).round(1) %>, &quot;<%= title.encoded_title %>&quot;, &quot;<%= e.encoded_title %>&quot;, '<%= e.title_id %>', '<%= e.id %>')">
-          <div class="uk-card-media-top">
-            <img data-src="<%= e.cover_url %>" alt="" data-width data-height uk-img>
-          </div>
-          <div class="uk-card-body">
-            <div class="uk-card-badge uk-label"><%= (percentage[i] * 100).round(1) %>%</div>
-			<h3 class="uk-card-title break-word" data-title="<%= e.title.gsub("\"", "&quot;") %>"><%= e.title %></h3>
-              <p><%= e.pages %> pages</p>
-          </div>
-      </div>
-      </a>
-    </div>
-  <%- end -%>
-</div>
-
-<div id="modal" class="uk-flex-top" uk-modal>
-  <div class="uk-modal-dialog uk-margin-auto-vertical">
-    <button class="uk-modal-close-default" type="button" uk-close></button>
-    <div class="uk-modal-header">
-      <h3 class="uk-modal-title break-word" id="modal-title"></h3>
-      <p class="uk-text-meta uk-margin-remove-bottom break-word" id="path-text"></p>
-      <p class="uk-text-meta uk-margin-remove-top" id="pages-text"></p>
-    </div>
-    <div class="uk-modal-body">
-      <p>Read</p>
-      <p uk-margin>
-        <a id="beginning-btn" class="uk-button uk-button-default">From beginning</a>
-        <a id="continue-btn" class="uk-button uk-button-primary"></a>
-      </p>
-      <p>Progress</p>
-      <p uk-margin>
-        <button id="read-btn" class="uk-button uk-button-default">Mark as read (100%)</button>
-        <button id="unread-btn" class="uk-button uk-button-default">Mark as unread (0%)</button>
-      </p>
-    </div>
-  </div>
-</div>
-
-<% content_for "script" do %>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery.dotdotdot/4.0.11/dotdotdot.js"></script>
-<script src="/js/dots.js"></script>
-<script src="/js/alert.js"></script>
-<script src="/js/title.js"></script>
-<script src="/js/search.js"></script>
-<script src="/js/sort-items.js"></script>
-<% end %>

src/views/title.html.ecr

@@ -0,0 +1,103 @@
+<div>
+  <h2 class=uk-title><span><%= title.display_name %></span>
+    &nbsp;
+    <% if is_admin %>
+      <a onclick="edit()" class="uk-icon-button" uk-icon="icon:pencil"></a>
+    <% end %>
+  </h2>
+</div>
+<ul class="uk-breadcrumb">
+  <li><a href="<%= base_url %>library">Library</a></li>
+  <%- title.parents.each do |t| -%>
+    <li><a href="<%= base_url %>book/<%= t.id %>"><%= t.display_name %></a></li>
+  <%- end -%>
+  <li class="uk-disabled"><a><%= title.display_name %></a></li>
+</ul>
+<p class="uk-text-meta"><%= title.size %> entries found</p>
+<div class="uk-grid-small" uk-grid>
+  <div class="uk-margin-bottom uk-width-3-4@s">
+    <form class="uk-search uk-search-default">
+      <span uk-search-icon></span>
+      <input class="uk-search-input" type="search" placeholder="Search">
+    </form>
+  </div>
+  <div class="uk-margin-bottom uk-width-1-4@s">
+    <% hash = {
+      "auto" => "Auto",
+      "name" => "Name",
+      "date" => "Date Modified",
+      "progress" => "Progress"
+    } %>
+    <%= render_component "sort-form" %>
+  </div>
+</div>
+<div id="item-container" 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 %>
+  <% title.entries.each_with_index do |item, i| %>
+    <% progress = percentage[i] %>
+    <%= render_component "card" %>
+  <% end %>
+</div>
+
+<%= render_component "entry-modal" %>
+
+<div id="edit-modal" class="uk-flex-top" uk-modal>
+  <div class="uk-modal-dialog uk-margin-auto-vertical">
+    <button class="uk-modal-close-default" type="button" uk-close></button>
+    <div class="uk-modal-header">
+      <div>
+        <h3 class="uk-modal-title break-word">Edit</h3>
+      </div>
+    </div>
+    <div class="uk-modal-body">
+      <div class="uk-margin">
+        <label class="uk-form-label" for="display-name">Display Name</label>
+        <div class="uk-inline">
+          <a class="uk-form-icon uk-form-icon-flip" uk-icon="icon:check"></a>
+          <input class="uk-input" type="text" name="display-name" id="display-name-field">
+        </div>
+      </div>
+      <div class="uk-margin">
+        <label class="uk-form-label">Cover Image</label>
+        <div class="uk-grid">
+          <div class="uk-width-1-2@s">
+            <img id="cover" data-title-cover="<%= title.cover_url %>" alt="" data-width data-height uk-img>
+          </div>
+          <div class="uk-width-1-2@s">
+            <div id="cover-upload" class="upload-field uk-placeholder uk-text-center uk-flex uk-flex-middle" data-title-id="<%= title.id %>">
+              <div>
+                <span uk-icon="icon: cloud-upload"></span>
+                <span class="uk-text-middle">Upload a cover image by dropping it here or</span>
+                <div uk-form-custom>
+                  <input type="file" accept="<%= SUPPORTED_IMG_TYPES.join ", " %>">
+                  <span class="uk-link">selecting one</span>
+                </div>
+              </div>
+            </div>
+
+          </div>
+        </div>
+        <progress id="upload-progress" class="uk-progress" value="0" max="100" hidden></progress>
+      </div>
+      <div id="title-progress-control" hidden>
+        <label class="uk-form-label">Progress</label>
+        <p class="uk-margin-remove-vertical">
+        <button id="read-btn" class="uk-button uk-button-default" onclick="updateProgress('<%= title.id %>', null, 1)">Mark all as read (100%)</button>
+        <button id="unread-btn" class="uk-button uk-button-default" onclick="updateProgress('<%= title.id %>', null, 0)">Mark all as unread (0%)</button>
+        </p>
+      </div>
+    </div>
+  </div>
+</div>
+
+<% content_for "script" do %>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery.dotdotdot/4.0.11/dotdotdot.js"></script>
+  <script src="<%= base_url %>js/dots.js"></script>
+  <script src="<%= base_url %>js/alert.js"></script>
+  <script src="<%= base_url %>js/title.js"></script>
+  <script src="<%= base_url %>js/search.js"></script>
+  <script src="<%= base_url %>js/sort-items.js"></script>
+<% end %>

src/views/user-edit.ecr

@@ -1,54 +0,0 @@
-<form action="/admin/user/edit" method="post" accept-charset="utf-8">
-
-  <div class="uk-margin">
-    <label class="uk-form-label" for="form-stacked-text">Username</label>
-    <input class="uk-input" type="text" name="username"
-      <%- if username -%>
-      value=<%= username %>
-      <%- end -%>
-    >
-  </div>
-  <%- if new_user -%>
-  <div class="uk-margin">
-    <label class="uk-form-label" for="form-stacked-text">Password</label>
-    <input class="uk-input" type="password" name="password">
-  </div>
-  <%- end -%>
-  <div class="uk-margin">
-    <label class="uk-form-label" for="form-stacked-text">Admin Access</label>
-    <input class="uk-checkbox" type="checkbox" name="admin"
-    <%- if admin == true -%>
-      checked
-    <%- end -%>
-    >
-  </div>
-
-  <%- if !new_user -%>
-  <div>
-    <button class="uk-button uk-button-default" type="button" uk-toggle="target: #change-password">Change Password</button>
-    <div id="change-password" class="uk-margin" hidden>
-      <label class="uk-form-label" for="form-stacked-text">New Password</label>
-      <input class="uk-input" type="password" name="password">
-    </div>
-  </div>
-  <%- end -%>
-
-  <hr class="uk-divider-icon">
-
-  <input type="submit" value="Save" class="uk-button uk-button-primary">
-</form>
-
-<% content_for "script" do %>
-<script>
-  var username;
-  var error;
-  <%- if !new_user -%>
-    username = '/<%= username %>';
-  <%- end -%>
-    <%- if error -%>
-    error = '<%= error %>';
-  <%- end -%>
-</script>
-<script src="/js/alert.js"></script>
-<script src="/js/user-edit.js"></script>
-<% end %>

src/views/user-edit.html.ecr

@@ -0,0 +1,46 @@
+<form action="<%= base_url %>admin/user/edit" method="post" accept-charset="utf-8">
+
+  <div class="uk-margin">
+    <label class="uk-form-label" for="form-stacked-text">Username</label>
+    <input class="uk-input" type="text" name="username" <%- if username -%> value=<%= username %> <%- end -%>>
+  </div>
+  <%- if new_user -%>
+    <div class="uk-margin">
+      <label class="uk-form-label" for="form-stacked-text">Password</label>
+      <input class="uk-input" type="password" name="password">
+    </div>
+  <%- end -%>
+  <div class="uk-margin">
+    <label class="uk-form-label" for="form-stacked-text">Admin Access</label>
+    <input class="uk-checkbox" type="checkbox" name="admin" <%- if admin == true -%> checked <%- end -%>>
+  </div>
+
+  <%- unless new_user -%>
+    <div>
+      <button class="uk-button uk-button-default" type="button" uk-toggle="target: #change-password">Change Password</button>
+      <div id="change-password" class="uk-margin" hidden>
+        <label class="uk-form-label" for="form-stacked-text">New Password</label>
+        <input class="uk-input" type="password" name="password">
+      </div>
+    </div>
+  <%- end -%>
+
+  <hr class="uk-divider-icon">
+
+  <input type="submit" value="Save" class="uk-button uk-button-primary">
+</form>
+
+<% content_for "script" do %>
+  <script>
+    var username;
+    var error;
+    <%- if !new_user -%>
+      username = '/<%= username %>';
+    <%- end -%>
+      <%- if error -%>
+        error = '<%= error %>';
+      <%- end -%>
+  </script>
+  <script src="<%= base_url %>js/alert.js"></script>
+  <script src="<%= base_url %>js/user-edit.js"></script>
+<% end %>

src/views/user.ecr

@@ -1,31 +0,0 @@
-<table class="uk-table uk-table-divider">
-  <thead>
-    <tr>
-      <th>Username</th>
-      <th>Admin Access</th>
-      <th>Actions</th>
-    </tr>
-  </thead>
-  <tbody>
-    <%- users.each do |u| -%>
-	<tr>
-		<td><%= u[0] %></td>
-		<td><%= u[1] %></td>
-		<td>
-			<a href="/admin/user/edit?username=<%= u[0] %>&admin=<%= u[1] %>" uk-icon="file-edit"></a>
-			<%- if u[0] != username %>
-			<a href="#" onclick="remove('<%= u[0] %>');return false;" uk-icon="trash"></a>
-			<%- end %>
-		</td>
-	</tr>
-    <%- end -%>
-  </tbody>
-</table>
-
-<a href="/admin/user/edit" class="uk-button uk-button-primary">New User</a>
-
-
-<% content_for "script" do %>
-<script src="/js/alert.js"></script>
-<script src="/js/user.js"></script>
-<% end %>

src/views/user.html.ecr

@@ -0,0 +1,31 @@
+<table class="uk-table uk-table-divider">
+  <thead>
+    <tr>
+      <th>Username</th>
+      <th>Admin Access</th>
+      <th>Actions</th>
+    </tr>
+  </thead>
+  <tbody>
+    <%- users.each do |u| -%>
+      <tr>
+        <td><%= u[0] %></td>
+        <td><%= u[1] %></td>
+        <td>
+          <a href="<%= base_url %>admin/user/edit?username=<%= u[0] %>&admin=<%= u[1] %>" uk-icon="file-edit"></a>
+          <%- if u[0] != username %>
+            <a href="#" onclick="remove('<%= u[0] %>');return false;" uk-icon="trash"></a>
+          <%- end %>
+        </td>
+      </tr>
+    <%- end -%>
+  </tbody>
+</table>
+
+<a href="<%= base_url %>admin/user/edit" class="uk-button uk-button-primary">New User</a>
+
+
+<% content_for "script" do %>
+  <script src="<%= base_url %>js/alert.js"></script>
+  <script src="<%= base_url %>js/user.js"></script>
+<% end %>