Add the option to disable ellipsis when truncating

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/feature_request.md

@@ -8,13 +8,10 @@ assignees: ''
 ---
 
 **Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. E.g. I'm always frustrated when [...]
+A clear and concise description of what the problem is. Ex. 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,24 +8,19 @@ on:
 
 jobs:
   build:
-    if: "!contains(github.event.head_commit.message, 'skip ci')"
 
     runs-on: ubuntu-latest
+
     container:
       image: crystallang/crystal:0.34.0-alpine
 
     steps:
     - uses: actions/checkout@v2
     - name: Install dependencies
-      run: apk add --no-cache yarn yaml sqlite-static libarchive-dev libarchive-static acl-static expat-static zstd-static lz4-static bzip2-static
+      run: apk add --no-cache yarn yaml sqlite-static
     - name: Build
-      run: make static
+      run: make
     - name: Linter
       run: make check
     - name: Run tests
       run: make test
-    - name: Upload artifact
-      uses: actions/upload-artifact@v2
-      with:
-        name: mango
-        path: mango

.gitignore

@@ -8,5 +8,3 @@ yarn.lock
 dist
 mango
 .env
-*.md
-public/css/uikit.css

Dockerfile

@@ -4,7 +4,7 @@ WORKDIR /Mango
 
 COPY . .
 COPY package*.json .
-RUN apk add --no-cache yarn yaml sqlite-static libarchive-dev libarchive-static acl-static expat-static zstd-static lz4-static bzip2-static \
+RUN apk add --no-cache yarn yaml sqlite-static \
     && make static
 
 FROM library/alpine

Makefile

@@ -14,7 +14,7 @@ static: uglify | libs
 	crystal build src/mango.cr --release --progress --static
 
 libs:
-	shards install --production
+	shards install
 
 run:
 	crystal run src/mango.cr --error-trace
@@ -25,7 +25,6 @@ test:
 check:
 	crystal tool format --check
 	./bin/ameba
-	./dev/linewidth.sh
 
 install:
 	cp mango $(INSTALL_DIR)/mango

README.md

@@ -1,3 +1,6 @@
+
+
+
 ![banner](./public/img/banner-paddings.png)
 
 # Mango
@@ -7,17 +10,14 @@
 Mango is a self-hosted manga server and reader. Its features include
 
 - Multi-user support
-- OPDS support
 - Dark/light mode switch
-- Supported formats: `.cbz`, `.zip`, `.cbr` and `.rar`
+- Supports both `.zip` and `.cbz` formats
 - 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
@@ -39,7 +39,7 @@ The official docker images are available on [Dockerhub](https://hub.docker.com/r
 
 ### Build from source
 
-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
+1. Make sure you have `crystal`, `shards` and `yarn` installed. You might also need to install the development headers for `libsqlite3` and `libyaml`.
 2. Clone the repository
 3. `make && sudo make install`
 4. Start Mango by running the command `mango`
@@ -50,21 +50,11 @@ The official docker images are available on [Dockerhub](https://hub.docker.com/r
 ### CLI
 
 ```
-  Mango - Manga Server and Web Reader. Version 0.7.2
+Mango e-manga server/reader. Version 0.3.0
 
-  Usage:
+    -v, --version                    Show version
-
+    -h, --help                       Show help
-    mango [sub_command] [options]
+    -c PATH, --config=PATH           Path to the config file. Default is `~/.config/mango/config.yml`
-
-  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
@@ -74,20 +64,17 @@ The default config file location is `~/.config/mango/config.yml`. It might be di
 ```yaml
 ---
 port: 9000
-base_url: /
+library_path: /home/alex_ling/mango/library
-library_path: ~/mango/library
+upload_path: /home/alex_ling/mango/uploads
-db_path: ~/mango/mango.db
+db_path: /home/alex_ling/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
+  download_queue_db_path: /home/alex_ling/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
@@ -95,7 +82,7 @@ mangadex:
 
 ### Library Structure
 
-You can organize your archive files in nested folders in the library directory. Here's an example:
+You can organize your `.cbz/.zip` files in nested folders in the library directory. Here's an example:
 
 ```
 .
@@ -140,6 +127,4 @@ 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

@@ -1,5 +0,0 @@
-#!/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

gulpfile.js

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

package.json

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

public/css/mango.css

@@ -19,6 +19,7 @@
 }
 .uk-card-title {
 	height: 3em;
+	overflow: hidden;
 }
 .acard:hover {
 	text-decoration: none;
@@ -36,8 +37,7 @@
 	word-wrap: break-word;
 }
 .uk-logo > img {
-	height: 90px;
+	max-height: 90px;
-	width: 90px;
 }
 .uk-search {
 	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(base_url + 'api/admin/scan', function (data) {
+	$.post('/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,11 +22,9 @@ const loadConfig = () => {
 	globalConfig.autoRefresh = $('#auto-refresh').prop('checked');
 };
 const remove = (id) => {
-	var url = base_url + 'api/admin/mangadex/queue/delete';
+	var url = '/api/admin/mangadex/queue/delete';
 	if (id !== undefined)
-		url += '?' + $.param({
+		url += '?' + $.param({id: id});
-			id: id
-		});
 	console.log(url);
 	$.ajax({
 		type: 'POST',
@@ -45,11 +43,9 @@ const remove = (id) => {
 	});
 };
 const refresh = (id) => {
-	var url = base_url + 'api/admin/mangadex/queue/retry';
+	var url = '/api/admin/mangadex/queue/retry';
 	if (id !== undefined)
-		url += '?' + $.param({
+		url += '?' + $.param({id: id});
-			id: id
-		});
 	console.log(url);
 	$.ajax({
 		type: 'POST',
@@ -71,7 +67,7 @@ const toggle = () => {
 	$('#pause-resume-btn').attr('disabled', '');
 	const paused = $('#pause-resume-btn').text() === 'Resume download';
 	const action = paused ? 'resume' : 'pause';
-	const url = `${base_url}api/admin/mangadex/queue/${action}`;
+	const url = `/api/admin/mangadex/queue/${action}`;
 	$.ajax({
 		type: 'POST',
 		url: url,
@@ -91,7 +87,7 @@ const load = () => {
 	console.log('fetching');
 	$.ajax({
 		type: 'GET',
-			url: base_url + 'api/admin/mangadex/queue',
+		url: '/api/admin/mangadex/queue',
 		dataType: 'json'
 	})
 	.done(data => {
@@ -104,15 +100,13 @@ const load = () => {
 		$('#pause-resume-btn').text(btnText);
 		$('#pause-resume-btn').removeAttr('hidden');
 		const rows = data.jobs.map(obj => {
-				var cls = 'label ';
+			var cls = 'uk-label ';
-				if (obj.status === 'Pending')
-					cls += 'label-pending';
 			if (obj.status === 'Completed')
-					cls += 'label-success';
+				cls += 'uk-label-success';
 			if (obj.status === 'Error')
-					cls += 'label-danger';
+				cls += 'uk-label-danger';
 			if (obj.status === 'MissingPages')
-					cls += 'label-warning';
+				cls += 'uk-label-warning';
 
 			const info = obj.status_message.length > 0 ? '<span uk-icon="info"></span>' : '';
 			const statusSpan = `<span class="${cls}">${obj.status} ${info}</span>`;

public/js/download.js

@@ -33,7 +33,7 @@ const download = () => {
 		console.log(ids);
 		$.ajax({
 			type: 'POST',
-			url: base_url + 'api/admin/mangadex/download',
+			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 = base_url + 'admin/downloads';
+				window.location.href = '/admin/downloads';
 			});
 			styleModal();
 		})
@@ -109,7 +109,7 @@ const search = () => {
 		return;
 	}
 
-	$.getJSON(`${base_url}api/admin/mangadex/manga/${int_id}`)
+	$.getJSON("/api/admin/mangadex/manga/" + int_id)
 		.done((data) => {
 			if (data.error) {
 				alert('danger', 'Failed to get manga info. Error: ' + data.error);
@@ -242,10 +242,7 @@ const buildTable = () => {
 	Object.entries(filters).forEach(([k, v]) => {
 		if (v === 'All') return;
 		if (k === 'group') {
-			chapters = chapters.filter(c => {
+			chapters = chapters.filter(c => v in c.groups);
-				unescaped_groups = Object.entries(c.groups).map(([g, id]) => unescapeHTML(g));
-				return unescaped_groups.indexOf(v) >= 0;
-			});
 			return;
 		}
 		if (k === 'lang') {
@@ -300,9 +297,3 @@ 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,7 +22,8 @@ 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');
@@ -38,11 +39,5 @@ const styleModal = () => {
 	$('.uk-modal-footer').css('background', color);
 };
 
-// do it before document is ready to prevent the initial flash of white on
+// do it before document is ready to prevent the initial flash of white
-// 	most pages
 setTheme(getTheme());
-
-$(() => {
-	// hack for the reader page
-	setTheme(getTheme());
-});

public/js/title.js

@@ -8,25 +8,22 @@ function showModal(encodedPath, pages, percentage, encodedeTitle, encodedEntryTi
 	if (percentage === 0) {
 		$('#continue-btn').attr('hidden', '');
 		$('#unread-btn').attr('hidden', '');
-	} else if (percentage === 100) {
+	}
-		$('#read-btn').attr('hidden', '');
+	else {
-		$('#continue-btn').attr('hidden', '');
-	} else {
 		$('#continue-btn').text('Continue from ' + percentage + '%');
 	}
-
+	if (percentage === 100) {
-	$('#modal-title-link').text(title);
+		$('#read-btn').attr('hidden', '');
-	$('#modal-title-link').attr('href', `${base_url}book/${titleID}`);
+	}
-
+	$('#modal-title').find('span').text(entry);
-	$('#modal-entry-title').find('span').text(entry);
+	$('#modal-title').next().attr('data-id', titleID);
-	$('#modal-entry-title').next().attr('data-id', titleID);
+	$('#modal-title').next().attr('data-entry-id', entryID);
-	$('#modal-entry-title').next().attr('data-entry-id', entryID);
+	$('#modal-title').next().find('.title-rename-field').val(entry);
-	$('#modal-entry-title').next().find('.title-rename-field').val(entry);
 	$('#path-text').text(zipPath);
 	$('#pages-text').text(pages + ' pages');
 
-	$('#beginning-btn').attr('href', `${base_url}reader/${titleID}/${entryID}/1`);
+	$('#beginning-btn').attr('href', '/reader/' + titleID + '/' + entryID + '/1');
-	$('#continue-btn').attr('href', `${base_url}reader/${titleID}/${entryID}`);
+	$('#continue-btn').attr('href', '/reader/' + titleID + '/' + entryID);
 
 	$('#read-btn').click(function(){
 		updateProgress(titleID, entryID, pages);
@@ -35,25 +32,22 @@ function showModal(encodedPath, pages, percentage, encodedeTitle, encodedEntryTi
 		updateProgress(titleID, entryID, 0);
 	});
 
-	$('#modal-edit-btn').attr('onclick', `edit("${entryID}")`);
+	$('.uk-modal-title.break-word > a').attr('onclick', `edit("${entryID}")`);
-
-	$('#modal-download-btn').attr('href', `/opds/download/${titleID}/${entryID}`);
 
 	UIkit.modal($('#modal')).show();
 	styleModal();
 }
 
 const updateProgress = (tid, eid, page) => {
-	let url = `${base_url}api/progress/${tid}/${page}`
+	let url = `/api/progress/${tid}/${page}`
-	const query = $.param({
+	const query = $.param({entry: eid});
-		entry: eid
-	});
 	if (eid)
 		url += `?${query}`;
 	$.post(url, (data) => {
 		if (data.success) {
 			location.reload();
-		} else {
+		}
+		else {
 			error = data.error;
 			alert('danger', error);
 		}
@@ -71,10 +65,8 @@ const renameSubmit = (name, eid) => {
 		return;
 	}
 
-	const query = $.param({
+	const query = $.param({ entry: eid });
-		entry: eid
+	let url = `/api/admin/display_name/${titleId}/${name}`;
-	});
-	let url = `${base_url}api/admin/display_name/${titleId}/${name}`;
 	if (eid)
 		url += `?${query}`;
 
@@ -106,7 +98,8 @@ const edit = (eid) => {
 		url = item.find('img').attr('data-src');
 		displayName = item.find('.uk-card-title').attr('data-title');
 		$('#title-progress-control').attr('hidden', '');
-	} else {
+	}
+	else {
 		$('#title-progress-control').removeAttr('hidden');
 	}
 
@@ -133,13 +126,11 @@ const setupUpload = (eid) => {
 	const upload = $('.upload-field');
 	const bar = $('#upload-progress').get(0);
 	const titleId = upload.attr('data-title-id');
-	const queryObj = {
+	const queryObj = {title: titleId};
-		title: titleId
-	};
 	if (eid)
 		queryObj['entry'] = eid;
 	const query = $.param(queryObj);
-	const url = `${base_url}api/admin/upload/cover?${query}`;
+	const url = `/api/admin/upload/cover?${query}`;
 	console.log(url);
 	UIkit.upload('.upload-field', {
 		url: url,

public/js/user-edit.js

@@ -1,5 +1,5 @@
 $(() => {
-	var target = base_url + 'admin/user/edit';
+	var target = '/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(base_url + 'api/admin/user/delete/' + username, function(data) {
+	$.post('/api/admin/user/delete/' + username, function(data) {
 		if (data.success) {
 			location.reload();
 		}

public/robots.txt

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

shard.lock

@@ -2,20 +2,12 @@ version: 1.0
 shards:
   ameba:
     github: crystal-ameba/ameba
-    version: 0.12.1
+    version: 0.12.0
-
-  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.9.0
@@ -28,10 +20,6 @@ shards:
     github: kemalcr/kemal
     version: 0.26.1
 
-  kemal-session:
-    github: kemalcr/kemal-session
-    version: 0.12.1
-
   kilt:
     github: jeromegn/kilt
     version: 0.4.0

shard.yml

@@ -1,5 +1,5 @@
 name: mango
-version: 0.7.2
+version: 0.3.0
 
 authors:
   - Alex Ling <hkalexling@gmail.com>
@@ -15,15 +15,11 @@ 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
+development_dependencies:
   ameba:
     github: crystal-ameba/ameba
-  clim:
-    github: at-grandpa/clim

spec/config_spec.cr

@@ -2,7 +2,7 @@ require "./spec_helper"
 
 describe Config do
   it "creates config if it does not exist" do
-    with_default_config do |_, path|
+    with_default_config do |_, _, path|
       File.exists?(path).should be_true
     end
   end

spec/rename_spec.cr

@@ -1,76 +0,0 @@
-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,6 +1,6 @@
 require "spec"
+require "../src/context"
 require "../src/server"
-require "../src/config"
 
 class State
   @@hash = {} of String => String
@@ -37,15 +37,15 @@ end
 def with_default_config
   temp_config = get_tempfile "mango-test-config"
   config = Config.load temp_config.path
-  config.set_current
+  logger = Logger.new config.log_level
-  yield config, temp_config.path
+  yield config, logger, temp_config.path
   temp_config.delete
 end
 
 def with_storage
-  with_default_config do
+  with_default_config do |_, logger|
     temp_db = get_tempfile "mango-test-db"
-    storage = Storage.new temp_db.path, false
+    storage = Storage.new temp_db.path, logger
     clear = yield storage, temp_db.path
     if clear == true
       temp_db.delete
@@ -54,9 +54,9 @@ def with_storage
 end
 
 def with_queue
-  with_default_config do
+  with_default_config do |_, logger|
     temp_queue_db = get_tempfile "mango-test-queue-db"
-    queue = MangaDex::Queue.new temp_queue_db.path
+    queue = MangaDex::Queue.new temp_queue_db.path, logger
     clear = yield queue, temp_queue_db.path
     if clear == true
       temp_queue_db.delete

src/archive.cr

@@ -1,59 +0,0 @@
-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

@@ -1,33 +0,0 @@
-@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/config.cr

@@ -3,11 +3,7 @@ require "yaml"
 class Config
   include YAML::Serializable
 
-  @[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
@@ -16,6 +12,7 @@ class Config
   property log_level : String = "info"
   property upload_path : String = File.expand_path "~/mango/uploads",
     home: true
+  property disable_ellipsis_truncation : Bool = false
   property mangadex = Hash(String, String | Int32).new
 
   @[YAML::Field(ignore: true)]
@@ -26,27 +23,13 @@ class Config
     "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}",
   }
 
-  @@singlet : Config?
-
-  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
@@ -57,7 +40,6 @@ class Config
       abort "Aborting..."
     end
     default = self.allocate
-    default.path = path
     default.fill_defaults
     cfg_dir = File.dirname cfg_path
     unless Dir.exists? cfg_dir
@@ -77,13 +59,4 @@ class Config
       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

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

src/handlers/auth_handler.cr

@@ -3,90 +3,23 @@ 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)
+  def call(env)
-    env.response.status_code = 401
+    return call_next(env) if request_path_startswith env, ["/login", "/logout"]
-    env.response.headers["WWW-Authenticate"] = HEADER_LOGIN_REQUIRED
-    env.response.print AUTH_MESSAGE
-    call_next env
-  end
 
-  def validate_token(env)
+    cookie = env.request.cookies.find { |c| c.name == "token" }
-    token = env.session.string? "token"
+    if cookie.nil? || !@storage.verify_token cookie.value
-    !token.nil? && @storage.verify_token token
+      return env.redirect "/login"
-  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
+      unless @storage.verify_admin cookie.value
         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

@@ -2,17 +2,20 @@ require "kemal"
 require "../logger"
 
 class LogHandler < Kemal::BaseLogHandler
+  def initialize(@logger : Logger)
+  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
+    @logger.debug msg
     env
   end
 
   def write(msg)
-    Logger.debug msg
+    @logger.debug msg
   end
 
   private def elapsed_text(elapsed)

src/handlers/static_handler.cr

@@ -16,8 +16,10 @@ class FS
 end
 
 class StaticHandler < Kemal::Handler
+  @dirs = ["/css", "/js", "/img", "/favicon.ico"]
+
   def call(env)
-    if requesting_static_file env
+    if request_path_startswith env, @dirs
       file = FS.get? env.request.path
       return call_next env if file.nil?
 

src/handlers/upload_handler.cr

@@ -11,9 +11,7 @@ class UploadHandler < Kemal::Handler
       return call_next env
     end
 
-    ary = env.request.path.split(File::SEPARATOR).select do |part|
+    ary = env.request.path.split(File::SEPARATOR).select { |part| !part.empty? }
-      !part.empty?
-    end
     ary[0] = @upload_dir
     path = File.join ary
 

src/library.cr

@@ -1,10 +1,8 @@
+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
@@ -27,22 +25,13 @@ class Entry
     @title = File.basename path, File.extname path
     @encoded_title = URI.encode @title
     @size = (File.size path).humanize_bytes
-    file = ArchiveFile.new path
+    file = Zip::File.new path
     @pages = file.entries.count do |e|
-      SUPPORTED_IMG_TYPES.includes? \
+      ["image/jpeg", "image/png"].includes? \
         MIME.from_filename? e.filename
     end
     file.close
-    id = storage.get_id @zip_path, false
+    @id = storage.get_id @zip_path, false
-    if id.nil?
-      id = random_str
-      storage.insert_id({
-        path:     @zip_path,
-        id:       id,
-        is_title: false,
-      })
-    end
-    @id = id
     @mtime = File.info(@zip_path).modification_time
   end
 
@@ -68,115 +57,37 @@ class Entry
   end
 
   def cover_url
-    url = "#{Config.current.base_url}api/page/#{@title_id}/#{@id}/1"
+    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
+        url = info_url
       end
     end
     url
   end
 
   def read_page(page_num)
-    img = nil
+    Zip::File.open @zip_path do |file|
-    ArchiveFile.open @zip_path do |file|
       page = file.entries
         .select { |e|
-          SUPPORTED_IMG_TYPES.includes? \
+          ["image/jpeg", "image/png"].includes? \
             MIME.from_filename? e.filename
         }
         .sort { |a, b|
           compare_alphanumerically a.filename, b.filename
         }
         .[page_num - 1]
-      data = file.read_entry page
+      page.open do |io|
-      if data
+        slice = Bytes.new page.uncompressed_size
-        img = Image.new data, MIME.from_filename(page.filename), page.filename,
+        bytes_read = io.read_fully? slice
-          data.size
+        unless bytes_read
+          return nil
+        end
+        return Image.new slice, MIME.from_filename(page.filename),
+          page.filename, bytes_read
       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
 
@@ -186,17 +97,8 @@ class Title
     encoded_title : String, mtime : Time
 
   def initialize(@dir : String, @parent_id, storage,
-                 @library : Library)
+                 @logger : Logger, @library : Library)
-    id = storage.get_id @dir, true
+    @id = storage.get_id @dir, true
-    if id.nil?
-      id = random_str
-      storage.insert_id({
-        path:     @dir,
-        id:       id,
-        is_title: true,
-      })
-    end
-    @id = id
     @title = File.basename dir
     @encoded_title = URI.encode @title
     @title_ids = [] of String
@@ -207,22 +109,18 @@ class Title
       next if fn.starts_with? "."
       path = File.join dir, fn
       if File.directory? path
-        title = Title.new path, @id, storage, library
+        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", ".rar", ".cbr"].includes? File.extname path
+      if [".zip", ".cbz"].includes? File.extname path
-        unless File.readable? path
+        zip_exception = validate_zip path
-          Logger.warn "File #{path} is not readable. Please make sure the " \
+        unless zip_exception.nil?
-                      "file permission is configured correctly."
+          @logger.warn "File #{path} is corrupted or is not a valid zip " \
-          next
+                       "archive. Ignoring it."
-        end
+          @logger.debug "Zip error: #{zip_exception}"
-        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
@@ -275,17 +173,6 @@ class Title
     @title_ids.map { |tid| @library.get_title! tid }
   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 deep_titles
-    return [] of Title if titles.empty?
-    titles + titles.map { |t| t.deep_titles }.flatten
-  end
-
   def parents
     ary = [] of Title
     tid = @parent_id
@@ -294,7 +181,7 @@ class Title
       ary << title
       tid = title.parent_id
     end
-    ary.reverse
+    ary
   end
 
   def size
@@ -344,14 +231,14 @@ class Title
   end
 
   def cover_url
-    url = "#{Config.current.base_url}img/icon.png"
+    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
+        url = info_url
       end
     end
     url
@@ -374,7 +261,7 @@ class Title
   # 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
+      save_progress username, e.title, e.pages
     end
     titles.each do |t|
       t.read_all username
@@ -384,119 +271,58 @@ class Title
   # 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
+      save_progress username, e.title, 0
     end
     titles.each do |t|
       t.unread_all username
     end
   end
 
-  def deep_read_page_count(username) : Int32
+  # For backward backward compatibility with v0.1.0, we save entry titles
-    load_progress_for_all_entries(username).sum +
+  #   instead of IDs in info.json
-      titles.map { |t| t.deep_read_page_count username }.flatten.sum
+  def save_progress(username, entry, page)
-  end
+    TitleInfo.new @dir do |info|
-
+      if info.progress[username]?.nil?
-  def deep_total_page_count : Int32
+        info.progress[username] = {entry => page}
-    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
+        info.progress[username][entry] = page
       end
-  end
-
-  def load_progress_for_all_entries(username)
-    progress = {} of String => Int32
-    TitleInfo.new @dir do |info|
-      progress = info.progress[username]?
-    end
-
-    @entries.map do |e|
-      info_progress = 0
-      if progress && progress.has_key? e.title
-        info_progress = [progress[e.title], e.pages].min
-      end
-      info_progress
-    end
-  end
-
-  def load_percentage_for_all_entries(username)
-    progress = load_progress_for_all_entries username
-    @entries.map_with_index do |e, i|
-      progress[i] / e.pages
-    end
-  end
-
-  # === helper methods ===
-
-  # Gets the last read entry in the title. If the entry has been completed,
-  #   returns the next entry. Returns nil when no entry has been read yet,
-  #   or when all entries are completed
-  def get_last_read_entry(username) : Entry?
-    progress = {} of String => Int32
-    TitleInfo.new @dir do |info|
-      progress = info.progress[username]?
-    end
-    return if progress.nil?
-
-    last_read_entry = nil
-
-    @entries.reverse_each do |e|
-      if progress.has_key? e.title
-        last_read_entry = e
-        break
-      end
-    end
-
-    if last_read_entry && last_read_entry.finished? username
-      last_read_entry = last_read_entry.next_entry
-    end
-
-    last_read_entry
-  end
-
-  # Equivalent to `@entries.map &. date_added`, but much more efficient
-  def get_date_added_for_all_entries
-    da = {} of String => Time
-    TitleInfo.new @dir do |info|
-      da = info.date_added
-    end
-
-    @entries.each do |e|
-      next if da.has_key? e.title
-      da[e.title] = ctime e.zip_path
-    end
-
-    TitleInfo.new @dir do |info|
-      info.date_added = da
       info.save
     end
-
-    @entries.map { |e| da[e.title] }
   end
 
-  def deep_entries_with_date_added
+  def load_progress(username, entry)
-    da_ary = get_date_added_for_all_entries
+    progress = 0
-    zip = @entries.map_with_index do |e, i|
+    TitleInfo.new @dir do |info|
-      {entry: e, date_added: da_ary[i]}
+      unless info.progress[username]?.nil? ||
+             info.progress[username][entry]?.nil?
+        progress = info.progress[username][entry]
       end
-    return zip if title_ids.empty?
+    end
-    zip + titles.map { |t| t.deep_entries_with_date_added }.flatten
+    progress
+  end
+
+  def load_percetage(username, entry)
+    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
 end
 
@@ -509,8 +335,6 @@ class TitleInfo
   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
 
   @[JSON::Field(ignore: true)]
   property dir : String = ""
@@ -543,20 +367,9 @@ end
 
 class Library
   property dir : String, title_ids : Array(String), scan_interval : Int32,
-    title_hash : Hash(String, Title)
+    logger : Logger, storage : Storage, title_hash : Hash(String, Title)
 
-  def self.default : self
+  def initialize(@dir, @scan_interval, @logger, @storage)
-    unless @@default
-      @@default = new
-    end
-    @@default.not_nil!
-  end
-
-  def initialize
-    register_mime_types
-
-    @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
@@ -568,7 +381,7 @@ class Library
         start = Time.local
         scan
         ms = (Time.local - start).total_milliseconds
-        Logger.info "Scanned #{@title_ids.size} titles in #{ms}ms"
+        @logger.info "Scanned #{@title_ids.size} titles in #{ms}ms"
         sleep @scan_interval * 60
       end
     end
@@ -578,10 +391,6 @@ class Library
     @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
@@ -601,96 +410,22 @@ class Library
 
   def scan
     unless Dir.exists? @dir
-      Logger.info "The library directory #{@dir} does not exist. " \
+      @logger.info "The library directory #{@dir} does not exist. " \
                    "Attempting to create it"
       Dir.mkdir_p @dir
     end
     @title_ids.clear
-
-    storage = Storage.new auto_close: false
-
     (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 }
+      .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"
-    storage.bulk_insert_ids
-    storage.close
-
-    Logger.debug "Scan completed"
-  end
-
-  def get_continue_reading_entries(username)
-    cr_entries = deep_titles
-      .map { |t| t.get_last_read_entry username }
-      # Select elements with type `Entry` from the array and ignore all `Nil`s
-      .select(Entry)[0..11]
-      .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!
-    }
-  end
-
-  alias RA = NamedTuple(
-    entry: Entry,
-    percentage: Float64,
-    grouped_count: Int32)
-
-  def get_recently_added_entries(username)
-    recently_added = [] of RA
-    last_date_added = nil
-
-    titles.map { |t| t.deep_entries_with_date_added }.flatten
-      .select { |e| e[:date_added] > 1.month.ago }
-      .sort { |a, b| b[:date_added] <=> a[:date_added] }
-      .each do |e|
-        break if recently_added.size > 12
-        last = recently_added.last?
-        if last && e[:entry].title_id == last[:entry].title_id &&
-           (e[:date_added] - last_date_added.not_nil!).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
-          last_date_added = e[:date_added]
-          recently_added << {
-            entry:         e[:entry],
-            percentage:    e[:entry].load_percentage(username),
-            grouped_count: 1,
-          }
-        end
-      end
-
-    recently_added[0..11]
   end
 end

src/logger.cr

@@ -8,15 +8,7 @@ class Logger
 
   @@severity : Log::Severity = :info
 
-  def self.default : self
+  def initialize(level : String)
-    unless @@default
-      @@default = new
-    end
-    @@default.not_nil!
-  end
-
-  def initialize
-    level = Config.current.log_level
     {% begin %}
       case level.downcase
       when "off"
@@ -58,16 +50,9 @@ class Logger
     @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,7 +1,6 @@
 require "http/client"
 require "json"
 require "csv"
-require "../rename"
 
 macro string_properties(names)
   {% for name in names %}
@@ -15,14 +14,6 @@ macro parse_strings_from_json(names)
   {% 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"]
@@ -73,20 +64,16 @@ module MangaDex
         gname = obj["group_name#{s}"].as_s
         @groups << {gid, gname}
       end
-
+      @full_title = @title
-      rename_rule = Rename::Rule.new \
+      unless @chapter.empty?
-        Config.current.mangadex["chapter_rename_rule"].to_s
+        @full_title = "Ch.#{@chapter} " + @full_title
-      @full_title = rename rename_rule
+      end
+      unless @volume.empty?
+        @full_title = "Vol.#{@volume} " + @full_title
+      end
     rescue e
       raise "failed to parse json: #{e}"
     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
 
   class Manga
@@ -124,23 +111,10 @@ module MangaDex
     rescue e
       raise "failed to parse json: #{e}"
     end
-
-    def rename(rule : Rename::Rule)
-      rule.render properties_to_hash ["id", "title", "author", "artist"]
-    end
   end
 
   class API
-    def self.default : self
+    def initialize(@base_url = "https://mangadex.org/api/")
-      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]

src/mangadex/downloader.cr

@@ -1,6 +1,5 @@
 require "./api"
 require "sqlite3"
-require "zip"
 
 module MangaDex
   class PageJob
@@ -80,20 +79,11 @@ module MangaDex
 
   class Queue
     property downloader : Downloader?
-    @path : String
 
-    def self.default : self
+    def initialize(@path : String, @logger : Logger)
-      unless @@default
+      dir = File.dirname path
-        @@default = new
-      end
-      @@default.not_nil!
-    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. " \
+        @logger.info "The queue DB directory #{dir} does not exist. " \
                      "Attepmting to create it"
         Dir.mkdir_p dir
       end
@@ -111,7 +101,7 @@ module MangaDex
           db.exec "create index if not exists status_idx " \
                   "on queue (status)"
         rescue e
-          Logger.error "Error when checking tables in DB: #{e}"
+          @logger.error "Error when checking tables in DB: #{e}"
           raise e
         end
       end
@@ -264,22 +254,11 @@ module MangaDex
 
   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
 
-    def self.default : self
+    def initialize(@queue : Queue, @api : API, @library_path : String,
-      unless @@default
+                   @wait_seconds : Int32, @retries : Int32,
-        @@default = new
+                   @logger : Logger)
-      end
-      @@default.not_nil!
-    end
-
-    def initialize
-      @queue = Queue.default
-      @api = API.default
       @queue.downloader = self
 
       spawn do
@@ -291,7 +270,7 @@ module MangaDex
             next if job.nil?
             download job
           rescue e
-            Logger.error e
+            @logger.error e
           end
         end
       end
@@ -303,7 +282,7 @@ module MangaDex
       begin
         chapter = @api.get_chapter(job.id)
       rescue e
-        Logger.error e
+        @logger.error e
         @queue.set_status JobStatus::Error, job
         unless e.message.nil?
           @queue.add_message e.message.not_nil!, job
@@ -313,9 +292,7 @@ module MangaDex
       end
       @queue.set_pages chapter.pages.size, job
       lib_dir = @library_path
-      rename_rule = Rename::Rule.new \
+      manga_dir = File.join lib_dir, chapter.manga.title
-        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
@@ -333,14 +310,14 @@ module MangaDex
           ext = File.extname fn
           fn = "#{i.to_s.rjust len, '0'}#{ext}"
           page_job = PageJob.new url, fn, writer, @retries
-          Logger.debug "Downloading #{url}"
+          @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}. " \
+            @logger.warn "Failed to download page #{url}. " \
                          "Retrying... Remaining retries: " \
                          "#{page_job.tries_remaning}"
           end
@@ -353,7 +330,7 @@ module MangaDex
         page_jobs = [] of PageJob
         chapter.pages.size.times do
           page_job = channel.receive
-          Logger.debug "[#{page_job.success ? "success" : "failed"}] " \
+          @logger.debug "[#{page_job.success ? "success" : "failed"}] " \
                         "#{page_job.url}"
           page_jobs << page_job
           if page_job.success
@@ -362,16 +339,16 @@ module MangaDex
             @queue.add_fail job
             msg = "Failed to download page #{page_job.url}"
             @queue.add_message msg, job
-            Logger.error msg
+            @logger.error msg
           end
         end
         fail_count = page_jobs.count { |j| !j.success }
-        Logger.debug "Download completed. " \
+        @logger.debug "Download completed. " \
                       "#{fail_count}/#{page_jobs.size} failed"
         writer.close
-        Logger.debug "cbz File created at #{zip_path}"
+        @logger.debug "cbz File created at #{zip_path}"
 
-        zip_exception = validate_archive zip_path
+        zip_exception = validate_zip zip_path
         if !zip_exception.nil?
           @queue.add_message "The downloaded archive is corrupted. " \
                              "Error: #{zip_exception}", job
@@ -386,7 +363,7 @@ module MangaDex
     end
 
     private def download_page(job : PageJob)
-      Logger.debug "downloading #{job.url}"
+      @logger.debug "downloading #{job.url}"
       headers = HTTP::Headers{
         "User-agent" => "Mangadex.cr",
       }
@@ -400,7 +377,7 @@ module MangaDex
         end
         job.success = true
       rescue e
-        Logger.error e
+        @logger.error e
         job.success = false
       end
     end

src/mango.cr

@@ -1,103 +1,41 @@
-require "./config"
 require "./server"
+require "./context"
 require "./mangadex/*"
 require "option_parser"
-require "clim"
 
-MANGO_VERSION = "0.7.2"
+VERSION = "0.3.0"
 
-macro common_option
+config_path = nil
-  option "-c PATH", "--config=PATH", type: String,
+
-    desc: "Path to the config file"
+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
 end
 
-macro throw(msg)
+config = Config.load config_path
-  puts "ERROR: #{{{msg}}}"
+logger = Logger.new config.log_level
-  puts
+storage = Storage.new config.db_path, logger
-  puts "Please see the `--help`."
+library = Library.new config.library_path, config.scan_interval, logger, storage
-  exit 1
+queue = MangaDex::Queue.new config.mangadex["download_queue_db_path"].to_s,
-end
+  logger
+api = MangaDex::API.new config.mangadex["api_url"].to_s
+MangaDex::Downloader.new queue, api, config.library_path,
+  config.mangadex["download_wait_seconds"].to_i,
+  config.mangadex["download_retries"].to_i, logger
 
-class CLI < Clim
+context = Context.new config, logger, library, storage, queue
-  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
 
-      # empty ARGV so it won't be passed to Kemal
+server = Server.new context
-      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

@@ -1,147 +0,0 @@
-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,7 +1,7 @@
 require "./router"
 
 class AdminRouter < Router
-  def initialize
+  def setup
     get "/admin" do |env|
       layout "admin"
     end
@@ -32,15 +32,29 @@ class AdminRouter < Router
       #   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
 
-      redirect env, "/admin/user"
+      env.redirect "/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
+      env.redirect redirect_url.to_s
     end
 
     post "/admin/user/edit/:original_username" do |env|
@@ -51,21 +65,38 @@ class AdminRouter < Router
       admin = !env.params.body["admin"]?.nil?
       original_username = env.params.url["original_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
+
+      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
 
-      redirect env, "/admin/user"
+      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})
-      redirect env, redirect_url.to_s
+      env.redirect redirect_url.to_s
     end
 
     get "/admin/downloads" do |env|
-      mangadex_base_url = Config.current.mangadex["base_url"]
+      base_url = @context.config.mangadex["base_url"]
       layout "download-manager"
     end
   end

src/routes/api.cr

@@ -3,7 +3,7 @@ require "../mangadex/*"
 require "../upload"
 
 class APIRouter < Router
-  def initialize
+  def setup
     get "/api/page/:tid/:eid/:page" do |env|
       begin
         tid = env.params.url["tid"]
@@ -80,7 +80,7 @@ class APIRouter < Router
         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
+          title.save_progress username, entry.title, page
         elsif page == 0
           title.unread_all username
         else
@@ -123,7 +123,7 @@ class APIRouter < Router
     get "/api/admin/mangadex/manga/:id" do |env|
       begin
         id = env.params.url["id"]
-        api = MangaDex::API.default
+        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
@@ -224,13 +224,13 @@ class APIRouter < Router
             entry_id = env.params.query["entry"]?
             title = @context.library.get_title(title_id).not_nil!
 
-            unless SUPPORTED_IMG_TYPES.includes? \
+            unless ["image/jpeg", "image/png"].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
+            upload = Upload.new @context.config.upload_path, @context.logger
             url = upload.path_to_url upload.save "img", ext, part.body
 
             if url.nil?

src/routes/main.cr

@@ -1,19 +1,19 @@
 require "./router"
 
 class MainRouter < Router
-  def initialize
+  def setup
     get "/login" do |env|
-      base_url = Config.current.base_url
+      render "src/views/login.ecr"
-      render "src/views/login.html.ecr"
     end
 
     get "/logout" do |env|
       begin
-        env.session.delete_string "token"
+        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
-        redirect env, "/login"
+        env.redirect "/login"
       end
     end
 
@@ -23,26 +23,22 @@ class MainRouter < Router
         password = env.params.body["password"]
         token = @context.storage.verify_user(username, password).not_nil!
 
-        env.session.string "token", token
+        cookie = HTTP::Cookie.new "token", token
-
+        cookie.expires = Time.local.shift years: 1
-        callback = env.session.string? "callback"
+        env.response.cookies << cookie
-        if callback
+        env.redirect "/"
-          env.session.delete_string "callback"
-          redirect env, callback
-        else
-          redirect env, "/"
-        end
       rescue
-        redirect env, "/login"
+        env.redirect "/login"
       end
     end
 
-    get "/library" do |env|
+    get "/" do |env|
       begin
         titles = @context.library.titles
         username = get_username env
-        percentage = titles.map &.load_percentage username
+        percentage = titles.map &.load_percetage username
-        layout "library"
+        use_dotdotdot = !@context.config.disable_ellipsis_truncation
+        layout "index"
       rescue e
         @context.error e
         env.response.status_code = 500
@@ -53,8 +49,10 @@ class MainRouter < Router
       begin
         title = (@context.library.get_title env.params.url["title"]).not_nil!
         username = get_username env
-        percentage = title.load_percentage_for_all_entries username
+        percentage = title.entries.map { |e|
-        title_percentage = title.titles.map &.load_percentage username
+          title.load_percetage username, e.title
+        }
+        use_dotdotdot = !@context.config.disable_ellipsis_truncation
         layout "title"
       rescue e
         @context.error e
@@ -63,24 +61,8 @@ class MainRouter < Router
     end
 
     get "/download" do |env|
-      mangadex_base_url = Config.current.mangadex["base_url"]
+      base_url = @context.config.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

@@ -1,32 +0,0 @@
-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,7 +1,7 @@
 require "./router"
 
 class ReaderRouter < Router
-  def initialize
+  def setup
     get "/reader/:title/:entry" do |env|
       begin
         title = (@context.library.get_title env.params.url["title"]).not_nil!
@@ -9,16 +9,13 @@ class ReaderRouter < Router
 
         # load progress
         username = get_username env
-        page = entry.load_progress username
+        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
 
-        # start from page 1 if the user has finished reading the entry
+        env.redirect "/reader/#{title.id}/#{entry.id}/#{page}"
-        page = 1 if entry.finished? username
-
-        redirect env, "/reader/#{title.id}/#{entry.id}/#{page}"
       rescue e
         @context.error e
         env.response.status_code = 404
@@ -27,8 +24,6 @@ class ReaderRouter < Router
 
     get "/reader/:title/:entry/:page" do |env|
       begin
-        base_url = Config.current.base_url
-
         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
@@ -36,27 +31,27 @@ class ReaderRouter < Router
 
         # save progress
         username = get_username env
-        entry.save_progress username, page
+        title.save_progress username, entry.title, page
 
         pages = (page...[entry.pages + 1, page + IMGS_PER_PAGE].min)
         urls = pages.map { |idx|
-          "#{base_url}api/page/#{title.id}/#{entry.id}/#{idx}"
+          "/api/page/#{title.id}/#{entry.id}/#{idx}"
         }
         reader_urls = pages.map { |idx|
-          "#{base_url}reader/#{title.id}/#{entry.id}/#{idx}"
+          "/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}"
+        exit_url = "/book/#{title.id}"
-        next_entry = entry.next_entry
+        next_entry = title.next_entry entry
         unless next_page > entry.pages
-          next_url = "#{base_url}reader/#{title.id}/#{entry.id}/#{next_page}"
+          next_url = "/reader/#{title.id}/#{entry.id}/#{next_page}"
         end
         unless next_entry.nil?
-          next_entry_url = "#{base_url}reader/#{title.id}/#{next_entry.id}"
+          next_entry_url = "/reader/#{title.id}/#{next_entry.id}"
         end
 
-        render "src/views/reader.html.ecr"
+        render "src/views/reader.ecr"
       rescue e
         @context.error e
         env.response.status_code = 404

src/routes/router.cr

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

src/server.cr

@@ -1,39 +1,11 @@
 require "kemal"
-require "kemal-session"
+require "./context"
-require "./library"
 require "./handlers/*"
 require "./util"
 require "./routes/*"
 
-class Context
-  property library : Library
-  property storage : Storage
-  property queue : MangaDex::Queue
-
-  def self.default : self
-    unless @@default
-      @@default = new
-    end
-    @@default.not_nil!
-  end
-
-  def initialize
-    @storage = Storage.default
-    @library = Library.default
-    @queue = MangaDex::Queue.default
-  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(@context : Context)
-
-  def initialize
     error 403 do |env|
       message = "HTTP 403: You are not authorized to visit #{env.request.path}"
       layout "message"
@@ -42,37 +14,26 @@ class Server
       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
+    MainRouter.new(@context).setup
-    AdminRouter.new
+    AdminRouter.new(@context).setup
-    ReaderRouter.new
+    ReaderRouter.new(@context).setup
-    APIRouter.new
+    APIRouter.new(@context).setup
-    OPDSRouter.new
 
     Kemal.config.logging = false
-    add_handler LogHandler.new
+    add_handler LogHandler.new @context.logger
     add_handler AuthHandler.new @context.storage
-    add_handler UploadHandler.new Config.current.upload_path
+    add_handler UploadHandler.new @context.config.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
@@ -80,7 +41,7 @@ class Server
     {% if flag?(:release) %}
       Kemal.config.env = "production"
     {% end %}
-    Kemal.config.port = Config.current.port
+    Kemal.config.port = @context.config.port
     Kemal.run
   end
 end

src/storage.cr

@@ -13,31 +13,14 @@ def verify_password(hash, pw)
 end
 
 class Storage
-  @path : String
+  def initialize(@path : String, @logger : Logger)
-  @db : DB::Database?
+    dir = File.dirname path
-  @insert_ids = [] of IDTuple
-
-  alias IDTuple = NamedTuple(path: String,
-    id: String,
-    is_title: Bool)
-
-  def self.default : self
-    unless @@default
-      @@default = new
-    end
-    @@default.not_nil!
-  end
-
-  def initialize(db_path : String? = nil, init_user = true, *,
-                 @auto_close = 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. " \
+      @logger.info "The DB directory #{dir} does not exist. " \
                    "Attepmting to create it"
       Dir.mkdir_p dir
     end
-    DB.open "sqlite3://#{@path}" do |db|
+    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,
@@ -51,65 +34,42 @@ class Storage
                 "(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}"
+          @logger.fatal "Error when checking tables in DB: #{e}"
           raise e
         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}"
+        @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)"
-
-        init_admin if init_user
-      end
-    end
-    unless @auto_close
-      @db = DB.open "sqlite3://#{@path}"
-    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 " \
+        @logger.log "Initial user created. You can log in with " \
                     "#{{"username" => "admin", "password" => random_pw}}"
       end
-
-  private def get_db(&block : DB::Database ->)
-    if @db.nil?
-      DB.open "sqlite3://#{@path}" do |db|
-        yield db
-      end
-    else
-      yield @db.not_nil!
     end
   end
 
   def verify_user(username, password)
-    get_db do |db|
+    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"
+          @logger.debug "Password does not match the hash"
           return nil
         end
-        Logger.debug "User #{username} verified"
+        @logger.debug "User #{username} verified"
         return token if token
         token = random_str
-        Logger.debug "Updating token for #{username}"
+        @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}"
+        @logger.error "Error when verifying user #{username}: #{e}"
         return nil
       end
     end
@@ -117,12 +77,12 @@ class Storage
 
   def verify_token(token)
     username = nil
-    get_db do |db|
+    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"
+        @logger.debug "Unable to verify token"
       end
     end
     username
@@ -130,12 +90,12 @@ class Storage
 
   def verify_admin(token)
     is_admin = false
-    get_db do |db|
+    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"
+        @logger.debug "Unable to verify user as admin"
       end
     end
     is_admin
@@ -143,7 +103,7 @@ class Storage
 
   def list_users
     results = Array(Tuple(String, Bool)).new
-    get_db do |db|
+    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)}
@@ -154,10 +114,8 @@ class Storage
   end
 
   def new_user(username, password, admin)
-    validate_username username
-    validate_password password
     admin = (admin ? 1 : 0)
-    get_db do |db|
+    DB.open "sqlite3://#{@path}" do |db|
       hash = hash_password password
       db.exec "insert into users values (?, ?, ?, ?)",
         username, hash, nil, admin
@@ -166,10 +124,8 @@ class Storage
 
   def update_user(original_username, username, password, admin)
     admin = (admin ? 1 : 0)
-    validate_username username
+    DB.open "sqlite3://#{@path}" do |db|
-    validate_password password unless password.empty?
+      if password.size == 0
-    get_db do |db|
-      if password.empty?
         db.exec "update users set username = (?), admin = (?) " \
                 "where username = (?)",
           username, admin, original_username
@@ -183,13 +139,13 @@ class Storage
   end
 
   def delete_user(username)
-    get_db do |db|
+    DB.open "sqlite3://#{@path}" do |db|
       db.exec "delete from users where username = (?)", username
     end
   end
 
   def logout(token)
-    get_db do |db|
+    DB.open "sqlite3://#{@path}" do |db|
       begin
         db.exec "update users set token = (?) where token = (?)", nil, token
       rescue
@@ -198,36 +154,18 @@ class Storage
   end
 
   def get_id(path, is_title)
-    id = nil
+    id = random_str
-    get_db do |db|
+    DB.open "sqlite3://#{@path}" do |db|
-      id = db.query_one? "select id from ids where path = (?)", path,
+      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 insert_id(tp : IDTuple)
-    @insert_ids << tp
-  end
-
-  def bulk_insert_ids
-    get_db do |db|
-      db.transaction do |tx|
-        @insert_ids.each do |tp|
-          tx.connection.exec "insert into ids values (?, ?, ?)", tp[:path],
-            tp[:id], tp[:is_title] ? 1 : 0
-        end
-      end
-    end
-    @insert_ids.clear
-  end
-
-  def close
-    unless @db.nil?
-      @db.not_nil!.close
-    end
-  end
-
   def to_json(json : JSON::Builder)
     json.string self
   end

src/upload.cr

@@ -1,9 +1,9 @@
 require "./util"
 
 class Upload
-  def initialize(@dir : String)
+  def initialize(@dir : String, @logger : Logger)
     unless Dir.exists? @dir
-      Logger.info "The uploads directory #{@dir} does not exist. " \
+      @logger.info "The uploads directory #{@dir} does not exist. " \
                    "Attempting to create it"
       Dir.mkdir_p @dir
     end
@@ -19,7 +19,7 @@ class Upload
     file_path = File.join full_dir, filename
 
     unless Dir.exists? full_dir
-      Logger.debug "creating directory #{full_dir}"
+      @logger.debug "creating directory #{full_dir}"
       Dir.mkdir_p full_dir
     end
 
@@ -50,7 +50,7 @@ class Upload
     end
 
     if ary.empty?
-      Logger.warn "File #{path} is not in the upload directory #{@dir}"
+      @logger.warn "File #{path} is not in the upload directory #{@dir}"
       return
     end
 

src/util.cr

@@ -2,25 +2,19 @@ require "big"
 
 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)
-  base_url = Config.current.base_url
   begin
+    cookie = env.request.cookies.find { |c| c.name == "token" }
     is_admin = false
-    if token = env.session.string? "token"
+    unless cookie.nil?
-      is_admin = @context.storage.verify_admin token
+      is_admin = @context.storage.verify_admin cookie.value
     end
-    page = {{name}}
+    render "src/views/#{{{name}}}.ecr", "src/views/layout.ecr"
-    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"
+    render "src/views/message.ecr", "src/views/layout.ecr"
   end
 end
 
@@ -31,8 +25,8 @@ 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
-  token = env.session.string "token"
+  cookie = {{env}}.request.cookies.find { |c| c.name == "token" }.not_nil!
-  (@context.storage.verify_token token).not_nil!
+  (@context.storage.verify_token cookie.value).not_nil!
 end
 
 def send_json(env, json)
@@ -40,10 +34,6 @@ def send_json(env, json)
   env.response.print json
 end
 
-def send_attachment(env, path)
-  send_file env, path, filename: File.basename(path), disposition: "attachment"
-end
-
 def hash_to_query(hash)
   hash.map { |k, v| "#{k}=#{v}" }.join("&")
 end
@@ -94,9 +84,12 @@ def compare_alphanumerically(a : String, b : String)
   compare_alphanumerically split_by_alphanumeric(a), split_by_alphanumeric(b)
 end
 
-def validate_archive(path : String) : Exception?
+# When downloading from MangaDex, the zip/cbz file would not be valid
-  file = ArchiveFile.new path
+#   before the download is completed. If we scan the zip file,
-  file.check
+#   Entry.new would throw, so we use this method to check before
+#   constructing Entry
+def validate_zip(path : String) : Exception?
+  file = Zip::File.new path
   file.close
   return
 rescue e
@@ -106,60 +99,3 @@ 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
-
-def register_mime_types
-  {
-    ".zip" => "application/zip",
-    ".rar" => "application/x-rar-compressed",
-    ".cbz" => "application/vnd.comicbook+zip",
-    ".cbr" => "application/vnd.comicbook-rar",
-  }.each do |k, v|
-    MIME.register k, v
-  end
-end

src/views/admin.ecr

@@ -1,5 +1,5 @@
 <ul class="uk-list uk-list-large uk-list-divider">
-  <li data-url="<%= base_url %>admin/user">User Managerment</li>
+  <li data-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,13 +7,12 @@
       <span hidden></span>
     </span>
   </li>
-  <li data-url="<%= base_url %>admin/downloads">Download Manager</li>
+  <li data-url="/admin/downloads">Download Manager</li>
 </ul>
 
 <hr class="uk-divider-icon">
-<p class="uk-text-meta">Version: v<%= MANGO_VERSION %></p>
+<a class="uk-button uk-button-danger" href="/logout">Log Out</a>
-<a class="uk-button uk-button-danger" href="<%= base_url %>logout">Log Out</a>
 
 <% content_for "script" do %>
-  <script src="<%= base_url %>js/admin.js"></script>
+<script src="/js/admin.js"></script>
 <% end %>

src/views/components/card.html.ecr

@@ -1,50 +0,0 @@
-<% 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

@@ -1,35 +0,0 @@
-<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

@@ -1,14 +0,0 @@
-<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

@@ -1,8 +0,0 @@
-<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

@@ -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 = "<%= 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

@@ -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 = "<%= 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

@@ -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 = "<%= 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

@@ -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 = "<%= 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

@@ -1,73 +0,0 @@
-<%- 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

@@ -0,0 +1,51 @@
+<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">
+              <img data-src="<%= t.cover_url %>" data-width data-height alt="" uk-img>
+            </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" uk-tooltip="<%= t.display_name.gsub("\"", "&quot;") %>" data-title="<%= t.display_name.gsub("\"", "&quot;") %>"><%= t.display_name %></h3>
+              <p><%= t.size %> entries</p>
+            </div>
+        </div>
+      </a>
+    </div>
+  <%- end -%>
+</div>
+
+<% content_for "script" do %>
+<% if use_dotdotdot %>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery.dotdotdot/4.0.11/dotdotdot.js"></script>
+	<script src="/js/dots.js"></script>
+<% end %>
+<script src="/js/search.js"></script>
+<script src="/js/sort-items.js"></script>
+<% end %>

src/views/layout.ecr

@@ -1,7 +1,18 @@
 <!DOCTYPE html>
 <html>
-
+  <head>
-  <%= render_component "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>
 
   <body>
     <div class="uk-offcanvas-content">
@@ -9,15 +20,14 @@
         <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="<%= base_url %>">Home</a></li>
+              <li><a href="/">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="/admin">Admin</a></li>
-                <li><a href="<%= base_url %>download">Download</a></li>
+				  <li><a href="/download">Download</a></li>
 			  <% end %>
               <hr uk-divider>
 			  <li><a onclick="toggleTheme()"><i class="fas fa-adjust"></i></a></li>
-              <li><a href="<%= base_url %>logout">Logout</a></li>
+              <li><a href="/logout">Logout</a></li>
             </ul>
           </div>
         </div>
@@ -29,20 +39,19 @@
           <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="<%= base_url %>"><img src="<%= base_url %>img/icon.png"></a>
+          <a class="uk-navbar-item uk-logo" href="/"><img src="/img/icon.png"></a>
           <ul class="uk-navbar-nav">
-            <li><a href="<%= base_url %>">Home</a></li>
+            <li><a href="/">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="/admin">Admin</a></li>
-              <li><a href="<%= base_url %>download">Download</a></li>
+				<li><a href="/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="<%= base_url %>logout">Logout</a></li>
+            <li><a href="/logout">Logout</a></li>
           </ul>
         </div>
       </div>
@@ -57,12 +66,10 @@
     </div>
 	<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

@@ -1,31 +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">
-    <% 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

@@ -0,0 +1,43 @@
+<!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" />
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+	<script src="/js/theme.js"></script>
+</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="/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/login.html.ecr

@@ -1,36 +0,0 @@
-<!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

@@ -1,22 +0,0 @@
-<?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><%= HTML.escape(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

@@ -1,38 +0,0 @@
-<?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><%= HTML.escape(title.display_name) %></title>
-
-  <author>
-    <name>Mango</name>
-    <uri>https://github.com/hkalexling/Mango</uri>
-  </author>
-
-  <% title.titles.each do |t| %>
-    <entry>
-      <title><%= HTML.escape(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><%= HTML.escape(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.ecr

@@ -1,9 +1,17 @@
 <!DOCTYPE html>
 <html class="reader-bg">
-
+  <head>
-  <%= render_component "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>
 
   <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| -%>
@@ -26,8 +34,7 @@
       <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"><%= entry.display_name %></h3>
+          <h3 class="uk-modal-title">Options</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">
@@ -49,14 +56,10 @@
         </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="https://cdnjs.cloudflare.com/ajax/libs/ScrollMagic/2.0.7/ScrollMagic.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/ScrollMagic/2.0.7/ScrollMagic.min.js"></script>
-    <script src="<%= base_url %>js/reader.js"></script>
+    <script src="/js/reader.js"></script>
   </body>
-
 </html>

src/views/title.ecr

@@ -0,0 +1,161 @@
+<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="/">Library</a></li>
+	<%- title.parents.each do |t| -%>
+	<li><a href="/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">
+		<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">
+              <img data-src="<%= t.cover_url %>" data-width data-height alt="" uk-img>
+            </div>
+            <div class="uk-card-body">
+				<h3 class="uk-card-title break-word" uk-tooltip="<%= t.display_name.gsub("\"", "&quot;") %>" data-title="<%= t.display_name.gsub("\"", "&quot;") %>"><%= t.display_name %></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] %>" id="<%= e.id %>">
+      <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_display_name %>&quot;, &quot;<%= e.encoded_display_name %>&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" uk-tooltip="<%= e.display_name.gsub("\"", "&quot;") %>" data-title="<%= e.display_name.gsub("\"", "&quot;") %>"><%= e.display_name %></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">
+	<div>
+		<h3 class="uk-modal-title break-word" id="modal-title"><span></span>
+			&nbsp;
+			<% if is_admin %>
+				<a class="uk-icon-button" uk-icon="icon:pencil"></a>
+			<% end %>
+		</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>
+
+<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" id="modal-title">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="image/jpeg, image/png">
+								<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 %>
+<% if use_dotdotdot %>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery.dotdotdot/4.0.11/dotdotdot.js"></script>
+	<script src="/js/dots.js"></script>
+<% end %>
+<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

@@ -1,103 +0,0 @@
-<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

@@ -0,0 +1,54 @@
+<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

@@ -1,46 +0,0 @@
-<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

@@ -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="/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

@@ -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="<%= 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 %>