Bump version to v0.7.2

Improve scan performance (#79 )
Use HTML.escape to escape XML
2026-01-24 00:03:14 -05:00 · 2020-07-01 14:15:29 +00:00 · 2020-07-01 14:01:26 +00:00 · 2020-07-01 13:27:30 +00:00 · 2020-07-01 13:21:14 +00:00 · 2020-06-30 16:46:47 +00:00
46 changed files with 956 additions and 737 deletions
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -8,10 +8,13 @@ assignees: ''
 ---

 **Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+A clear and concise description of what the problem is. E.g. I'm always frustrated when [...]

 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.

+**Describe a small use-case for this feature request**
+How would you imagine this to be used? What would be the advantage of this for the users of the application?
+
 **Additional context**
 Add any other context or screenshots about the feature request here.
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ dist
 mango
 .env
 *.md
+public/css/uikit.css
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ The official docker images are available on [Dockerhub](https://hub.docker.com/r
 ### CLI

 ```
-  Mango - Manga Server and Web Reader. Version 0.6.1
+  Mango - Manga Server and Web Reader. Version 0.7.2

  Usage:

--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,6 +1,7 @@
 const gulp = require('gulp');
 const minify = require("gulp-babel-minify");
 const minifyCss = require('gulp-minify-css');
+const less = require('gulp-less');

 gulp.task('minify-js', () => {
 	return gulp.src('public/js/*.js')
@@ -10,6 +11,12 @@ gulp.task('minify-js', () => {
 		.pipe(gulp.dest('dist/js'));
 });

+gulp.task('less', () => {
+	return gulp.src('src/assets/*.less')
+		.pipe(less())
+		.pipe(gulp.dest('public/css'));
+});
+
 gulp.task('minify-css', () => {
 	return gulp.src('public/css/*.css')
 		.pipe(minifyCss())
@@ -21,9 +28,9 @@ gulp.task('img', () => {
 		.pipe(gulp.dest('dist/img'));
 });

-gulp.task('favicon', () => {
-	return gulp.src('public/favicon.ico')
+gulp.task('copy-files', () => {
+	return gulp.src('public/*.*')
 		.pipe(gulp.dest('dist'));
 });

-gulp.task('default', gulp.parallel('minify-js', 'minify-css', 'img', 'favicon'));
+gulp.task('default', gulp.parallel('minify-js', gulp.series('less', 'minify-css'), 'img', 'copy-files'));
--- a/package.json
+++ b/package.json
@@ -8,9 +8,14 @@
  "devDependencies": {
    "gulp": "^4.0.2",
    "gulp-babel-minify": "^0.5.1",
-    "gulp-minify-css": "^1.2.4"
+    "gulp-less": "^4.0.1",
+    "gulp-minify-css": "^1.2.4",
+    "less": "^3.11.3"
  },
  "scripts": {
    "uglify": "gulp"
+  },
+  "dependencies": {
+    "uikit": "^3.5.4"
  }
 }
--- a/public/js/download-manager.js
+++ b/public/js/download-manager.js
@@ -24,44 +24,48 @@ const loadConfig = () => {
 const remove = (id) => {
 	var url = base_url + 'api/admin/mangadex/queue/delete';
 	if (id !== undefined)
-		url += '?' + $.param({id: id});
+		url += '?' + $.param({
+			id: id
+		});
 	console.log(url);
 	$.ajax({
-		type: 'POST',
-		url: url,
-		dataType: 'json'
-	})
-	.done(data => {
-		if (!data.success && data.error) {
-			alert('danger', `Failed to remove job from download queue. Error: ${data.error}`);
-			return;
-		}
-		load();
-	})
-	.fail((jqXHR, status) => {
-		alert('danger', `Failed to remove job from download queue. Error: [${jqXHR.status}] ${jqXHR.statusText}`);
-	});
+			type: 'POST',
+			url: url,
+			dataType: 'json'
+		})
+		.done(data => {
+			if (!data.success && data.error) {
+				alert('danger', `Failed to remove job from download queue. Error: ${data.error}`);
+				return;
+			}
+			load();
+		})
+		.fail((jqXHR, status) => {
+			alert('danger', `Failed to remove job from download queue. Error: [${jqXHR.status}] ${jqXHR.statusText}`);
+		});
 };
 const refresh = (id) => {
 	var url = base_url + 'api/admin/mangadex/queue/retry';
 	if (id !== undefined)
-		url += '?' + $.param({id: id});
+		url += '?' + $.param({
+			id: id
+		});
 	console.log(url);
 	$.ajax({
-		type: 'POST',
-		url: url,
-		dataType: 'json'
-	})
-	.done(data => {
-		if (!data.success && data.error) {
-			alert('danger', `Failed to restart download job. Error: ${data.error}`);
-			return;
-		}
-		load();
-	})
-	.fail((jqXHR, status) => {
-		alert('danger', `Failed to restart download job. Error: [${jqXHR.status}] ${jqXHR.statusText}`);
-	});
+			type: 'POST',
+			url: url,
+			dataType: 'json'
+		})
+		.done(data => {
+			if (!data.success && data.error) {
+				alert('danger', `Failed to restart download job. Error: ${data.error}`);
+				return;
+			}
+			load();
+		})
+		.fail((jqXHR, status) => {
+			alert('danger', `Failed to restart download job. Error: [${jqXHR.status}] ${jqXHR.statusText}`);
+		});
 };
 const toggle = () => {
 	$('#pause-resume-btn').attr('disabled', '');
@@ -69,50 +73,52 @@ const toggle = () => {
 	const action = paused ? 'resume' : 'pause';
 	const url = `${base_url}api/admin/mangadex/queue/${action}`;
 	$.ajax({
-		type: 'POST',
-		url: url,
-		dataType: 'json'
-	})
-	.fail((jqXHR, status) => {
-		alert('danger', `Failed to ${action} download queue. Error: [${jqXHR.status}] ${jqXHR.statusText}`);
-	})
-	.always(() => {
-		load();
-		$('#pause-resume-btn').removeAttr('disabled');
-	});
+			type: 'POST',
+			url: url,
+			dataType: 'json'
+		})
+		.fail((jqXHR, status) => {
+			alert('danger', `Failed to ${action} download queue. Error: [${jqXHR.status}] ${jqXHR.statusText}`);
+		})
+		.always(() => {
+			load();
+			$('#pause-resume-btn').removeAttr('disabled');
+		});
 };
 const load = () => {
 	if (loading) return;
 	loading = true;
 	console.log('fetching');
 	$.ajax({
-		type: 'GET',
-		url: base_url + 'api/admin/mangadex/queue',
-		dataType: 'json'
-	})
-	.done(data => {
-		if (!data.success && data.error) {
-			alert('danger', `Failed to fetch download queue. Error: ${data.error}`);
-			return;
-		}
-		console.log(data);
-		const btnText = data.paused ? "Resume download" : "Pause download";
-		$('#pause-resume-btn').text(btnText);
-		$('#pause-resume-btn').removeAttr('hidden');
-		const rows = data.jobs.map(obj => {
-			var cls = 'uk-label ';
-			if (obj.status === 'Completed')
-				cls += 'uk-label-success';
-			if (obj.status === 'Error')
-				cls += 'uk-label-danger';
-			if (obj.status === 'MissingPages')
-				cls += 'uk-label-warning';
+			type: 'GET',
+			url: base_url + 'api/admin/mangadex/queue',
+			dataType: 'json'
+		})
+		.done(data => {
+			if (!data.success && data.error) {
+				alert('danger', `Failed to fetch download queue. Error: ${data.error}`);
+				return;
+			}
+			console.log(data);
+			const btnText = data.paused ? "Resume download" : "Pause download";
+			$('#pause-resume-btn').text(btnText);
+			$('#pause-resume-btn').removeAttr('hidden');
+			const rows = data.jobs.map(obj => {
+				var cls = 'label ';
+				if (obj.status === 'Pending')
+					cls += 'label-pending';
+				if (obj.status === 'Completed')
+					cls += 'label-success';
+				if (obj.status === 'Error')
+					cls += 'label-danger';
+				if (obj.status === 'MissingPages')
+					cls += 'label-warning';

-			const info = obj.status_message.length > 0 ? '<span uk-icon="info"></span>' : '';
-			const statusSpan = `<span class="${cls}">${obj.status} ${info}</span>`;
-			const dropdown = obj.status_message.length > 0 ? `<div uk-dropdown>${obj.status_message}</div>` : '';
-			const retryBtn = obj.status_message.length > 0 ? `<a onclick="refresh('${obj.id}')" uk-icon="refresh"></a>` : '';
-			return `<tr id="chapter-${obj.id}">
+				const info = obj.status_message.length > 0 ? '<span uk-icon="info"></span>' : '';
+				const statusSpan = `<span class="${cls}">${obj.status} ${info}</span>`;
+				const dropdown = obj.status_message.length > 0 ? `<div uk-dropdown>${obj.status_message}</div>` : '';
+				const retryBtn = obj.status_message.length > 0 ? `<a onclick="refresh('${obj.id}')" uk-icon="refresh"></a>` : '';
+				return `<tr id="chapter-${obj.id}">
 				<td><a href="${baseURL}/chapter/${obj.id}">${obj.title}</a></td>
 				<td><a href="${baseURL}/manga/${obj.manga_id}">${obj.manga_title}</a></td>
 				<td>${obj.success_count}/${obj.pages}</td>
@@ -123,16 +129,16 @@ const load = () => {
 					${retryBtn}
 				</td>
 				</tr>`;
-		});
+			});

-		const tbody = `<tbody>${rows.join('')}</tbody>`;
-		$('tbody').remove();
-		$('table').append(tbody);
-	})
-	.fail((jqXHR, status) => {
-		alert('danger', `Failed to fetch download queue. Error: [${jqXHR.status}] ${jqXHR.statusText}`);
-	})
-	.always(() => {
-		loading = false;
-	});
+			const tbody = `<tbody>${rows.join('')}</tbody>`;
+			$('tbody').remove();
+			$('table').append(tbody);
+		})
+		.fail((jqXHR, status) => {
+			alert('danger', `Failed to fetch download queue. Error: [${jqXHR.status}] ${jqXHR.statusText}`);
+		})
+		.always(() => {
+			loading = false;
+		});
 };
--- a/public/js/theme.js
+++ b/public/js/theme.js
@@ -22,8 +22,7 @@ const setTheme = themeStr => {
 		$('.uk-card').addClass('uk-card-secondary');
 		$('.uk-card').removeClass('uk-card-default');
 		$('.ui-widget-content').addClass('dark');
-	}
-	else {
+	} else {
 		$('html').css('background', '');
 		$('body').removeClass('uk-light');
 		$('.uk-card').removeClass('uk-card-secondary');
@@ -39,5 +38,11 @@ const styleModal = () => {
 	$('.uk-modal-footer').css('background', color);
 };

-// do it before document is ready to prevent the initial flash of white
+// do it before document is ready to prevent the initial flash of white on
+// 	most pages
 setTheme(getTheme());
+
+$(() => {
+	// hack for the reader page
+	setTheme(getTheme());
+});
--- a/public/js/title.js
+++ b/public/js/title.js
@@ -8,12 +8,12 @@ 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', '');
+		$('#continue-btn').attr('hidden', '');
 	} else {
 		$('#continue-btn').text('Continue from ' + percentage + '%');
 	}
-	if (percentage === 100) {
-		$('#read-btn').attr('hidden', '');
-	}

 	$('#modal-title-link').text(title);
 	$('#modal-title-link').attr('href', `${base_url}book/${titleID}`);
@@ -35,7 +35,9 @@ function showModal(encodedPath, pages, percentage, encodedeTitle, encodedEntryTi
 		updateProgress(titleID, entryID, 0);
 	});

-	$('.uk-modal-title.break-word > a').attr('onclick', `edit("${entryID}")`);
+	$('#modal-edit-btn').attr('onclick', `edit("${entryID}")`);
+
+	$('#modal-download-btn').attr('href', `/opds/download/${titleID}/${entryID}`);

 	UIkit.modal($('#modal')).show();
 	styleModal();
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /
--- a/shard.yml
+++ b/shard.yml
@@ -1,5 +1,5 @@
 name: mango
-version: 0.6.1
+version: 0.7.2

 authors:
  - Alex Ling <hkalexling@gmail.com>
--- a/src/assets/uikit.less
+++ b/src/assets/uikit.less
@@ -0,0 +1,33 @@
+@import "node_modules/uikit/src/less/uikit.theme.less";
+
+.label {
+    display: inline-block;
+    padding: @label-padding-vertical @label-padding-horizontal;
+    background: @label-background;
+    line-height: @label-line-height;
+    font-size: @label-font-size;
+    color: @label-color;
+    vertical-align: middle;
+    white-space: nowrap;
+    .hook-label;
+}
+
+.label-success {
+    background-color: @label-success-background;
+    color: @label-success-color;
+}
+
+.label-warning {
+    background-color: @label-warning-background;
+    color: @label-warning-color;
+}
+
+.label-danger {
+    background-color: @label-danger-background;
+    color: @label-danger-color;
+}
+
+.label-pending {
+    background-color: @global-secondary-background;
+    color: @global-inverse-color;
+}
--- a/src/library.cr
+++ b/src/library.cr
@@ -4,6 +4,8 @@ require "uri"
 require "./util"
 require "./archive"

+SUPPORTED_IMG_TYPES = ["image/jpeg", "image/png", "image/webp"]
+
 struct Image
  property data : Bytes
  property mime : String
@@ -17,8 +19,7 @@ end
 class Entry
  property zip_path : String, book : Title, title : String,
    size : String, pages : Int32, id : String, title_id : String,
-    encoded_path : String, encoded_title : String, mtime : Time,
-    date_added : Time
+    encoded_path : String, encoded_title : String, mtime : Time

  def initialize(path, @book, @title_id, storage)
    @zip_path = path
@@ -28,13 +29,21 @@ class Entry
    @size = (File.size path).humanize_bytes
    file = ArchiveFile.new path
    @pages = file.entries.count do |e|
-      ["image/jpeg", "image/png"].includes? \
+      SUPPORTED_IMG_TYPES.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
-    @date_added = load_date_added
  end

  def to_json(json : JSON::Builder)
@@ -74,7 +83,7 @@ class Entry
    ArchiveFile.open @zip_path do |file|
      page = file.entries
        .select { |e|
-          ["image/jpeg", "image/png"].includes? \
+          SUPPORTED_IMG_TYPES.includes? \
            MIME.from_filename? e.filename
        }
        .sort { |a, b|
@@ -90,7 +99,19 @@ class Entry
    img
  end

-  private def load_date_added
+  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]?
@@ -103,6 +124,60 @@ class Entry
    end
    date_added.not_nil! # is it ok to set not_nil! here?
  end
+
+  # For backward backward compatibility with v0.1.0, we save entry titles
+  #   instead of IDs in info.json
+  def save_progress(username, page)
+    TitleInfo.new @book.dir do |info|
+      if info.progress[username]?.nil?
+        info.progress[username] = {@title => page}
+      else
+        info.progress[username][@title] = page
+      end
+      # save last_read timestamp
+      if info.last_read[username]?.nil?
+        info.last_read[username] = {@title => Time.utc}
+      else
+        info.last_read[username][@title] = Time.utc
+      end
+      info.save
+    end
+  end
+
+  def load_progress(username)
+    progress = 0
+    TitleInfo.new @book.dir do |info|
+      unless info.progress[username]?.nil? ||
+             info.progress[username][@title]?.nil?
+        progress = info.progress[username][@title]
+      end
+    end
+    [progress, @pages].min
+  end
+
+  def load_percentage(username)
+    page = load_progress username
+    page / @pages
+  end
+
+  def load_last_read(username)
+    last_read = nil
+    TitleInfo.new @book.dir do |info|
+      unless info.last_read[username]?.nil? ||
+             info.last_read[username][@title]?.nil?
+        last_read = info.last_read[username][@title]
+      end
+    end
+    last_read
+  end
+
+  def finished?(username)
+    load_progress(username) == @pages
+  end
+
+  def started?(username)
+    load_progress(username) > 0
+  end
 end

 class Title
@@ -112,7 +187,16 @@ class Title

  def initialize(@dir : String, @parent_id, storage,
                 @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
@@ -191,6 +275,17 @@ 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
@@ -199,7 +294,7 @@ class Title
      ary << title
      tid = title.parent_id
    end
-    ary
+    ary.reverse
  end

  def size
@@ -279,7 +374,7 @@ class Title
  # Set the reading progress of all entries and nested libraries to 100%
  def read_all(username)
    @entries.each do |e|
-      save_progress username, e.title, e.pages
+      e.save_progress username, e.pages
    end
    titles.each do |t|
      t.read_all username
@@ -289,81 +384,25 @@ class Title
  # Set the reading progress of all entries and nested libraries to 0%
  def unread_all(username)
    @entries.each do |e|
-      save_progress username, e.title, 0
+      e.save_progress username, 0
    end
    titles.each do |t|
      t.unread_all username
    end
  end

-  # For backward backward compatibility with v0.1.0, we save entry titles
-  #   instead of IDs in info.json
-  def save_progress(username, entry, page)
-    TitleInfo.new @dir do |info|
-      if info.progress[username]?.nil?
-        info.progress[username] = {entry => page}
-      else
-        info.progress[username][entry] = page
-      end
-      # save last_read timestamp
-      if info.last_read[username]?.nil?
-        info.last_read[username] = {entry => Time.utc}
-      else
-        info.last_read[username][entry] = Time.utc
-      end
-      info.save
-    end
+  def deep_read_page_count(username) : Int32
+    load_progress_for_all_entries(username).sum +
+      titles.map { |t| t.deep_read_page_count username }.flatten.sum
  end

-  def load_progress(username, entry)
-    progress = 0
-    TitleInfo.new @dir do |info|
-      unless info.progress[username]?.nil? ||
-             info.progress[username][entry]?.nil?
-        progress = info.progress[username][entry]
-      end
-    end
-    progress
-  end
-
-  def load_percentage(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
+  def deep_total_page_count : Int32
+    entries.map { |e| e.pages }.sum +
+      titles.map { |t| t.deep_total_page_count }.flatten.sum
  end

  def load_percentage(username)
-    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 load_last_read(username, entry)
-    last_read = nil
-    TitleInfo.new @dir do |info|
-      unless info.last_read[username]?.nil? ||
-             info.last_read[username][entry]?.nil?
-        last_read = info.last_read[username][entry]
-      end
-    end
-    last_read
-  end
-
-  def next_entry(current_entry_obj)
-    idx = @entries.index current_entry_obj
-    return nil if idx.nil? || idx == @entries.size - 1
-    @entries[idx + 1]
-  end
-
-  def previous_entry(current_entry_obj)
-    idx = @entries.index current_entry_obj
-    return nil if idx.nil? || idx == 0
-    @entries[idx - 1]
+    deep_read_page_count(username) / deep_total_page_count
  end

  def get_continue_reading_entry(username)
@@ -381,15 +420,83 @@ class Title
    end
  end

-  # TODO: More concise title?
-  def get_last_read_for_continue_reading(username, entry_obj)
-    last_read = load_last_read username, entry_obj.title
-    # grab from previous entry if current entry hasn't been started yet
-    if last_read.nil?
-      previous_entry = previous_entry(entry_obj)
-      return load_last_read username, previous_entry.title if previous_entry
+  def load_progress_for_all_entries(username)
+    progress = {} of String => Int32
+    TitleInfo.new @dir do |info|
+      progress = info.progress[username]?
    end
-    last_read
+
+    @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
+    da_ary = get_date_added_for_all_entries
+    zip = @entries.map_with_index do |e, i|
+      {entry: e, date_added: da_ary[i]}
+    end
+    return zip if title_ids.empty?
+    zip + titles.map { |t| t.deep_entries_with_date_added }.flatten
  end
 end

@@ -436,7 +543,7 @@ end

 class Library
  property dir : String, title_ids : Array(String), scan_interval : Int32,
-    storage : Storage, title_hash : Hash(String, Title)
+    title_hash : Hash(String, Title)

  def self.default : self
    unless @@default
@@ -446,7 +553,8 @@ class Library
  end

  def initialize
-    @storage = Storage.default
+    register_mime_types
+
    @dir = Config.current.library_path
    @scan_interval = Config.current.scan_interval
    # explicitly initialize @titles to bypass the compiler check. it will
@@ -470,6 +578,10 @@ 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
@@ -494,104 +606,91 @@ class Library
      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, 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
+
+    storage.bulk_insert_ids
+    storage.close
+
    Logger.debug "Scan completed"
  end

  def get_continue_reading_entries(username)
-    # map: get the continue-reading entry or nil for each Title
-    # select: select only entries (and ignore Nil's) from the array
-    #   produced by map
-    continue_reading_entries = titles.map { |t|
-      get_continue_reading_entry username, t
-    }.select Entry
-
-    continue_reading = continue_reading_entries.map { |e|
-      {
-        entry:      e,
-        percentage: e.book.load_percentage(username, e.title),
-        last_read:  get_relevant_last_read(username, e),
+    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)
-    continue_reading.sort! { |a, b|
+    cr_entries.sort { |a, b|
      next 0 if a[:last_read].nil? && b[:last_read].nil?
      next 1 if a[:last_read].nil?
      next -1 if b[:last_read].nil?
      b[:last_read].not_nil! <=> a[:last_read].not_nil!
-    }[0..11]
+    }
  end

+  alias RA = NamedTuple(
+    entry: Entry,
+    percentage: Float64,
+    grouped_count: Int32)
+
  def get_recently_added_entries(username)
-    # Get all entries added within the last three months
-    entries = titles.map { |t| t.entries }
-      .flatten
-      .select { |e| e.date_added > 3.months.ago }
+    recently_added = [] of RA
+    last_date_added = nil

-    # Group entries in a Hash by title ID
-    grouped_entries = {} of String => Array(Entry)
-    entries.each do |e|
-      if grouped_entries.has_key? e.title_id
-        grouped_entries[e.title_id].push e
-      else
-        grouped_entries[e.title_id] = [e]
+    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
-    end
-
-    # Cast the Hash to an Array of Tuples and sort it by date_added
-    grouped_ary = grouped_entries.to_a.sort do |a, b|
-      date_added_a = a[1].map { |e| e.date_added }.max
-      date_added_b = b[1].map { |e| e.date_added }.max
-      date_added_b <=> date_added_a
-    end
-
-    recently_added = grouped_ary.map do |_, ary|
-      # Get the most recently added entry in the group
-      entry = ary.sort { |a, b| a.date_added <=> b.date_added }.last
-      {
-        entry:         entry,
-        percentage:    entry.book.load_percentage(username, entry.title),
-        grouped_count: ary.size,
-      }
-    end

    recently_added[0..11]
  end
-
-  private def get_continue_reading_entry(username, title)
-    in_progress_entries = title.entries.select do |e|
-      title.load_progress(username, e.title) > 0
-    end
-    return nil if in_progress_entries.empty?
-
-    latest_read_entry = in_progress_entries[-1]
-    if title.load_progress(username, latest_read_entry.title) ==
-         latest_read_entry.pages
-      title.next_entry latest_read_entry
-    else
-      latest_read_entry
-    end
-  end
-
-  private def get_relevant_last_read(username, entry_obj)
-    last_read = entry_obj.book.load_last_read username, entry_obj.title
-    # grab from previous entry if current entry hasn't been started yet
-    if last_read.nil?
-      previous_entry = entry_obj.book.previous_entry(entry_obj)
-      return entry_obj.book.load_last_read username, previous_entry.title \
-         if previous_entry
-    end
-    last_read
-  end
 end
--- a/src/mango.cr
+++ b/src/mango.cr
@@ -4,7 +4,7 @@ require "./mangadex/*"
 require "option_parser"
 require "clim"

-MANGO_VERSION = "0.6.1"
+MANGO_VERSION = "0.7.2"

 macro common_option
  option "-c PATH", "--config=PATH", type: String,
--- a/src/routes/api.cr
+++ b/src/routes/api.cr
@@ -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
-          title.save_progress username, entry.title, page
+          entry.save_progress username, page
        elsif page == 0
          title.unread_all username
        else
@@ -224,7 +224,7 @@ class APIRouter < Router
            entry_id = env.params.query["entry"]?
            title = @context.library.get_title(title_id).not_nil!

-            unless ["image/jpeg", "image/png"].includes? \
+            unless SUPPORTED_IMG_TYPES.includes? \
                     MIME.from_filename? filename
              raise "The uploaded image must be either JPEG or PNG"
            end
--- a/src/routes/main.cr
+++ b/src/routes/main.cr
@@ -4,7 +4,7 @@ class MainRouter < Router
  def initialize
    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|
@@ -53,9 +53,8 @@ class MainRouter < Router
      begin
        title = (@context.library.get_title env.params.url["title"]).not_nil!
        username = get_username env
-        percentage = title.entries.map { |e|
-          title.load_percentage username, e.title
-        }
+        percentage = title.load_percentage_for_all_entries username
+        title_percentage = title.titles.map &.load_percentage username
        layout "title"
      rescue e
        @context.error e
--- a/src/routes/opds.cr
+++ b/src/routes/opds.cr
@@ -4,13 +4,13 @@ class OPDSRouter < Router
  def initialize
    get "/opds" do |env|
      titles = @context.library.titles
-      render_xml "src/views/opds/index.ecr"
+      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.ecr"
+        render_xml "src/views/opds/title.xml.ecr"
      rescue e
        @context.error e
        env.response.status_code = 404
--- a/src/routes/reader.cr
+++ b/src/routes/reader.cr
@@ -9,12 +9,15 @@ class ReaderRouter < Router

        # load progress
        username = get_username env
-        page = title.load_progress username, entry.title
+        page = entry.load_progress username
        # we go back 2 * `IMGS_PER_PAGE` pages. the infinite scroll
        #   library perloads a few pages in advance, and the user
        #   might not have actually read them
        page = [page - 2 * IMGS_PER_PAGE, 1].max

+        # start from page 1 if the user has finished reading the entry
+        page = 1 if entry.finished? username
+
        redirect env, "/reader/#{title.id}/#{entry.id}/#{page}"
      rescue e
        @context.error e
@@ -33,7 +36,7 @@ class ReaderRouter < Router

        # save progress
        username = get_username env
-        title.save_progress username, entry.title, page
+        entry.save_progress username, page

        pages = (page...[entry.pages + 1, page + IMGS_PER_PAGE].min)
        urls = pages.map { |idx|
@@ -45,7 +48,7 @@ class ReaderRouter < Router
        next_page = page + IMGS_PER_PAGE
        next_url = next_entry_url = nil
        exit_url = "#{base_url}book/#{title.id}"
-        next_entry = title.next_entry entry
+        next_entry = entry.next_entry
        unless next_page > entry.pages
          next_url = "#{base_url}reader/#{title.id}/#{entry.id}/#{next_page}"
        end
@@ -53,7 +56,7 @@ class ReaderRouter < Router
          next_entry_url = "#{base_url}reader/#{title.id}/#{next_entry.id}"
        end

-        render "src/views/reader.ecr"
+        render "src/views/reader.html.ecr"
      rescue e
        @context.error e
        env.response.status_code = 404
--- a/src/storage.cr
+++ b/src/storage.cr
@@ -14,6 +14,12 @@ end

 class Storage
  @path : String
+  @db : DB::Database?
+  @insert_ids = [] of IDTuple
+
+  alias IDTuple = NamedTuple(path: String,
+    id: String,
+    is_title: Bool)

  def self.default : self
    unless @@default
@@ -22,7 +28,8 @@ class Storage
    @@default.not_nil!
  end

-  def initialize(db_path : String? = nil, init_user = true)
+  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
@@ -60,6 +67,9 @@ class Storage
        init_admin if init_user
      end
    end
+    unless @auto_close
+      @db = DB.open "sqlite3://#{@path}"
+    end
  end

  macro init_admin
@@ -71,8 +81,18 @@ class Storage
               "#{{"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)
-    DB.open "sqlite3://#{@path}" do |db|
+    get_db do |db|
      begin
        hash, token = db.query_one "select password, token from " \
                                   "users where username = (?)",
@@ -97,7 +117,7 @@ class Storage

  def verify_token(token)
    username = nil
-    DB.open "sqlite3://#{@path}" do |db|
+    get_db do |db|
      begin
        username = db.query_one "select username from users where " \
                                "token = (?)", token, as: String
@@ -110,7 +130,7 @@ class Storage

  def verify_admin(token)
    is_admin = false
-    DB.open "sqlite3://#{@path}" do |db|
+    get_db do |db|
      begin
        is_admin = db.query_one "select admin from users where " \
                                "token = (?)", token, as: Bool
@@ -123,7 +143,7 @@ class Storage

  def list_users
    results = Array(Tuple(String, Bool)).new
-    DB.open "sqlite3://#{@path}" do |db|
+    get_db do |db|
      db.query "select username, admin from users" do |rs|
        rs.each do
          results << {rs.read(String), rs.read(Bool)}
@@ -137,7 +157,7 @@ class Storage
    validate_username username
    validate_password password
    admin = (admin ? 1 : 0)
-    DB.open "sqlite3://#{@path}" do |db|
+    get_db do |db|
      hash = hash_password password
      db.exec "insert into users values (?, ?, ?, ?)",
        username, hash, nil, admin
@@ -148,7 +168,7 @@ class Storage
    admin = (admin ? 1 : 0)
    validate_username username
    validate_password password unless password.empty?
-    DB.open "sqlite3://#{@path}" do |db|
+    get_db do |db|
      if password.empty?
        db.exec "update users set username = (?), admin = (?) " \
                "where username = (?)",
@@ -163,13 +183,13 @@ class Storage
  end

  def delete_user(username)
-    DB.open "sqlite3://#{@path}" do |db|
+    get_db do |db|
      db.exec "delete from users where username = (?)", username
    end
  end

  def logout(token)
-    DB.open "sqlite3://#{@path}" do |db|
+    get_db do |db|
      begin
        db.exec "update users set token = (?) where token = (?)", nil, token
      rescue
@@ -178,18 +198,36 @@ class Storage
  end

  def get_id(path, is_title)
-    id = random_str
-    DB.open "sqlite3://#{@path}" do |db|
-      begin
-        id = db.query_one "select id from ids where path = (?)", path,
-          as: {String}
-      rescue
-        db.exec "insert into ids values (?, ?, ?)", path, id, is_title ? 1 : 0
-      end
+    id = nil
+    get_db do |db|
+      id = db.query_one? "select id from ids where path = (?)", path,
+        as: {String}
    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
--- a/src/util.cr
+++ b/src/util.cr
@@ -16,11 +16,11 @@ macro layout(name)
      is_admin = @context.storage.verify_admin token
    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.ecr", "src/views/layout.ecr"
+    render "src/views/message.html.ecr", "src/views/layout.html.ecr"
  end
 end

@@ -41,8 +41,6 @@ def send_json(env, json)
 end

 def send_attachment(env, path)
-  MIME.register ".cbz", "application/vnd.comicbook+zip"
-  MIME.register ".cbr", "application/vnd.comicbook-rar"
  send_file env, path, filename: File.basename(path), disposition: "attachment"
 end

@@ -139,7 +137,7 @@ macro render_xml(path)
 end

 macro render_component(filename)
-  render "src/views/components/#{{{filename}}}.ecr"
+  render "src/views/components/#{{{filename}}}.html.ecr"
 end

 # Works in all Unix systems. Follows https://github.com/crystal-lang/crystal/
@@ -154,3 +152,14 @@ def ctime(file_path : String) : Time
    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
--- a/src/views/admin.html.ecr
+++ b/src/views/admin.html.ecr
@@ -11,8 +11,9 @@
 </ul>

 <hr class="uk-divider-icon">
+<p class="uk-text-meta">Version: v<%= MANGO_VERSION %></p>
 <a class="uk-button uk-button-danger" href="<%= base_url %>logout">Log Out</a>

 <% content_for "script" do %>
-<script src="<%= base_url %>js/admin.js"></script>
-<% end %>
+  <script src="<%= base_url %>js/admin.js"></script>
+<% end %>
--- a/src/views/components/card.ecr
+++ b/src/views/components/card.ecr
@@ -1,49 +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 || 0.0 %>"
-  <% 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.not_nil! * 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 (item.is_a? Title && item.entries.size == 0) || progress.nil? %>
-        <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>
--- a/src/views/components/card.html.ecr
+++ b/src/views/components/card.html.ecr
@@ -0,0 +1,50 @@
+<% if item.is_a? NamedTuple(entry: Entry, percentage: Float64, grouped_count: Int32) %>
+  <% grouped_count = item[:grouped_count] %>
+  <% if grouped_count == 1 %>
+    <% item = item[:entry] %>
+  <% else %>
+    <% item = item[:entry].book %>
+  <% end %>
+<% else %>
+  <% grouped_count = 1 %>
+<% end %>
+
+<div class="item" data-mtime="<%= item.mtime.to_unix %>" data-progress="<%= progress %>" 
+  <% if item.is_a? Entry %> 
+    id="<%= item.id %>"
+  <% end %>>
+
+  <a class="acard" 
+    <% unless item.is_a? Entry %> 
+      href="<%= base_url %>book/<%= item.id %>" 
+    <% end %>>
+
+    <div class="uk-card uk-card-default" 
+      <% if item.is_a? Entry %> 
+        onclick="showModal(&quot;<%= item.encoded_path %>&quot;, '<%= item.pages %>', <%= (progress * 100).round(1) %>, &quot;<%= item.book.encoded_display_name %>&quot;, &quot;<%= item.encoded_display_name %>&quot;, '<%= item.title_id %>', '<%= item.id %>')" 
+      <% end %>>
+
+      <div class="uk-card-media-top">
+        <img data-src="<%= item.cover_url %>" data-width data-height alt="" uk-img>
+      </div>
+
+      <div class="uk-card-body">
+        <% unless progress < 0 || progress > 100 %>
+          <div class="uk-card-badge uk-label"><%= (progress * 100).round(1) %>%</div>
+        <% end %>
+
+        <h3 class="uk-card-title break-word" data-title="<%= item.display_name.gsub("\"", "&quot;") %>"><%= item.display_name %></h3>
+        <% if item.is_a? Entry %>
+          <p><%= item.pages %> pages</p>
+        <% end %>
+        <% if item.is_a? Title %>
+          <% if grouped_count == 1 %>
+            <p><%= item.size %> entries</p>
+          <% else %>
+            <p><%= grouped_count %> new entries</p>
+          <% end %>
+        <% end %>
+      </div>
+    </div>
+  </a>
+</div>
--- a/src/views/components/entry-modal.html.ecr
+++ b/src/views/components/entry-modal.html.ecr
@@ -4,15 +4,16 @@
    <div class="uk-modal-header">
      <div>
        <% if page == "home" %>
-        <h4 class="uk-margin-remove-bottom"><a id="modal-title-link"></a></h4>
+          <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>
-          <% unless page == "home" %>
          &nbsp;
-          <% if is_admin %>
-          <a class="uk-icon-button" uk-icon="icon:pencil"></a>
-          <% end %>
+          <% 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>
@@ -21,13 +22,13 @@
    <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>
+      <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>
+      <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>
--- a/src/views/components/head.html.ecr
+++ b/src/views/components/head.html.ecr
@@ -4,7 +4,7 @@
  <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="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/css/uikit.min.css" />
+  <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>
--- a/src/views/components/sort-form.html.ecr
+++ b/src/views/components/sort-form.html.ecr
@@ -1,8 +1,8 @@
 <div class="uk-form-horizontal">
  <select class="uk-select" id="sort-select">
    <% hash.each do |k, v| %>
-    <option id="<%= k %>-up">▲ <%= v %></option>
-    <option id="<%= k %>-down">▼ <%= v %></option>
+      <option id="<%= k %>-up">▲ <%= v %></option>
+      <option id="<%= k %>-down">▼ <%= v %></option>
    <% end %>
  </select>
 </div>
--- a/src/views/download-manager.html.ecr
+++ b/src/views/download-manager.html.ecr
@@ -23,10 +23,10 @@
 </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 %>
+  <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 %>
--- a/src/views/download.html.ecr
+++ b/src/views/download.html.ecr
@@ -73,11 +73,11 @@
 </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 %>
+  <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 %>
--- a/src/views/home.ecr
+++ b/src/views/home.ecr
@@ -1,69 +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 %>
--- a/src/views/home.html.ecr
+++ b/src/views/home.html.ecr
@@ -0,0 +1,73 @@
+<%- if new_user && empty_library -%>
+
+  <div class="uk-container uk-text-center">
+    <i class="fas fa-plus" style="font-size: 80px;"></i>
+    <h2>Add your first manga</h2>
+    <p style="margin-bottom: 40px;">We can't find any files yet. Add some to your library and they'll appear here.</p>
+    <dl class="uk-description-list">
+      <dt style="font-weight: 500;">Current library path</dt>
+      <dd><code><%= Config.current.library_path %></code></dd>
+      <dt style="font-weight: 500;">Want to change your library path?</dt>
+      <dd>Update <code>config.yml</code> located at: <code><%= Config.current.path %></code></dd>
+      <dt style="font-weight: 500;">Can't see your files yet?</dt>
+      <dd>
+      You must wait <%= Config.current.scan_interval %> minutes for the library scan to complete
+      <% if is_admin %>
+        , or manually re-scan from <a href="<%= base_url %>admin">Admin</a>
+      <% end %>.
+      </dd>
+    </dl>
+  </div>
+
+<%- elsif new_user && empty_library == false -%>
+
+  <div class="uk-container uk-text-center">
+    <i class="fas fa-book-open" style="font-size: 80px;"></i>
+    <h2>Read your first manga</h2>
+    <p>Once you start reading, Mango will remember where you left off
+    and show your entries here.</p>
+    <a href="<%= base_url %>library" class="uk-button uk-button-default">View library</a>
+  </div>
+
+<%- elsif new_user == false && empty_library == false -%>
+
+  <%- if continue_reading.empty? && recently_added.empty? -%>
+    <div class="uk-container uk-text-center">
+      <img src="<%= base_url %>img/banner.png" style="max-width: 400px; padding: 0 20px;">
+      <p>A self-hosted manga server and reader</p>
+      <a href="<%= base_url %>library" class="uk-button uk-button-default">View library</a>
+    </div>
+  <%- end -%>
+
+  <%- unless continue_reading.empty? -%>
+    <h2 class="uk-title home-headings">Continue Reading</h2>
+    <div id="item-container-continue" class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
+      <%- continue_reading.each do |cr| -%>
+        <% item = cr[:entry] %>
+        <% progress = cr[:percentage] %>
+        <%= render_component "card" %>
+      <%- end -%>
+    </div>
+  <%- end -%>
+
+  <%- unless recently_added.empty? -%>
+    <h2 class="uk-title home-headings">Recently Added</h2>
+    <div id="item-container-continue" class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
+      <%- recently_added.each do |ra| -%>
+        <% item = ra %>
+        <% progress = ra[:percentage] %>
+        <%= render_component "card" %>
+      <%- end -%>
+    </div>
+  <%- end -%>
+
+  <%= render_component "entry-modal" %>
+
+<%- end -%>
+
+<% content_for "script" do %>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery.dotdotdot/4.0.11/dotdotdot.js"></script>
+  <script src="<%= base_url %>js/dots.js"></script>
+  <script src="<%= base_url %>js/alert.js"></script>
+  <script src="<%= base_url %>js/title.js"></script>
+<% end %>
--- a/src/views/layout.ecr
+++ b/src/views/layout.ecr
@@ -1,68 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<%= render_component "head" %>
-
-<body>
-  <div class="uk-offcanvas-content">
-    <div class="uk-navbar-container uk-navbar-transparent" uk-navbar="uk-navbar">
-      <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="<%= base_url %>library">Library</a></li>
-            <% if is_admin %>
-            <li><a href="<%= base_url %>admin">Admin</a></li>
-            <li><a href="<%= base_url %>download">Download</a></li>
-            <% end %>
-            <hr uk-divider>
-            <li><a onclick="toggleTheme()"><i class="fas fa-adjust"></i></a></li>
-            <li><a href="<%= base_url %>logout">Logout</a></li>
-          </ul>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div class="uk-position-top">
-    <div class="uk-navbar-container uk-navbar-transparent" uk-navbar="uk-navbar">
-      <div class="uk-navbar-left uk-hidden@s">
-        <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>
-        <ul class="uk-navbar-nav">
-          <li><a href="<%= base_url %>">Home</a></li>
-          <li><a href="<%= base_url %>library">Library</a></li>
-          <% if is_admin %>
-          <li><a href="<%= base_url %>admin">Admin</a></li>
-          <li><a href="<%= base_url %>download">Download</a></li>
-          <% end %>
-        </ul>
-      </div>
-      <div class="uk-navbar-right uk-visible@s">
-        <ul class="uk-navbar-nav">
-          <li><a onclick="toggleTheme()"><i class="fas fa-adjust"></i></a></li>
-          <li><a href="<%= base_url %>logout">Logout</a></li>
-        </ul>
-      </div>
-    </div>
-  </div>
-  <div class="uk-section uk-section-small">
-  </div>
-  <div class="uk-section uk-section-small">
-    <div class="uk-container uk-container-small">
-      <div id="alert"></div>
-      <%= content %>
-    </div>
-  </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>
--- a/src/views/layout.html.ecr
+++ b/src/views/layout.html.ecr
@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<html>
+
+  <%= render_component "head" %>
+
+  <body>
+    <div class="uk-offcanvas-content">
+      <div class="uk-navbar-container uk-navbar-transparent" uk-navbar="uk-navbar">
+        <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="<%= base_url %>library">Library</a></li>
+              <% if is_admin %>
+                <li><a href="<%= base_url %>admin">Admin</a></li>
+                <li><a href="<%= base_url %>download">Download</a></li>
+              <% end %>
+              <hr uk-divider>
+              <li><a onclick="toggleTheme()"><i class="fas fa-adjust"></i></a></li>
+              <li><a href="<%= base_url %>logout">Logout</a></li>
+            </ul>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="uk-position-top">
+      <div class="uk-navbar-container uk-navbar-transparent" uk-navbar="uk-navbar">
+        <div class="uk-navbar-left uk-hidden@s">
+          <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>
+          <ul class="uk-navbar-nav">
+            <li><a href="<%= base_url %>">Home</a></li>
+            <li><a href="<%= base_url %>library">Library</a></li>
+            <% if is_admin %>
+              <li><a href="<%= base_url %>admin">Admin</a></li>
+              <li><a href="<%= base_url %>download">Download</a></li>
+            <% end %>
+          </ul>
+        </div>
+        <div class="uk-navbar-right uk-visible@s">
+          <ul class="uk-navbar-nav">
+            <li><a onclick="toggleTheme()"><i class="fas fa-adjust"></i></a></li>
+            <li><a href="<%= base_url %>logout">Logout</a></li>
+          </ul>
+        </div>
+      </div>
+    </div>
+    <div class="uk-section uk-section-small">
+    </div>
+    <div class="uk-section uk-section-small">
+      <div class="uk-container uk-container-small">
+        <div id="alert"></div>
+        <%= content %>
+      </div>
+    </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>
--- a/src/views/library.html.ecr
+++ b/src/views/library.html.ecr
@@ -18,14 +18,14 @@
 </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" %>
+    <% 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>
+  <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 %>
--- a/src/views/login.ecr
+++ b/src/views/login.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>
--- a/src/views/login.html.ecr
+++ b/src/views/login.html.ecr
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+
+  <%= render_component "head" %>
+
+  <body>
+    <div class="uk-section uk-flex uk-flex-middle uk-animation-fade" uk-height-viewport="">
+      <div class="uk-width-1-1">
+        <div class="uk-container">
+          <div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid="">
+            <div class="uk-width-1-1@m">
+              <div class="uk-margin uk-width-large uk-margin-auto uk-card uk-card-default uk-card-body uk-box-shadow-large">
+                <h3 class="uk-card-title uk-text-center">Log In</h3>
+                <form action="<%= base_url %>login" method="post">
+                  <div class="uk-margin">
+                    <div class="uk-inline uk-width-1-1"><span class="uk-form-icon" uk-icon="icon:user"></span><input class="uk-input uk-form-large" type="text" name="username"></div>
+                  </div>
+                  <div class="uk-margin">
+                    <div class="uk-inline uk-width-1-1"><span class="uk-form-icon" uk-icon="icon:lock"></span><input class="uk-input uk-form-large" type="password" name="password"></div>
+                  </div>
+                  <div class="uk-margin"><button class="uk-button uk-button-primary uk-button-large uk-width-1-1">Login</button></div>
+                </form>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <script>
+      setTheme(getTheme());
+    </script>
+    <script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit-icons.min.js"></script>
+  </body>
+
+</html>
--- a/src/views/message.ecr
+++ b/src/views/message.ecr
@@ -1 +0,0 @@
-<p class="uk-text-lead uk-text-center"><%= message %></p>
--- a/src/views/message.html.ecr
+++ b/src/views/message.html.ecr
@@ -0,0 +1 @@
+<p class="uk-text-lead uk-text-center"><%= message %></p>
--- a/src/views/opds/index.xml.ecr
+++ b/src/views/opds/index.xml.ecr
@@ -13,10 +13,10 @@
  </author>

  <% titles.each do |t| %>
-  <entry>
-    <title><%= t.display_name %></title>
-    <id>urn:mango:<%= t.id %></id>
-    <link type="application/atom+xml;profile=opds-catalog;kind=navigation" rel="subsection" href="<%= base_url %>opds/book/<%= t.id %>" />
-  </entry>
+    <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>
--- a/src/views/opds/title.ecr
+++ b/src/views/opds/title.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><%= title.display_name %></title>
-
-  <author>
-    <name>Mango</name>
-    <uri>https://github.com/hkalexling/Mango</uri>
-  </author>
-
-  <% title.titles.each do |t| %>
-  <entry>
-    <title><%= t.display_name %></title>
-    <id>urn:mango:<%= t.id %></id>
-    <link type="application/atom+xml;profile=opds-catalog;kind=navigation" rel="subsection" href="<%= base_url %>opds/book/<%= t.id %>" />
-  </entry>
-  <% end %>
-
-  <% title.entries.each do |e| %>
-  <entry>
-    <title><%= e.display_name %></title>
-    <id>urn:mango:<%= e.id %></id>
-
-    <link rel="http://opds-spec.org/image" href="<%= e.cover_url %>" />
-    <link rel="http://opds-spec.org/image/thumbnail" href="<%= e.cover_url %>" />
-
-    <link rel="http://opds-spec.org/acquisition" href="<%= base_url %>opds/download/<%= e.title_id %>/<%= e.id %>" title="Read" type="<%= MIME.from_filename e.zip_path %>" />
-
-    <link type="text/html" rel="alternate" title="Read in Mango" href="<%= base_url %>reader/<%= e.title_id %>/<%= e.id %>" />
-    <link type="text/html" rel="alternate" title="Open in Mango" href="<%= base_url %>book/<%= e.title_id %>" />
-  </entry>
-  <% end %>
-
-</feed>
--- a/src/views/opds/title.xml.ecr
+++ b/src/views/opds/title.xml.ecr
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+  <id>urn:mango:<%= title.id %></id>
+
+  <link rel="self" href="<%= base_url %>opds/book/<%= title.id %>" type="application/atom+xml;profile=opds-catalog;kind=navigation" />
+  <link rel="start" href="<%= base_url %>opds/" type="application/atom+xml;profile=opds-catalog;kind=navigation" />
+
+  <title><%= 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>
--- a/src/views/reader.ecr
+++ b/src/views/reader.ecr
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html class="reader-bg">
-
-<%= render_component "head" %>
-
-<body>
-  <script src="<%= base_url %>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| -%>
-      <img class="uk-align-center" data-src="<%= url %>" data-width data-height uk-img id="<%= reader_urls[i] %>" onclick="showControl(<%= pages.to_a[i] %>);">
-      <%- end -%>
-      <%- if next_url -%>
-      <a class="next-url" href="<%= next_url %>"></a>
-      <%- end -%>
-    </div>
-    <%- if next_entry_url -%>
-    <button id="next-btn" class="uk-align-center uk-button uk-button-primary" hidden onclick="redirect('<%= next_entry_url %>')">Next Entry</button>
-    <%- else -%>
-    <button id="next-btn" class="uk-align-center uk-button uk-button-primary" hidden onclick="redirect('<%= exit_url %>')">Exit Reader</button>
-    <%- end -%>
-  </div>
-
-  <div id="hidden" hidden></div>
-
-  <div id="modal-sections" class="uk-flex-top" uk-modal>
-    <div class="uk-modal-dialog uk-margin-auto-vertical">
-      <button class="uk-modal-close-default" type="button" uk-close></button>
-      <div class="uk-modal-header">
-        <h3 class="uk-modal-title">Options</h3>
-      </div>
-      <div class="uk-modal-body">
-        <div class="uk-margin">
-          <p id="progress-label"></p>
-        </div>
-        <div class="uk-margin">
-          <label class="uk-form-label" for="form-stacked-select">Jump to page</label>
-          <div class="uk-form-controls">
-            <select id="page-select" class="uk-select">
-              <%- (1..entry.pages).each do |p| -%>
-              <option value="<%= p %>"><%= p %></option>
-              <%- end -%>
-            </select>
-          </div>
-        </div>
-      </div>
-      <div class="uk-modal-footer uk-text-right">
-        <button class="uk-button uk-button-danger" type="button" onclick="redirect('<%= exit_url %>')">Exit Reader</button>
-      </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="<%= base_url %>js/reader.js"></script>
-</body>
-
-</html>
--- a/src/views/reader.html.ecr
+++ b/src/views/reader.html.ecr
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html class="reader-bg">
+
+  <%= render_component "head" %>
+
+  <body>
+    <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| -%>
+          <img class="uk-align-center" data-src="<%= url %>" data-width data-height uk-img id="<%= reader_urls[i] %>" onclick="showControl(<%= pages.to_a[i] %>);">
+        <%- end -%>
+        <%- if next_url -%>
+          <a class="next-url" href="<%= next_url %>"></a>
+        <%- end -%>
+      </div>
+      <%- if next_entry_url -%>
+        <button id="next-btn" class="uk-align-center uk-button uk-button-primary" hidden onclick="redirect('<%= next_entry_url %>')">Next Entry</button>
+      <%- else -%>
+        <button id="next-btn" class="uk-align-center uk-button uk-button-primary" hidden onclick="redirect('<%= exit_url %>')">Exit Reader</button>
+      <%- end -%>
+    </div>
+
+    <div id="hidden" hidden></div>
+
+    <div id="modal-sections" class="uk-flex-top" uk-modal>
+      <div class="uk-modal-dialog uk-margin-auto-vertical">
+        <button class="uk-modal-close-default" type="button" uk-close></button>
+        <div class="uk-modal-header">
+          <h3 class="uk-modal-title break-word"><%= entry.display_name %></h3>
+          <p class="uk-text-meta uk-margin-remove-bottom break-word"><%= entry.zip_path %></p>
+        </div>
+        <div class="uk-modal-body">
+          <div class="uk-margin">
+            <p id="progress-label"></p>
+          </div>
+          <div class="uk-margin">
+            <label class="uk-form-label" for="form-stacked-select">Jump to page</label>
+            <div class="uk-form-controls">
+              <select id="page-select" class="uk-select">
+                <%- (1..entry.pages).each do |p| -%>
+                  <option value="<%= p %>"><%= p %></option>
+                <%- end -%>
+              </select>
+            </div>
+          </div>
+        </div>
+        <div class="uk-modal-footer uk-text-right">
+          <button class="uk-button uk-button-danger" type="button" onclick="redirect('<%= exit_url %>')">Exit Reader</button>
+        </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="<%= base_url %>js/reader.js"></script>
+  </body>
+
+</html>
--- a/src/views/title.html.ecr
+++ b/src/views/title.html.ecr
@@ -2,14 +2,14 @@
  <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>
+      <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>
+    <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>
@@ -33,12 +33,12 @@
 </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 = nil %>
-  <%= render_component "card" %>
+    <% progress = title_percentage[i] %>
+    <%= render_component "card" %>
  <% end %>
  <% title.entries.each_with_index do |item, i| %>
-  <% progress = percentage[i] %>
-  <%= render_component "card" %>
+    <% progress = percentage[i] %>
+    <%= render_component "card" %>
  <% end %>
 </div>

@@ -72,7 +72,7 @@
                <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">
+                  <input type="file" accept="<%= SUPPORTED_IMG_TYPES.join ", " %>">
                  <span class="uk-link">selecting one</span>
                </div>
              </div>
@@ -85,8 +85,8 @@
      <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>
+        <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>
@@ -94,10 +94,10 @@
 </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>
+  <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 %>
--- a/src/views/user-edit.ecr
+++ b/src/views/user-edit.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>
-
-  <%- 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="<%= base_url %>js/alert.js"></script>
-<script src="<%= base_url %>js/user-edit.js"></script>
-<% end %>
--- a/src/views/user-edit.html.ecr
+++ b/src/views/user-edit.html.ecr
@@ -0,0 +1,46 @@
+<form action="<%= base_url %>admin/user/edit" method="post" accept-charset="utf-8">
+
+  <div class="uk-margin">
+    <label class="uk-form-label" for="form-stacked-text">Username</label>
+    <input class="uk-input" type="text" name="username" <%- if username -%> value=<%= username %> <%- end -%>>
+  </div>
+  <%- if new_user -%>
+    <div class="uk-margin">
+      <label class="uk-form-label" for="form-stacked-text">Password</label>
+      <input class="uk-input" type="password" name="password">
+    </div>
+  <%- end -%>
+  <div class="uk-margin">
+    <label class="uk-form-label" for="form-stacked-text">Admin Access</label>
+    <input class="uk-checkbox" type="checkbox" name="admin" <%- if admin == true -%> checked <%- end -%>>
+  </div>
+
+  <%- unless new_user -%>
+    <div>
+      <button class="uk-button uk-button-default" type="button" uk-toggle="target: #change-password">Change Password</button>
+      <div id="change-password" class="uk-margin" hidden>
+        <label class="uk-form-label" for="form-stacked-text">New Password</label>
+        <input class="uk-input" type="password" name="password">
+      </div>
+    </div>
+  <%- end -%>
+
+  <hr class="uk-divider-icon">
+
+  <input type="submit" value="Save" class="uk-button uk-button-primary">
+</form>
+
+<% content_for "script" do %>
+  <script>
+    var username;
+    var error;
+    <%- if !new_user -%>
+      username = '/<%= username %>';
+    <%- end -%>
+      <%- if error -%>
+        error = '<%= error %>';
+      <%- end -%>
+  </script>
+  <script src="<%= base_url %>js/alert.js"></script>
+  <script src="<%= base_url %>js/user-edit.js"></script>
+<% end %>
--- a/src/views/user.ecr
+++ b/src/views/user.ecr
@@ -1,31 +0,0 @@
-<table class="uk-table uk-table-divider">
-  <thead>
-    <tr>
-      <th>Username</th>
-      <th>Admin Access</th>
-      <th>Actions</th>
-    </tr>
-  </thead>
-  <tbody>
-    <%- users.each do |u| -%>
-    <tr>
-      <td><%= u[0] %></td>
-      <td><%= u[1] %></td>
-      <td>
-        <a href="<%= 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 %>
--- a/src/views/user.html.ecr
+++ b/src/views/user.html.ecr
@@ -0,0 +1,31 @@
+<table class="uk-table uk-table-divider">
+  <thead>
+    <tr>
+      <th>Username</th>
+      <th>Admin Access</th>
+      <th>Actions</th>
+    </tr>
+  </thead>
+  <tbody>
+    <%- users.each do |u| -%>
+      <tr>
+        <td><%= u[0] %></td>
+        <td><%= u[1] %></td>
+        <td>
+          <a href="<%= base_url %>admin/user/edit?username=<%= u[0] %>&admin=<%= u[1] %>" uk-icon="file-edit"></a>
+          <%- if u[0] != username %>
+            <a href="#" onclick="remove('<%= u[0] %>');return false;" uk-icon="trash"></a>
+          <%- end %>
+        </td>
+      </tr>
+    <%- end -%>
+  </tbody>
+</table>
+
+<a href="<%= base_url %>admin/user/edit" class="uk-button uk-button-primary">New User</a>
+
+
+<% content_for "script" do %>
+  <script src="<%= base_url %>js/alert.js"></script>
+  <script src="<%= base_url %>js/user.js"></script>
+<% end %>
Author	SHA1	Message	Date
Alex Ling	466aee62fe	Bump version to v0.7.2	2020-07-01 14:15:29 +00:00
Alex Ling	eab0800376	Improve scan performance (#79 )	2020-07-01 14:01:26 +00:00
Alex Ling	1725f42698	Use `HTML.escape` to escape XML	2020-07-01 13:27:30 +00:00
Alex Ling	f5cdf8b7b6	Explicitly register supported mime types (#82 )	2020-07-01 13:21:14 +00:00
Alex Ling	fe082e7537	Escape illegal characters in XML (#82 )	2020-06-30 16:46:47 +00:00
Alex Ling	c87b96dd0b	Improve performance for library and title pages	2020-06-24 16:29:34 +00:00
Alex Ling	9d76ca8c24	Improve home page loading time (#81 )	2020-06-24 15:52:26 +00:00
Alex Ling	5f21653e07	Bump version to v0.7.1	2020-06-20 16:25:14 +00:00
Alex Ling	0035cd9177	Revert "Upgrade Crystal to 0.35.1" Kemal is having some issues in 0.35.0: https://github.com/kemalcr/kemal/issues/575	2020-06-20 16:24:01 +00:00
Alex Ling	899b221842	Merge branch 'dev'	2020-06-20 13:50:37 +00:00
Alex Ling	a317086f81	Bump version to v0.7.0	2020-06-20 13:39:14 +00:00
Alex Ling	b83313b231	Set recently added group range to 1 day	2020-06-20 13:12:13 +00:00
Alex Ling	62af879bfa	Upgrade Crystal to 0.35.1	2020-06-20 13:12:13 +00:00
Alex Ling	96f98f6c78	Rename and format ECR files	2020-06-19 11:34:03 +00:00
Alex Ling	841d5051cb	Copy robots.txt to dist/ in gulpfile	2020-06-18 15:09:18 +00:00
Alex Ling	0768e2177b	Bring back original behavior for recently added (#37 https://github.com/hkalexling/Mango/issues/37#issuecomment-644748066)	2020-06-17 16:17:29 +00:00
Alex Ling	0e4d67cf29	Hide the progress badge with incorrect value	2020-06-17 16:16:35 +00:00
Alex Ling	00fcc881ee	Start from page 1 if the entry has been completed (#71)	2020-06-16 06:17:52 +00:00
Alex Ling	ca8d9efcfd	Show entry display name and path in reader modal (#71)	2020-06-16 06:06:32 +00:00
Alex Ling	0e7be6392d	Fix incorrect modal colors on the reader page	2020-06-16 06:06:32 +00:00
Alex Ling	4af5258602	Show Mango version on the admin page (#71 )	2020-06-16 05:26:34 +00:00
Alex Ling	23c6256552	Merge branch 'feature/color-label' into dev	2020-06-16 05:16:27 +00:00
Alex Ling	ef0e3fd346	Add color to labels in dark mode (#70 )	2020-06-16 05:15:39 +00:00
Alex Ling	b70fad13a7	Restrict "recently added" from 3 months to 1	2020-06-15 14:54:28 +00:00
Alex Ling	d2f9735250	Add space between entry title and button in modal	2020-06-15 14:53:16 +00:00
Alex Ling	06d6311080	Display book percentage in "recently added"	2020-06-15 14:32:37 +00:00
Alex Ling	674da55bde	Add entry download button (#45 )	2020-06-15 12:54:42 +00:00
Alex Ling	dc084aff7c	Support webp (#69 , nice)	2020-06-15 12:35:44 +00:00
Alex Ling	4c2cf64f53	Limit `load_progress` to `@pages`	2020-06-15 12:34:51 +00:00
Alex Ling	f4c4bb536c	Include nested entries in continue reading	2020-06-15 12:10:31 +00:00
Alex Ling	47edb3008b	Refactor `get_recently_added_entries`	2020-06-15 12:09:17 +00:00
Alex Ling	e28dadc94e	Add `started?` and `deep_titles` helper methods	2020-06-15 12:05:59 +00:00
Alex Ling	3dc9bd2264	Add `finished?` helper method	2020-06-15 09:48:41 +00:00
Alex Ling	9302601307	Move relevant methods from `Title` to `Entry`	2020-06-13 15:54:55 +00:00
Alex Ling	650ba98039	Merge pull request #67 from flying-sausages/patch-1 Added Use-case to Feature Request template	2020-06-11 22:45:02 +08:00
flying-sausages	bb2173788b	Added Use-case to Feature Request template	2020-06-11 14:14:41 +01:00
Alex Ling	c8be2849b9	Show progress for titles and nested titles	2020-06-11 12:36:25 +00:00
Alex Ling	aa269f26ee	Fix incorrect breadcrumb menu order	2020-06-11 12:34:13 +00:00
Alex Ling	5c26b0d6dc	Handle nested titles in the recently added section	2020-06-11 10:03:34 +00:00
Alex Ling	c9d3c35bdd	Add robots.txt	2020-06-09 15:48:08 +00:00
				`@@ -1 +0,0 @@`
				`<p class="uk-text-lead uk-text-center"><%= message %></p>`
				`@@ -0,0 +1 @@`
				`<p class="uk-text-lead uk-text-center"><%= message %></p>`