Bump version to v0.7.1

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

.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.

.gitignore

@@ -9,3 +9,4 @@ dist
 mango
 .env
 *.md
+public/css/uikit.css

README.md

@@ -1,6 +1,3 @@
-
-
-
 ![banner](./public/img/banner-paddings.png)
 
 # Mango
@@ -10,6 +7,7 @@
 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 nested folders in library
@@ -18,6 +16,8 @@ Mango is a self-hosted manga server and reader. Its features include
 - 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
@@ -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.5.2
+  Mango - Manga Server and Web Reader. Version 0.7.1
 
   Usage:
 

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

package.json

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

public/js/download-manager.js

@@ -24,7 +24,9 @@ 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',
@@ -45,7 +47,9 @@ const remove = (id) => {
 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',
@@ -100,13 +104,15 @@ const load = () => {
 			$('#pause-resume-btn').text(btnText);
 			$('#pause-resume-btn').removeAttr('hidden');
 			const rows = data.jobs.map(obj => {
-			var cls = 'uk-label ';
+				var cls = 'label ';
+				if (obj.status === 'Pending')
+					cls += 'label-pending';
 				if (obj.status === 'Completed')
-				cls += 'uk-label-success';
+					cls += 'label-success';
 				if (obj.status === 'Error')
-				cls += 'uk-label-danger';
+					cls += 'label-danger';
 				if (obj.status === 'MissingPages')
-				cls += 'uk-label-warning';
+					cls += '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/theme.js

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

public/js/title.js

@@ -2,37 +2,42 @@ function showModal(encodedPath, pages, percentage, encodedeTitle, encodedEntryTi
 	const zipPath = decodeURIComponent(encodedPath);
 	const title = decodeURIComponent(encodedeTitle);
 	const entry = decodeURIComponent(encodedEntryTitle);
-	$('#modal button, #modal a').each(function(){
+	$('#modal button, #modal a').each(function() {
 		$(this).removeAttr('hidden');
 	});
 	if (percentage === 0) {
 		$('#continue-btn').attr('hidden', '');
 		$('#unread-btn').attr('hidden', '');
-	}
+	} else if (percentage === 100) {
-	else {
+		$('#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}`);
-	$('#modal-title').find('span').text(entry);
+
-	$('#modal-title').next().attr('data-id', titleID);
+	$('#modal-entry-title').find('span').text(entry);
-	$('#modal-title').next().attr('data-entry-id', entryID);
+	$('#modal-entry-title').next().attr('data-id', titleID);
-	$('#modal-title').next().find('.title-rename-field').val(entry);
+	$('#modal-entry-title').next().attr('data-entry-id', entryID);
+	$('#modal-entry-title').next().find('.title-rename-field').val(entry);
 	$('#path-text').text(zipPath);
 	$('#pages-text').text(pages + ' pages');
 
 	$('#beginning-btn').attr('href', `${base_url}reader/${titleID}/${entryID}/1`);
 	$('#continue-btn').attr('href', `${base_url}reader/${titleID}/${entryID}`);
 
-	$('#read-btn').click(function(){
+	$('#read-btn').click(function() {
 		updateProgress(titleID, entryID, pages);
 	});
-	$('#unread-btn').click(function(){
+	$('#unread-btn').click(function() {
 		updateProgress(titleID, entryID, 0);
 	});
 
-	$('.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();
@@ -40,14 +45,15 @@ function showModal(encodedPath, pages, percentage, encodedeTitle, encodedEntryTi
 
 const updateProgress = (tid, eid, page) => {
 	let url = `${base_url}api/progress/${tid}/${page}`
-	const query = $.param({entry: eid});
+	const query = $.param({
+		entry: eid
+	});
 	if (eid)
 		url += `?${query}`;
 	$.post(url, (data) => {
 		if (data.success) {
 			location.reload();
-		}
+		} else {
-		else {
 			error = data.error;
 			alert('danger', error);
 		}
@@ -65,7 +71,9 @@ const renameSubmit = (name, eid) => {
 		return;
 	}
 
-	const query = $.param({ entry: eid });
+	const query = $.param({
+		entry: eid
+	});
 	let url = `${base_url}api/admin/display_name/${titleId}/${name}`;
 	if (eid)
 		url += `?${query}`;
@@ -98,8 +106,7 @@ 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');
 	}
 
@@ -126,7 +133,9 @@ const setupUpload = (eid) => {
 	const upload = $('.upload-field');
 	const bar = $('#upload-progress').get(0);
 	const titleId = upload.attr('data-title-id');
-	const queryObj = {title: titleId};
+	const queryObj = {
+		title: titleId
+	};
 	if (eid)
 		queryObj['entry'] = eid;
 	const query = $.param(queryObj);

public/robots.txt

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

shard.lock

@@ -28,6 +28,10 @@ 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.5.2
+version: 0.7.1
 
 authors:
   - Alex Ling <hkalexling@gmail.com>
@@ -15,6 +15,8 @@ license: MIT
 dependencies:
   kemal:
     github: kemalcr/kemal
+  kemal-session:
+    github: kemalcr/kemal-session
   sqlite3:
     github: crystal-lang/crystal-sqlite3
   baked_file_system:

spec/rename_spec.cr

@@ -68,4 +68,9 @@ describe Rule do
       .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

src/assets/uikit.less

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

src/config.cr

@@ -3,8 +3,11 @@ 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
@@ -43,6 +46,7 @@ class Config
     if File.exists? cfg_path
       config = self.from_yaml File.read cfg_path
       config.preprocess
+      config.path = path
       config.fill_defaults
       return config
     end
@@ -53,6 +57,7 @@ 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

src/handlers/auth_handler.cr

@@ -3,25 +3,90 @@ 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 call(env)
+  def require_basic_auth(env)
-    return call_next(env) if request_path_startswith env, ["/login", "/logout"]
+    env.response.status_code = 401
-
+    env.response.headers["WWW-Authenticate"] = HEADER_LOGIN_REQUIRED
-    cookie = env.request.cookies.find do |c|
+    env.response.print AUTH_MESSAGE
-      c.name == "token-#{Config.current.port}"
+    call_next env
   end
-    if cookie.nil? || !@storage.verify_token cookie.value
+
+  def validate_token(env)
+    token = env.session.string? "token"
+    !token.nil? && @storage.verify_token token
+  end
+
+  def validate_token_admin(env)
+    token = env.session.string? "token"
+    !token.nil? && @storage.verify_admin token
+  end
+
+  def validate_auth_header(env)
+    if env.request.headers[AUTH]?
+      if value = env.request.headers[AUTH]
+        if value.size > 0 && value.starts_with?(BASIC)
+          token = verify_user value
+          return false if token.nil?
+
+          env.session.string "token", token
+          return true
+        end
+      end
+    end
+    false
+  end
+
+  def verify_user(value)
+    username, password = Base64.decode_string(value[BASIC.size + 1..-1])
+      .split(":")
+    @storage.verify_user username, password
+  end
+
+  def handle_opds_auth(env)
+    if validate_token(env) || validate_auth_header(env)
+      call_next env
+    else
+      env.response.status_code = 401
+      env.response.headers["WWW-Authenticate"] = HEADER_LOGIN_REQUIRED
+      env.response.print AUTH_MESSAGE
+    end
+  end
+
+  def handle_auth(env)
+    if request_path_startswith(env, ["/login", "/logout"]) ||
+       requesting_static_file env
+      return call_next(env)
+    end
+
+    unless validate_token env
+      env.session.string "callback", env.request.path
       return redirect env, "/login"
     end
 
     if request_path_startswith env, ["/admin", "/api/admin", "/download"]
-      unless @storage.verify_admin cookie.value
+      unless validate_token_admin env
         env.response.status_code = 403
       end
     end
 
     call_next env
   end
+
+  def call(env)
+    if request_path_startswith env, ["/opds"]
+      handle_opds_auth env
+    else
+      handle_auth env
+    end
+  end
 end

src/handlers/static_handler.cr

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

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
@@ -27,7 +29,7 @@ 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
@@ -72,7 +74,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|
@@ -87,6 +89,86 @@ class Entry
     end
     img
   end
+
+  def next_entry
+    idx = @book.entries.index self
+    return nil if idx.nil? || idx == @book.entries.size - 1
+    @book.entries[idx + 1]
+  end
+
+  def previous_entry
+    idx = @book.entries.index self
+    return nil if idx.nil? || idx == 0
+    @book.entries[idx - 1]
+  end
+
+  def date_added
+    date_added = nil
+    TitleInfo.new @book.dir do |info|
+      info_da = info.date_added[@title]?
+      if info_da.nil?
+        date_added = info.date_added[@title] = ctime @zip_path
+        info.save
+      else
+        date_added = info_da
+      end
+    end
+    date_added.not_nil! # is it ok to set not_nil! here?
+  end
+
+  # For backward backward compatibility with v0.1.0, we save entry titles
+  #   instead of IDs in info.json
+  def save_progress(username, page)
+    TitleInfo.new @book.dir do |info|
+      if info.progress[username]?.nil?
+        info.progress[username] = {@title => page}
+      else
+        info.progress[username][@title] = page
+      end
+      # save last_read timestamp
+      if info.last_read[username]?.nil?
+        info.last_read[username] = {@title => Time.utc}
+      else
+        info.last_read[username][@title] = Time.utc
+      end
+      info.save
+    end
+  end
+
+  def load_progress(username)
+    progress = 0
+    TitleInfo.new @book.dir do |info|
+      unless info.progress[username]?.nil? ||
+             info.progress[username][@title]?.nil?
+        progress = info.progress[username][@title]
+      end
+    end
+    [progress, @pages].min
+  end
+
+  def load_percentage(username)
+    page = load_progress username
+    page / @pages
+  end
+
+  def load_last_read(username)
+    last_read = nil
+    TitleInfo.new @book.dir do |info|
+      unless info.last_read[username]?.nil? ||
+             info.last_read[username][@title]?.nil?
+        last_read = info.last_read[username][@title]
+      end
+    end
+    last_read
+  end
+
+  def finished?(username)
+    load_progress(username) == @pages
+  end
+
+  def started?(username)
+    load_progress(username) > 0
+  end
 end
 
 class Title
@@ -175,6 +257,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
@@ -183,7 +276,7 @@ class Title
       ary << title
       tid = title.parent_id
     end
-    ary
+    ary.reverse
   end
 
   def size
@@ -263,7 +356,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
@@ -273,58 +366,40 @@ 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
+  def deep_read_page_count(username) : Int32
-  #   instead of IDs in info.json
+    entries.map { |e| e.load_progress username }.sum +
-  def save_progress(username, entry, page)
+      titles.map { |t| t.deep_read_page_count username }.flatten.sum
-    TitleInfo.new @dir do |info|
+  end
-      if info.progress[username]?.nil?
+
-        info.progress[username] = {entry => page}
+  def deep_total_page_count : Int32
+    entries.map { |e| e.pages }.sum +
+      titles.map { |t| t.deep_total_page_count }.flatten.sum
+  end
+
+  def load_percentage(username)
+    deep_read_page_count(username) / deep_total_page_count
+  end
+
+  def get_continue_reading_entry(username)
+    in_progress_entries = @entries.select do |e|
+      load_progress(username, e.title) > 0
+    end
+    return nil if in_progress_entries.empty?
+
+    latest_read_entry = in_progress_entries[-1]
+    if load_progress(username, latest_read_entry.title) ==
+         latest_read_entry.pages
+      next_entry latest_read_entry
     else
-        info.progress[username][entry] = page
+      latest_read_entry
     end
-      info.save
-    end
-  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_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
 
@@ -337,6 +412,8 @@ 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 = ""
@@ -403,6 +480,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
@@ -440,4 +521,79 @@ class Library
       end
     Logger.debug "Scan completed"
   end
+
+  def get_continue_reading_entries(username)
+    cr_entries = deep_titles
+      # For each Title, get the last read entry. If the user has finished
+      #   reading this entry, get the next entry
+      .map { |t|
+        last_read_entry = t.entries.reverse_each.find do |e|
+          e.started? username
+        end
+        if last_read_entry && last_read_entry.finished? username
+          last_read_entry = last_read_entry.next_entry
+        end
+        last_read_entry
+      }
+      # Select elements with type `Entry` from the array and ignore all `Nil`s
+      .select(Entry)
+      .map { |e|
+        # Get the last read time of the entry. If it hasn't been started, get
+        #   the last read time of the previous entry
+        last_read = e.load_last_read username
+        pe = e.previous_entry
+        if last_read.nil? && pe
+          last_read = pe.load_last_read username
+        end
+        {
+          entry:      e,
+          percentage: e.load_percentage(username),
+          last_read:  last_read,
+        }
+      }
+
+    # Sort by by last_read, most recent first (nils at the end)
+    cr_entries.sort { |a, b|
+      next 0 if a[:last_read].nil? && b[:last_read].nil?
+      next 1 if a[:last_read].nil?
+      next -1 if b[:last_read].nil?
+      b[:last_read].not_nil! <=> a[:last_read].not_nil!
+    }[0..11]
+  end
+
+  alias RA = NamedTuple(
+    entry: Entry,
+    percentage: Float64,
+    grouped_count: Int32)
+
+  def get_recently_added_entries(username)
+    recently_added = [] of RA
+
+    titles.map { |t| t.deep_entries }
+      .flatten
+      .select { |e| e.date_added > 1.month.ago }
+      .sort { |a, b| b.date_added <=> a.date_added }
+      .each do |e|
+        last = recently_added.last?
+        if last && e.title_id == last[:entry].title_id &&
+           (e.date_added - last[:entry].date_added).duration < 1.day
+          # A NamedTuple is immutable, so we have to cast it to a Hash first
+          last_hash = last.to_h
+          count = last_hash[:grouped_count].as(Int32)
+          last_hash[:grouped_count] = count + 1
+          # Setting the percentage to a negative value will hide the
+          #   percentage badge on the card
+          last_hash[:percentage] = -1.0
+          recently_added[recently_added.size - 1] = RA.from last_hash
+        else
+          recently_added << {
+            entry:         e,
+            percentage:    e.load_percentage(username),
+            grouped_count: 1,
+          }
+        end
+      end
+
+    recently_added[0..11]
+  end
 end

src/mango.cr

@@ -4,7 +4,7 @@ require "./mangadex/*"
 require "option_parser"
 require "clim"
 
-MANGO_VERSION = "0.5.2"
+MANGO_VERSION = "0.7.1"
 
 macro common_option
   option "-c PATH", "--config=PATH", type: String,

src/rename.cr

@@ -129,13 +129,19 @@ module Rename
     end
 
     def render(hash : VHash)
-      @ary.map do |e|
+      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/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

src/routes/main.cr

@@ -4,15 +4,12 @@ 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|
       begin
-        cookie = env.request.cookies.find do |c|
+        env.session.delete_string "token"
-          c.name == "token-#{Config.current.port}"
-        end.not_nil!
-        @context.storage.logout cookie.value
       rescue e
         @context.error "Error when attempting to log out: #{e}"
       ensure
@@ -26,22 +23,26 @@ class MainRouter < Router
         password = env.params.body["password"]
         token = @context.storage.verify_user(username, password).not_nil!
 
-        cookie = HTTP::Cookie.new "token-#{Config.current.port}", token
+        env.session.string "token", token
-        cookie.path = Config.current.base_url
+
-        cookie.expires = Time.local.shift years: 1
+        callback = env.session.string? "callback"
-        env.response.cookies << cookie
+        if callback
+          env.session.delete_string "callback"
+          redirect env, callback
+        else
           redirect env, "/"
+        end
       rescue
         redirect env, "/login"
       end
     end
 
-    get "/" do |env|
+    get "/library" do |env|
       begin
         titles = @context.library.titles
         username = get_username env
-        percentage = titles.map &.load_percetage username
+        percentage = titles.map &.load_percentage username
-        layout "index"
+        layout "library"
       rescue e
         @context.error e
         env.response.status_code = 500
@@ -52,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|
+        percentage = title.entries.map &.load_percentage username
-          title.load_percetage username, e.title
+        title_percentage = title.titles.map &.load_percentage username
-        }
         layout "title"
       rescue e
         @context.error e
@@ -66,5 +66,21 @@ class MainRouter < Router
       mangadex_base_url = Config.current.mangadex["base_url"]
       layout "download"
     end
+
+    get "/" do |env|
+      begin
+        username = get_username env
+        continue_reading = @context
+          .library.get_continue_reading_entries username
+        recently_added = @context.library.get_recently_added_entries username
+        titles = @context.library.titles
+        new_user = !titles.any? { |t| t.load_percentage(username) > 0 }
+        empty_library = titles.size == 0
+        layout "home"
+      rescue e
+        @context.error e
+        env.response.status_code = 500
+      end
+    end
   end
 end

src/routes/opds.cr

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

src/routes/reader.cr

@@ -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

src/server.cr

@@ -1,4 +1,5 @@
 require "kemal"
+require "kemal-session"
 require "./library"
 require "./handlers/*"
 require "./util"
@@ -53,6 +54,7 @@ class Server
     AdminRouter.new
     ReaderRouter.new
     APIRouter.new
+    OPDSRouter.new
 
     Kemal.config.logging = false
     add_handler LogHandler.new
@@ -64,6 +66,13 @@ class Server
       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

src/util.cr

@@ -2,22 +2,25 @@ 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 do |c|
-      c.name == "token-#{Config.current.port}"
-    end
     is_admin = false
-    unless cookie.nil?
+    if token = env.session.string? "token"
-      is_admin = @context.storage.verify_admin cookie.value
+      is_admin = @context.storage.verify_admin token
     end
-    render "src/views/#{{{name}}}.ecr", "src/views/layout.ecr"
+    page = {{name}}
+    render "src/views/#{{{name}}}.html.ecr", "src/views/layout.html.ecr"
   rescue e
     message = e.to_s
     @context.error message
-    render "src/views/message.ecr", "src/views/layout.ecr"
+    render "src/views/message.html.ecr", "src/views/layout.html.ecr"
   end
 end
 
@@ -28,10 +31,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
-  cookie = {{env}}.request.cookies.find do |c|
+  token = env.session.string "token"
-    c.name == "token-#{Config.current.port}"
+  (@context.storage.verify_token token).not_nil!
-  end.not_nil!
-  (@context.storage.verify_token cookie.value).not_nil!
 end
 
 def send_json(env, json)
@@ -39,6 +40,12 @@ def send_json(env, json)
   env.response.print json
 end
 
+def send_attachment(env, path)
+  MIME.register ".cbz", "application/vnd.comicbook+zip"
+  MIME.register ".cbr", "application/vnd.comicbook-rar"
+  send_file env, path, filename: File.basename(path), disposition: "attachment"
+end
+
 def hash_to_query(hash)
   hash.map { |k, v| "#{k}=#{v}" }.join("&")
 end
@@ -125,3 +132,25 @@ def validate_password(password)
     raise "password should contain ASCII characters only"
   end
 end
+
+macro render_xml(path)
+  base_url = Config.current.base_url
+  send_file env, ECR.render({{path}}).to_slice, "application/xml"
+end
+
+macro render_component(filename)
+  render "src/views/components/#{{{filename}}}.html.ecr"
+end
+
+# Works in all Unix systems. Follows https://github.com/crystal-lang/crystal/
+#   blob/master/src/crystal/system/unix/file_info.cr#L42-L48
+def ctime(file_path : String) : Time
+  res = LibC.stat(file_path, out stat)
+  raise "Unable to get ctime of file #{file_path}" if res != 0
+
+  {% if flag?(:darwin) %}
+    Time.new stat.st_ctimespec, Time::Location::UTC
+  {% else %}
+    Time.new stat.st_ctim, Time::Location::UTC
+  {% end %}
+end

src/views/admin.html.ecr

@@ -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>
+  <script src="<%= base_url %>js/admin.js"></script>
 <% end %>

src/views/components/card.html.ecr

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

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

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

src/views/components/head.html.ecr

@@ -0,0 +1,14 @@
+<head>
+  <meta charset="utf-8">
+  <meta name="X-UA-Compatible" content="IE=edge">
+  <title>Mango</title>
+  <meta name="description" content="Mango - Manga Server and Web Reader">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="stylesheet" href="<%= base_url %>css/uikit.css" />
+  <link rel="stylesheet" href="<%= base_url %>css/mango.css" />
+  <link rel="icon" href="<%= base_url %>favicon.ico">
+  <script defer src="<%= base_url %>js/fontawesome.min.js"></script>
+  <script defer src="<%= base_url %>js/solid.min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+  <script src="<%= base_url %>js/theme.js"></script>
+</head>

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

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

src/views/download-manager.html.ecr

@@ -23,10 +23,10 @@
 </table>
 
 <% content_for "script" do %>
-<script>
+  <script>
     var baseURL = "<%= mangadex_base_url %>".replace(/\/$/, "");
-</script>
+  </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/moment.js/2.24.0/moment.min.js"></script>
-<script src="<%= base_url %>js/alert.js"></script>
+  <script src="<%= base_url %>js/alert.js"></script>
-<script src="<%= base_url %>js/download-manager.js"></script>
+  <script src="<%= base_url %>js/download-manager.js"></script>
 <% end %>

src/views/download.html.ecr

@@ -73,11 +73,11 @@
 </table>
 
 <% content_for "script" do %>
-<script>
+  <script>
     var baseURL = "<%= mangadex_base_url %>".replace(/\/$/, "");
-</script>
+  </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/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="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/alert.js"></script>
-<script src="<%= base_url %>js/download.js"></script>
+  <script src="<%= base_url %>js/download.js"></script>
 <% end %>

src/views/home.html.ecr

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

src/views/index.ecr

@@ -1,49 +0,0 @@
-<h2 class=uk-title>Library</h2>
-<p class="uk-text-meta"><%= titles.size %> titles found</p>
-<div class="uk-grid-small" uk-grid>
-  <div class="uk-margin-bottom uk-width-3-4@s">
-    <form class="uk-search uk-search-default">
-      <span uk-search-icon></span>
-      <input class="uk-search-input" type="search" placeholder="Search">
-    </form>
-  </div>
-  <div class="uk-margin-bottom uk-width-1-4@s">
-    <div class="uk-form-horizontal">
-      <select class="uk-select" id="sort-select">
-        <option id="name-up">▲ Name</option>
-        <option id="name-down">▼ Name</option>
-        <option id="date-up">▲ Date Modified</option>
-        <option id="date-down">▼ Date Modified</option>
-        <option id="progress-up">▲ Progress</option>
-        <option id="progress-down">▼ Progress</option>
-      </select>
-    </div>
-  </div>
-</div>
-<div id="item-container" class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
-  <%- titles.each_with_index do |t, i| -%>
-  <div class="item" data-mtime="<%= t.mtime.to_unix %>" data-progress="<%= percentage[i] %>">
-    <a class="acard" href="<%= base_url %>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" 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 %>
-<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/layout.ecr

@@ -1,79 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-  <meta charset="utf-8">
-  <meta name="X-UA-Compatible" content="IE=edge">
-  <title>Mango</title>
-  <meta name="description" content="Mango - Manga Server 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/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>
-
-<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>
-            <% 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>
-          <% 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>

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>

src/views/library.html.ecr

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

src/views/login.ecr

@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-  <meta charset="utf-8">
-  <meta name="X-UA-Compatible" content="IE=edge">
-  <title>Mango</title>
-  <meta name="description" content="Mango Manga Server">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/css/uikit.min.css" />
-  <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>
-
-<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/login.html.ecr

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

src/views/message.ecr

@@ -1 +0,0 @@
-<p class="uk-text-lead uk-text-center"><%= message %></p>

src/views/message.html.ecr

@@ -0,0 +1 @@
+<p class="uk-text-lead uk-text-center"><%= message %></p>

src/views/opds/index.xml.ecr

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

src/views/opds/title.xml.ecr

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

src/views/reader.ecr

@@ -1,70 +0,0 @@
-<!DOCTYPE html>
-<html class="reader-bg">
-
-<head>
-  <meta charset="utf-8">
-  <meta name="X-UA-Compatible" content="IE=edge">
-  <title>Mango</title>
-  <meta name="description" content="Mango Manga Server">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/css/uikit.min.css" />
-  <link rel="stylesheet" href="<%= base_url %>css/mango.css" />
-</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>

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>

src/views/title.ecr

@@ -1,159 +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</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">
-    <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="<%= base_url %>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" 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" 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">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 %>
-<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/title.html.ecr

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

src/views/user-edit.ecr

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

src/views/user-edit.html.ecr

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

src/views/user.ecr

@@ -1,31 +0,0 @@
-<table class="uk-table uk-table-divider">
-  <thead>
-    <tr>
-      <th>Username</th>
-      <th>Admin Access</th>
-      <th>Actions</th>
-    </tr>
-  </thead>
-  <tbody>
-    <%- users.each do |u| -%>
-    <tr>
-      <td><%= u[0] %></td>
-      <td><%= u[1] %></td>
-      <td>
-        <a href="<%= 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 %>

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 %>