From 392b3d8339356fa8fe1e57eb7c4d31d2e149fc12 Mon Sep 17 00:00:00 2001
From: Jared Turner <yalooze@gmail.com>
Date: Mon, 18 May 2020 20:32:09 +0100
Subject: [PATCH 01/22] fix `load_percetage` method name typo

---
 src/library.cr     | 4 ++--
 src/routes/main.cr | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/library.cr b/src/library.cr
index 058b04a..2e8d0f7 100644
--- a/src/library.cr
+++ b/src/library.cr
@@ -302,14 +302,14 @@ class Title
     progress
   end
 
-  def load_percetage(username, entry)
+  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
   end
 
-  def load_percetage(username)
+  def load_percentage(username)
     return 0.0 if @entries.empty?
     read_pages = total_pages = 0
     @entries.each do |e|
diff --git a/src/routes/main.cr b/src/routes/main.cr
index 3e21fc1..17cb737 100644
--- a/src/routes/main.cr
+++ b/src/routes/main.cr
@@ -36,7 +36,7 @@ class MainRouter < Router
       begin
         titles = @context.library.titles
         username = get_username env
-        percentage = titles.map &.load_percetage username
+        percentage = titles.map &.load_percentage username
         layout "index"
       rescue e
         @context.error e
@@ -49,7 +49,7 @@ class MainRouter < Router
         title = (@context.library.get_title env.params.url["title"]).not_nil!
         username = get_username env
         percentage = title.entries.map { |e|
-          title.load_percetage username, e.title
+          title.load_percentage username, e.title
         }
         layout "title"
       rescue e

From 16734c2c5922945ca021c97b6e5f0967b3d7e3b5 Mon Sep 17 00:00:00 2001
From: Jared Turner <yalooze@gmail.com>
Date: Mon, 18 May 2020 21:06:14 +0100
Subject: [PATCH 02/22] rename root to library and add home with on deck WIP

---
 src/library.cr                       | 23 +++++++++++
 src/routes/main.cr                   | 22 +++++++++-
 src/views/home.ecr                   | 62 ++++++++++++++++++++++++++++
 src/views/layout.ecr                 |  1 +
 src/views/{index.ecr => library.ecr} |  0
 5 files changed, 106 insertions(+), 2 deletions(-)
 create mode 100644 src/views/home.ecr
 rename src/views/{index.ecr => library.ecr} (100%)

diff --git a/src/library.cr b/src/library.cr
index 2e8d0f7..3ba09a1 100644
--- a/src/library.cr
+++ b/src/library.cr
@@ -324,6 +324,29 @@ class Title
     return nil if idx.nil? || idx == @entries.size - 1
     @entries[idx + 1]
   end
+
+  def get_on_deck_entry(username)
+    # this assumes @entries is in order (low to high), otherwise we would need to sort first
+    # TODO: what happens if no entry has progress > 0
+    idx_latest_read_entry_reverse = -99 # hack to set var, refactor this and `return nil if` below
+    @entries.reverse.each_with_index do |e, i|
+      if load_progress(username, e.title) > 0
+        idx_latest_read_entry_reverse = i
+        break
+      end
+    end
+    return nil if idx_latest_read_entry_reverse == -99 
+    latest_read_entry = @entries.reverse[idx_latest_read_entry_reverse]
+    if load_progress(username, latest_read_entry.title) == latest_read_entry.pages
+      # return next entry (if exists)
+      if idx_latest_read_entry_reverse - 1 >= 0
+        return @entries.reverse[idx_latest_read_entry_reverse - 1]
+      end
+    else # return in progress entry
+      return latest_read_entry
+    end
+    return nil
+  end
 end
 
 class TitleInfo
diff --git a/src/routes/main.cr b/src/routes/main.cr
index 17cb737..c4c6cb8 100644
--- a/src/routes/main.cr
+++ b/src/routes/main.cr
@@ -32,12 +32,12 @@ class MainRouter < Router
       end
     end
 
-    get "/" do |env|
+    get "/library" do |env|
       begin
         titles = @context.library.titles
         username = get_username env
         percentage = titles.map &.load_percentage username
-        layout "index"
+        layout "library"
       rescue e
         @context.error e
         env.response.status_code = 500
@@ -62,5 +62,23 @@ class MainRouter < Router
       base_url = @context.config.mangadex["base_url"]
       layout "download"
     end
+
+    get "/" do |env|
+      begin
+        titles = @context.library.titles
+        username = get_username env
+
+        on_deck_entries = [] of Entry
+        titles.each do |title|
+          on_deck_entry = title.get_on_deck_entry username
+          on_deck_entries << on_deck_entry if on_deck_entry # ingnore titles without latest on deck entry
+        end
+
+        layout "home"
+      rescue e
+        @context.error e
+        env.response.status_code = 500
+      end
+    end
   end
 end
diff --git a/src/views/home.ecr b/src/views/home.ecr
new file mode 100644
index 0000000..7947c2d
--- /dev/null
+++ b/src/views/home.ecr
@@ -0,0 +1,62 @@
+<%- unless on_deck_entries.empty? -%>
+<h2 class="uk-title home-headings">On Deck</h2>
+<div id="item-container-continue" class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
+  <%- on_deck_entries.each_with_index do |e, i| -%>
+  <div class="item" data-mtime="<%= e.mtime.to_unix %>" data-progress="" id="<%= e.id %>"> <!-- TODO: add percentage -->
+      <a class="acard">                                                              <!-- Add percentage rounded below  v  -->
+		  <div class="uk-card uk-card-default" onclick="showModal(&quot;<%= e.encoded_path %>&quot;, '<%= e.pages %>', <%= "0" %>, &quot;<%= e.book.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"><%= "" %>%</div> <!-- TODO: add percentage rounded -->
+			<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>
+<%- end -%>
+
+
+<!-- TODO: DRY this code with calls in other ecr files? eg. title.ecr -->
+<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>
+
+<% content_for "script" do %>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery.dotdotdot/4.0.11/dotdotdot.js"></script>
+<script src="/js/dots.js"></script>
+<script src="/js/alert.js"></script>
+<script src="/js/title.js"></script>
+<script src="/js/search.js"></script>
+<script src="/js/sort-items.js"></script>
+<% end %>
\ No newline at end of file
diff --git a/src/views/layout.ecr b/src/views/layout.ecr
index cbd6ead..c2c367d 100644
--- a/src/views/layout.ecr
+++ b/src/views/layout.ecr
@@ -42,6 +42,7 @@
           <a class="uk-navbar-item uk-logo" href="/"><img src="/img/icon.png"></a>
           <ul class="uk-navbar-nav">
             <li><a href="/">Home</a></li>
+            <li><a href="/library">Library</a></li>
 			<% if is_admin %>
 				<li><a href="/admin">Admin</a></li>
 				<li><a href="/download">Download</a></li>
diff --git a/src/views/index.ecr b/src/views/library.ecr
similarity index 100%
rename from src/views/index.ecr
rename to src/views/library.ecr

From 16fa27e4f6d5b17c4f2138f75878d406680fe12e Mon Sep 17 00:00:00 2001
From: Jared Turner <yalooze@gmail.com>
Date: Mon, 18 May 2020 21:09:11 +0100
Subject: [PATCH 03/22] update comments

---
 src/library.cr | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/library.cr b/src/library.cr
index 3ba09a1..ce19673 100644
--- a/src/library.cr
+++ b/src/library.cr
@@ -327,7 +327,6 @@ class Title
 
   def get_on_deck_entry(username)
     # this assumes @entries is in order (low to high), otherwise we would need to sort first
-    # TODO: what happens if no entry has progress > 0
     idx_latest_read_entry_reverse = -99 # hack to set var, refactor this and `return nil if` below
     @entries.reverse.each_with_index do |e, i|
       if load_progress(username, e.title) > 0
@@ -335,7 +334,7 @@ class Title
         break
       end
     end
-    return nil if idx_latest_read_entry_reverse == -99 
+    return nil if idx_latest_read_entry_reverse == -99 # handle if no matching entry
     latest_read_entry = @entries.reverse[idx_latest_read_entry_reverse]
     if load_progress(username, latest_read_entry.title) == latest_read_entry.pages
       # return next entry (if exists)

From ff6e64f12ad350fc52844f791da027ad47da038f Mon Sep 17 00:00:00 2001
From: Alex Ling <hkalexling@gmail.com>
Date: Tue, 19 May 2020 12:05:15 +0000
Subject: [PATCH 04/22] Refactor `get_on_deck_entry`

---
 src/library.cr | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/library.cr b/src/library.cr
index ce19673..418102b 100644
--- a/src/library.cr
+++ b/src/library.cr
@@ -326,25 +326,18 @@ class Title
   end
 
   def get_on_deck_entry(username)
-    # this assumes @entries is in order (low to high), otherwise we would need to sort first
-    idx_latest_read_entry_reverse = -99 # hack to set var, refactor this and `return nil if` below
-    @entries.reverse.each_with_index do |e, i|
-      if load_progress(username, e.title) > 0
-        idx_latest_read_entry_reverse = i
-        break
-      end
+    in_progress_entries = @entries.select do |e|
+      load_progress(username, e.title) > 0
     end
-    return nil if idx_latest_read_entry_reverse == -99 # handle if no matching entry
-    latest_read_entry = @entries.reverse[idx_latest_read_entry_reverse]
-    if load_progress(username, latest_read_entry.title) == latest_read_entry.pages
-      # return next entry (if exists)
-      if idx_latest_read_entry_reverse - 1 >= 0
-        return @entries.reverse[idx_latest_read_entry_reverse - 1]
-      end
-    else # return in progress entry
-      return latest_read_entry
+    return nil if in_progress_entries.empty?
+
+    latest_read_entry = in_progress_entries[-1]
+    if load_progress(username, latest_read_entry.title) ==
+         latest_read_entry.pages
+      next_entry latest_read_entry
+    else
+      latest_read_entry
     end
-    return nil
   end
 end
 

From c35e840694bdcab16270630752f5ba02fc4b813a Mon Sep 17 00:00:00 2001
From: Alex Ling <hkalexling@gmail.com>
Date: Tue, 19 May 2020 12:16:32 +0000
Subject: [PATCH 05/22] Refactor the `/` route

---
 src/routes/main.cr | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/routes/main.cr b/src/routes/main.cr
index c4c6cb8..523388c 100644
--- a/src/routes/main.cr
+++ b/src/routes/main.cr
@@ -68,11 +68,12 @@ class MainRouter < Router
         titles = @context.library.titles
         username = get_username env
 
-        on_deck_entries = [] of Entry
-        titles.each do |title|
-          on_deck_entry = title.get_on_deck_entry username
-          on_deck_entries << on_deck_entry if on_deck_entry # ingnore titles without latest on deck entry
-        end
+        # map: get the on-deck entry or nil for each Title
+        # select: select only entries (and ignore Nil's) from the array
+        #   produced by map
+        on_deck_entries = titles.map { |t|
+          t.get_on_deck_entry username
+        }.select Entry
 
         layout "home"
       rescue e

From a2c7638141d8b75c67bf60ceeb45992302c631f1 Mon Sep 17 00:00:00 2001
From: Jared Turner <yalooze@gmail.com>
Date: Wed, 20 May 2020 10:38:23 +0100
Subject: [PATCH 06/22] refactor on deck to continue reading and show
 percentages on home

---
 src/library.cr     |  2 +-
 src/routes/main.cr |  8 ++++++--
 src/views/home.ecr | 14 +++++++-------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/library.cr b/src/library.cr
index 418102b..a51996f 100644
--- a/src/library.cr
+++ b/src/library.cr
@@ -325,7 +325,7 @@ class Title
     @entries[idx + 1]
   end
 
-  def get_on_deck_entry(username)
+  def get_continue_reading_entry(username)
     in_progress_entries = @entries.select do |e|
       load_progress(username, e.title) > 0
     end
diff --git a/src/routes/main.cr b/src/routes/main.cr
index 523388c..90df4df 100644
--- a/src/routes/main.cr
+++ b/src/routes/main.cr
@@ -71,10 +71,14 @@ class MainRouter < Router
         # map: get the on-deck entry or nil for each Title
         # select: select only entries (and ignore Nil's) from the array
         #   produced by map
-        on_deck_entries = titles.map { |t|
-          t.get_on_deck_entry username
+        continue_reading_entries = titles.map { |t|
+          t.get_continue_reading_entry username
         }.select Entry
 
+        percentage = continue_reading_entries.map do |e|
+          e.book.load_percentage username, e.title
+        end
+
         layout "home"
       rescue e
         @context.error e
diff --git a/src/views/home.ecr b/src/views/home.ecr
index 7947c2d..1e52d5b 100644
--- a/src/views/home.ecr
+++ b/src/views/home.ecr
@@ -1,15 +1,15 @@
-<%- unless on_deck_entries.empty? -%>
-<h2 class="uk-title home-headings">On Deck</h2>
+<%- unless continue_reading_entries.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>
-  <%- on_deck_entries.each_with_index do |e, i| -%>
-  <div class="item" data-mtime="<%= e.mtime.to_unix %>" data-progress="" id="<%= e.id %>"> <!-- TODO: add percentage -->
-      <a class="acard">                                                              <!-- Add percentage rounded below  v  -->
-		  <div class="uk-card uk-card-default" onclick="showModal(&quot;<%= e.encoded_path %>&quot;, '<%= e.pages %>', <%= "0" %>, &quot;<%= e.book.encoded_display_name %>&quot;, &quot;<%= e.encoded_display_name %>&quot;, '<%= e.title_id %>', '<%= e.id %>')">
+  <%- continue_reading_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;<%= e.book.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"><%= "" %>%</div> <!-- TODO: add percentage rounded -->
+            <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>

From 2aeb38a2710055f917b352563391144397771f7c Mon Sep 17 00:00:00 2001
From: Alex Ling <hkalexling@gmail.com>
Date: Thu, 21 May 2020 09:06:50 +0000
Subject: [PATCH 07/22] Remove edit button from home screen

---
 src/views/home.ecr | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/views/home.ecr b/src/views/home.ecr
index 1e52d5b..e02ccf1 100644
--- a/src/views/home.ecr
+++ b/src/views/home.ecr
@@ -27,12 +27,7 @@
     <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>
+		<h3 class="uk-modal-title break-word" id="modal-title"><span></span></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>

From c74a01f546d6bfb12ba23f5762ec7f0253bb531e Mon Sep 17 00:00:00 2001
From: Alex Ling <hkalexling@gmail.com>
Date: Thu, 21 May 2020 09:10:46 +0000
Subject: [PATCH 08/22] Remove unnecessary JS files from home.ecr

---
 src/views/home.ecr | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/views/home.ecr b/src/views/home.ecr
index e02ccf1..5662cab 100644
--- a/src/views/home.ecr
+++ b/src/views/home.ecr
@@ -52,6 +52,4 @@
 <script src="/js/dots.js"></script>
 <script src="/js/alert.js"></script>
 <script src="/js/title.js"></script>
-<script src="/js/search.js"></script>
-<script src="/js/sort-items.js"></script>
-<% end %>
\ No newline at end of file
+<% end %>

From 6a9105605d1b89740a943eb3146875aa745a682b Mon Sep 17 00:00:00 2001
From: Alex Ling <hkalexling@gmail.com>
Date: Sat, 23 May 2020 12:16:08 +0000
Subject: [PATCH 09/22] Fix library link in the breadcrumb menu

---
 src/views/title.ecr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/title.ecr b/src/views/title.ecr
index c6ade3a..bd91989 100644
--- a/src/views/title.ecr
+++ b/src/views/title.ecr
@@ -7,7 +7,7 @@
 	</h2>
 </div>
 <ul class="uk-breadcrumb">
-	<li><a href="/">Library</a></li>
+	<li><a href="/library">Library</a></li>
 	<%- title.parents.each do |t| -%>
 	<li><a href="/book/<%= t.id %>"><%= t.display_name %></a></li>
 	<%- end -%>

From ddb6a860ae57a98de507d44e691907a2e03156ee Mon Sep 17 00:00:00 2001
From: Jared Turner <yalooze@gmail.com>
Date: Sun, 24 May 2020 10:35:35 +0100
Subject: [PATCH 10/22] add 'jump to title' to home modal

---
 public/js/title.js  | 12 ++++++++----
 src/views/home.ecr  |  3 ++-
 src/views/title.ecr |  4 ++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/public/js/title.js b/public/js/title.js
index 4febf2c..56ffb29 100644
--- a/public/js/title.js
+++ b/public/js/title.js
@@ -15,10 +15,14 @@ function showModal(encodedPath, pages, percentage, encodedeTitle, encodedEntryTi
 	if (percentage === 100) {
 		$('#read-btn').attr('hidden', '');
 	}
-	$('#modal-title').find('span').text(entry);
-	$('#modal-title').next().attr('data-id', titleID);
-	$('#modal-title').next().attr('data-entry-id', entryID);
-	$('#modal-title').next().find('.title-rename-field').val(entry);
+
+	$('#modal-title-link').text(title);
+	$('#modal-title-link').attr('href', '/book/' + titleID);
+
+	$('#modal-entry-title').find('span').text(entry);
+	$('#modal-entry-title').next().attr('data-id', titleID);
+	$('#modal-entry-title').next().attr('data-entry-id', entryID);
+	$('#modal-entry-title').next().find('.title-rename-field').val(entry);
 	$('#path-text').text(zipPath);
 	$('#pages-text').text(pages + ' pages');
 
diff --git a/src/views/home.ecr b/src/views/home.ecr
index 1e52d5b..77d37cb 100644
--- a/src/views/home.ecr
+++ b/src/views/home.ecr
@@ -27,7 +27,8 @@
     <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>
+    <h4 class="uk-margin-remove-bottom"><a id="modal-title-link"></a></h4>
+		<h3 class="uk-modal-title break-word uk-margin-remove-top" id="modal-entry-title"><span></span>
 			&nbsp;
 			<% if is_admin %>
 				<a class="uk-icon-button" uk-icon="icon:pencil"></a>
diff --git a/src/views/title.ecr b/src/views/title.ecr
index c6ade3a..36246af 100644
--- a/src/views/title.ecr
+++ b/src/views/title.ecr
@@ -75,7 +75,7 @@
     <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>
+		<h3 class="uk-modal-title break-word" id="modal-entry-title"><span></span>
 			&nbsp;
 			<% if is_admin %>
 				<a class="uk-icon-button" uk-icon="icon:pencil"></a>
@@ -105,7 +105,7 @@
     <button class="uk-modal-close-default" type="button" uk-close></button>
     <div class="uk-modal-header">
 	<div>
-		<h3 class="uk-modal-title break-word" id="modal-title">Edit</h3>
+		<h3 class="uk-modal-title break-word" id="modal-entry-title">Edit</h3>
 	</div>
     </div>
     <div class="uk-modal-body">

From d2ad7fef7775ec3fafb0b2c3c1ee8a8fb30064b2 Mon Sep 17 00:00:00 2001
From: Jared Turner <yalooze@gmail.com>
Date: Fri, 29 May 2020 13:26:47 +0100
Subject: [PATCH 11/22] WIP last_read property for Entries

---
 src/library.cr     | 22 ++++++++++++++++++++++
 src/routes/main.cr |  1 +
 2 files changed, 23 insertions(+)

diff --git a/src/library.cr b/src/library.cr
index a51996f..a7ef914 100644
--- a/src/library.cr
+++ b/src/library.cr
@@ -287,6 +287,15 @@ class Title
       else
         info.progress[username][entry] = page
       end
+      # should this be a separate method?
+      # eg. def save_last_read(username, entry)
+      # if so, we would need to open the json file twice every
+      # time we save. Does that matter?
+      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
   end
@@ -319,6 +328,18 @@ class Title
     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
+    return nil if last_read.nil?
+    last_read
+  end
+
   def next_entry(current_entry_obj)
     idx = @entries.index current_entry_obj
     return nil if idx.nil? || idx == @entries.size - 1
@@ -350,6 +371,7 @@ 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)
 
   @[JSON::Field(ignore: true)]
   property dir : String = ""
diff --git a/src/routes/main.cr b/src/routes/main.cr
index 90df4df..c57ead7 100644
--- a/src/routes/main.cr
+++ b/src/routes/main.cr
@@ -77,6 +77,7 @@ class MainRouter < Router
 
         percentage = continue_reading_entries.map do |e|
           e.book.load_percentage username, e.title
+          pp e.book.load_last_read username, e.title
         end
 
         layout "home"

From 4841f90cc173bd58ce2661017da2e1bca31ccb01 Mon Sep 17 00:00:00 2001
From: Alex Ling <hkalexling@gmail.com>
Date: Fri, 29 May 2020 15:51:01 +0000
Subject: [PATCH 12/22] Remove edit buttons from home

---
 src/views/home.ecr | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/views/home.ecr b/src/views/home.ecr
index a659fda..4dc7092 100644
--- a/src/views/home.ecr
+++ b/src/views/home.ecr
@@ -28,12 +28,7 @@
     <div class="uk-modal-header">
       <div>
         <h4 class="uk-margin-remove-bottom"><a id="modal-title-link"></a></h4>
-        <h3 class="uk-modal-title break-word uk-margin-remove-top" id="modal-entry-title"><span></span>
-          &nbsp;
-          <% if is_admin %>
-            <a class="uk-icon-button" uk-icon="icon:pencil"></a>
-          <% end %>
-        </h3>
+		<h3 class="uk-modal-title break-word uk-margin-remove-top" id="modal-entry-title"><span></span></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>

From 3ef6a7bfc4cec846aa7284cd5b1911c4762c6a28 Mon Sep 17 00:00:00 2001
From: Jared Turner <yalooze@gmail.com>
Date: Mon, 1 Jun 2020 15:29:18 +0100
Subject: [PATCH 13/22] continue reading sorted by last read

---
 src/library.cr     | 22 +++++++++++++++++-----
 src/routes/main.cr | 37 ++++++++++++++++++++++++++++++++++---
 src/views/home.ecr | 14 +++++++-------
 3 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/src/library.cr b/src/library.cr
index a7ef914..a5639c0 100644
--- a/src/library.cr
+++ b/src/library.cr
@@ -287,10 +287,7 @@ class Title
       else
         info.progress[username][entry] = page
       end
-      # should this be a separate method?
-      # eg. def save_last_read(username, entry)
-      # if so, we would need to open the json file twice every
-      # time we save. Does that matter?
+      # save last_read timestamp
       if info.last_read[username]?.nil?
         info.last_read[username] = {entry => Time.utc}
       else
@@ -336,7 +333,6 @@ class Title
         last_read = info.last_read[username][entry]
       end
     end
-    return nil if last_read.nil?
     last_read
   end
 
@@ -346,6 +342,12 @@ class Title
     @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]
+  end
+
   def get_continue_reading_entry(username)
     in_progress_entries = @entries.select do |e|
       load_progress(username, e.title) > 0
@@ -360,6 +362,16 @@ class Title
       latest_read_entry
     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
+    if last_read.nil? # grab from previous entry if current entry hasn't been started yet
+      previous_entry = previous_entry(entry_obj)
+      return load_last_read username, previous_entry.title if previous_entry
+    end
+    last_read
+  end
 end
 
 class TitleInfo
diff --git a/src/routes/main.cr b/src/routes/main.cr
index c57ead7..ed9df4d 100644
--- a/src/routes/main.cr
+++ b/src/routes/main.cr
@@ -75,10 +75,41 @@ class MainRouter < Router
           t.get_continue_reading_entry username
         }.select Entry
 
-        percentage = continue_reading_entries.map do |e|
+        percentage = continue_reading_entries.map { |e|
           e.book.load_percentage username, e.title
-          pp e.book.load_last_read username, e.title
-        end
+        }
+
+        last_read = continue_reading_entries.map { |e|
+          e.book.get_last_read_for_continue_reading username, e
+        }
+
+        # Group values in a NamedTuple for easier sorting
+        cr_entries = continue_reading_entries.map_with_index { |e, i|
+          {
+            entry: e,
+            percentage: percentage[i],
+            # if you're ok with the NamedTuple approach we could remove the
+            # percentage and last_read vars above and just call the methods 
+            # here eg.
+            # perecentage: e.book.load_percentage username, e.title
+            last_read: last_read[i]
+          }
+        }
+        # I couldn't get the sort to work where last_read type is `Time | Nil`
+        # so I'm creating a new variable with just the entries that have last_read
+        # even still, I have to do another workaround within the sort below :/
+        cr_entries_not_nil = cr_entries.select { |e| e[:last_read] }
+        cr_entries_not_nil.sort! { |a, b| 
+          # 'if' ensures values aren't nil otherwise the compiler errors
+          # because it still thinks the NamedTuple `last_read` can be nil
+          # even though we only 'select'ed the objects which have last_read
+          # there's probably a better way to do this
+          if (a_time = a[:last_read]) && (b_time = b[:last_read])
+            b_time <=> a_time
+          end
+        }
+        # add `last_read == nil` entries AFTER sorted entries
+        continue_reading = cr_entries_not_nil + cr_entries.select { |e| e[:last_read].nil? }
 
         layout "home"
       rescue e
diff --git a/src/views/home.ecr b/src/views/home.ecr
index a659fda..fd8c864 100644
--- a/src/views/home.ecr
+++ b/src/views/home.ecr
@@ -1,17 +1,17 @@
 <%- unless continue_reading_entries.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_entries.each_with_index do |e, i| -%>
-  <div class="item" data-mtime="<%= e.mtime.to_unix %>" data-progress="<%= percentage[i] %>" id="<%= e.id %>">
+  <%- continue_reading.each do |cr| -%>
+  <div class="item" data-mtime="<%= cr[:entry].mtime.to_unix %>" data-progress="<%= cr[:percentage] %>" id="<%= cr[:entry].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;<%= e.book.encoded_display_name %>&quot;, &quot;<%= e.encoded_display_name %>&quot;, '<%= e.title_id %>', '<%= e.id %>')">
+		  <div class="uk-card uk-card-default" onclick="showModal(&quot;<%= cr[:entry].encoded_path %>&quot;, '<%= cr[:entry].pages %>', <%= (cr[:percentage] * 100).round(1) %>, &quot;<%= cr[:entry].book.encoded_display_name %>&quot;, &quot;<%= cr[:entry].encoded_display_name %>&quot;, '<%= cr[:entry].title_id %>', '<%= cr[:entry].id %>')">
           <div class="uk-card-media-top">
-            <img data-src="<%= e.cover_url %>" alt="" data-width data-height uk-img>
+            <img data-src="<%= cr[:entry].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 class="uk-card-badge uk-label"><%= (cr[:percentage] * 100).round(1) %>%</div>
+			<h3 class="uk-card-title break-word" data-title="<%= cr[:entry].display_name.gsub("\"", "&quot;") %>"><%= cr[:entry].display_name %></h3>
+              <p><%= cr[:entry].pages %> pages</p>
           </div>
       </div>
       </a>

From 4f5e05c0085655c06b4cdf3a69398a7226043478 Mon Sep 17 00:00:00 2001
From: Jared Turner <yalooze@gmail.com>
Date: Wed, 3 Jun 2020 13:48:49 +0100
Subject: [PATCH 14/22] refactor continue reading into Library class

---
 src/library.cr     | 50 ++++++++++++++++++++++++++++++++++++++++++++++
 src/routes/main.cr | 45 +----------------------------------------
 src/views/home.ecr |  3 +--
 3 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/src/library.cr b/src/library.cr
index a5639c0..335a3e2 100644
--- a/src/library.cr
+++ b/src/library.cr
@@ -477,4 +477,54 @@ class Library
       end
     @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_with_index { |e, i|
+      {
+        entry: e,
+        percentage: e.book.load_percentage(username, e.title),
+        last_read: get_relevant_last_read(username, e)
+      }
+    }
+
+    # Sort by by last_read, most recent first (nils at the end)
+    continue_reading.sort! do |a, b|
+      next 0 if a[:last_read].nil? && b[:last_read].nil?
+      next 1 if a[:last_read].nil?
+      next -1 if b[:last_read].nil?
+      b[:last_read].not_nil! <=> a[:last_read].not_nil!
+    end
+  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
+    if last_read.nil? # grab from previous entry if current entry hasn't been started yet
+      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
diff --git a/src/routes/main.cr b/src/routes/main.cr
index ed9df4d..c2f3f1f 100644
--- a/src/routes/main.cr
+++ b/src/routes/main.cr
@@ -65,51 +65,8 @@ class MainRouter < Router
 
     get "/" do |env|
       begin
-        titles = @context.library.titles
         username = get_username env
-
-        # map: get the on-deck 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|
-          t.get_continue_reading_entry username
-        }.select Entry
-
-        percentage = continue_reading_entries.map { |e|
-          e.book.load_percentage username, e.title
-        }
-
-        last_read = continue_reading_entries.map { |e|
-          e.book.get_last_read_for_continue_reading username, e
-        }
-
-        # Group values in a NamedTuple for easier sorting
-        cr_entries = continue_reading_entries.map_with_index { |e, i|
-          {
-            entry: e,
-            percentage: percentage[i],
-            # if you're ok with the NamedTuple approach we could remove the
-            # percentage and last_read vars above and just call the methods 
-            # here eg.
-            # perecentage: e.book.load_percentage username, e.title
-            last_read: last_read[i]
-          }
-        }
-        # I couldn't get the sort to work where last_read type is `Time | Nil`
-        # so I'm creating a new variable with just the entries that have last_read
-        # even still, I have to do another workaround within the sort below :/
-        cr_entries_not_nil = cr_entries.select { |e| e[:last_read] }
-        cr_entries_not_nil.sort! { |a, b| 
-          # 'if' ensures values aren't nil otherwise the compiler errors
-          # because it still thinks the NamedTuple `last_read` can be nil
-          # even though we only 'select'ed the objects which have last_read
-          # there's probably a better way to do this
-          if (a_time = a[:last_read]) && (b_time = b[:last_read])
-            b_time <=> a_time
-          end
-        }
-        # add `last_read == nil` entries AFTER sorted entries
-        continue_reading = cr_entries_not_nil + cr_entries.select { |e| e[:last_read].nil? }
+        continue_reading = @context.library.get_continue_reading_entries username
 
         layout "home"
       rescue e
diff --git a/src/views/home.ecr b/src/views/home.ecr
index e610440..bbd8541 100644
--- a/src/views/home.ecr
+++ b/src/views/home.ecr
@@ -1,4 +1,4 @@
-<%- unless continue_reading_entries.empty? -%>
+<%- 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| -%>
@@ -20,7 +20,6 @@
 </div>
 <%- end -%>
 
-
 <!-- TODO: DRY this code with calls in other ecr files? eg. title.ecr -->
 <div id="modal" class="uk-flex-top" uk-modal>
   <div class="uk-modal-dialog uk-margin-auto-vertical">

From e443176a7976849ffd935739046151ed2dce9c1c Mon Sep 17 00:00:00 2001
From: Alex Ling <hkalexling@gmail.com>
Date: Thu, 4 Jun 2020 16:31:49 +0000
Subject: [PATCH 15/22] Add `ctime` helper function

---
 src/util.cr | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/util.cr b/src/util.cr
index bc97887..a3fad38 100644
--- a/src/util.cr
+++ b/src/util.cr
@@ -99,3 +99,16 @@ end
 def random_str
   UUID.random.to_s.gsub "-", ""
 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

From 808074e4783903849274e7f40f0af3ea772925ea Mon Sep 17 00:00:00 2001
From: Jared Turner <yalooze@gmail.com>
Date: Fri, 5 Jun 2020 15:13:19 +0100
Subject: [PATCH 16/22] Add Recently Added to home

---
 src/library.cr     | 37 ++++++++++++++++++++++++++++++++++---
 src/routes/main.cr |  1 +
 src/views/home.ecr | 22 ++++++++++++++++++++++
 3 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/src/library.cr b/src/library.cr
index 335a3e2..6764655 100644
--- a/src/library.cr
+++ b/src/library.cr
@@ -17,7 +17,8 @@ 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
+    encoded_path : String, encoded_title : String, mtime : Time,
+    date_added : Time
 
   def initialize(path, @book, @title_id, storage)
     @zip_path = path
@@ -33,6 +34,7 @@ class Entry
     file.close
     @id = storage.get_id @zip_path, false
     @mtime = File.info(@zip_path).modification_time
+    @date_added = load_date_added
   end
 
   def to_json(json : JSON::Builder)
@@ -89,6 +91,20 @@ class Entry
       end
     end
   end
+
+  private def load_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
 end
 
 class Title
@@ -384,6 +400,7 @@ class TitleInfo
   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 = ""
@@ -486,7 +503,7 @@ class Library
       get_continue_reading_entry username, t
     }.select Entry
 
-    continue_reading = continue_reading_entries.map_with_index { |e, i|
+    continue_reading = continue_reading_entries.map { |e|
       {
         entry: e,
         percentage: e.book.load_percentage(username, e.title),
@@ -495,12 +512,26 @@ class Library
     }
 
     # Sort by by last_read, most recent first (nils at the end)
-    continue_reading.sort! do |a, b|
+    continue_reading.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
+
+  def get_recently_added_entries(username)
+    entries = [] of Entry
+    titles.each do |t|
+      t.entries.each { |e| entries << e }
     end
+    recently_added = entries.map { |e|
+      {
+        entry: e,
+        percentage: e.book.load_percentage(username, e.title)
+      }
+    }
+    recently_added.sort! { |a, b| b[:entry].date_added <=> a[:entry].date_added }[0..11]
   end
 
   
diff --git a/src/routes/main.cr b/src/routes/main.cr
index c2f3f1f..e1ce580 100644
--- a/src/routes/main.cr
+++ b/src/routes/main.cr
@@ -67,6 +67,7 @@ class MainRouter < Router
       begin
         username = get_username env
         continue_reading = @context.library.get_continue_reading_entries username
+        recently_added = @context.library.get_recently_added_entries username
 
         layout "home"
       rescue e
diff --git a/src/views/home.ecr b/src/views/home.ecr
index bbd8541..e1f8243 100644
--- a/src/views/home.ecr
+++ b/src/views/home.ecr
@@ -20,6 +20,28 @@
 </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| -%>
+  <div class="item" data-mtime="<%= ra[:entry].mtime.to_unix %>" data-progress="<%= ra[:percentage] %>" id="<%= ra[:entry].id %>">
+      <a class="acard">
+		  <div class="uk-card uk-card-default" onclick="showModal(&quot;<%= ra[:entry].encoded_path %>&quot;, '<%= ra[:entry].pages %>', <%= (ra[:percentage] * 100).round(1) %>, &quot;<%= ra[:entry].book.encoded_display_name %>&quot;, &quot;<%= ra[:entry].encoded_display_name %>&quot;, '<%= ra[:entry].title_id %>', '<%= ra[:entry].id %>')">
+          <div class="uk-card-media-top">
+            <img data-src="<%= ra[:entry].cover_url %>" alt="" data-width data-height uk-img>
+          </div>
+          <div class="uk-card-body">
+            <div class="uk-card-badge uk-label"><%= (ra[:percentage] * 100).round(1) %>%</div>
+			<h3 class="uk-card-title break-word" data-title="<%= ra[:entry].display_name.gsub("\"", "&quot;") %>"><%= ra[:entry].display_name %></h3>
+              <p><%= ra[:entry].pages %> pages</p>
+          </div>
+      </div>
+      </a>
+    </div>
+  <%- end -%>
+</div>
+<%- end -%>
+
 <!-- TODO: DRY this code with calls in other ecr files? eg. title.ecr -->
 <div id="modal" class="uk-flex-top" uk-modal>
   <div class="uk-modal-dialog uk-margin-auto-vertical">

From 5ed2a8affa062dce6e36ea648e86ca8e8a37172b Mon Sep 17 00:00:00 2001
From: Jared Turner <yalooze@gmail.com>
Date: Sun, 7 Jun 2020 18:36:51 +0100
Subject: [PATCH 17/22] Add Library link to mobile nav

---
 src/views/layout.ecr | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/layout.ecr b/src/views/layout.ecr
index c2c367d..21c7040 100644
--- a/src/views/layout.ecr
+++ b/src/views/layout.ecr
@@ -21,6 +21,7 @@
           <div class="uk-offcanvas-bar uk-flex uk-flex-column">
             <ul class="uk-nav uk-nav-primary uk-nav-center uk-margin-auto-vertical">
               <li><a href="/">Home</a></li>
+              <li><a href="/library">Library</a></li>
 			  <% if is_admin %>
 				  <li><a href="/admin">Admin</a></li>
 				  <li><a href="/download">Download</a></li>

From aaf0a3c6afbbbe8978ce12aa8bc8b7cb61adf118 Mon Sep 17 00:00:00 2001
From: Jared Turner <yalooze@gmail.com>
Date: Sun, 7 Jun 2020 18:39:05 +0100
Subject: [PATCH 18/22] Group Recently Added by neighbouring Title

---
 src/library.cr     | 41 +++++++++++++++++++++++++++++++++++------
 src/views/home.ecr | 32 ++++++++++++++++++++++++--------
 2 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/src/library.cr b/src/library.cr
index 6764655..cadffeb 100644
--- a/src/library.cr
+++ b/src/library.cr
@@ -525,15 +525,44 @@ class Library
     titles.each do |t|
       t.entries.each { |e| entries << e }
     end
-    recently_added = entries.map { |e|
-      {
-        entry: e,
-        percentage: e.book.load_percentage(username, e.title)
+    entries.sort! { |a, b| b.date_added <=> a.date_added }
+    # Only grab entries form the last 3 months
+    # otherwise we will be grouping neighbours by Title for the entire
+    # library every time. Is this premature optimisation or reasonable optimisation?
+    entries.select! { |e| e.date_added > 3.months.ago }
+
+    i = 0
+    recently_added = [] of NamedTuple(entry: Entry, percentage: Float64, grouped_count: Int32)
+    while i <= entries.size - 1
+      grouped_count = neighbouring_title_count(entries, i)
+      if grouped_count > 1
+        # delete grouped entries (except for first)
+        entries.delete_at(i+1..i+grouped_count-1)
+      end
+      recently_added << { 
+        entry: entries[i], 
+        percentage: entries[i].book.load_percentage(username, entries[i].title),
+        grouped_count: grouped_count
       }
-    }
-    recently_added.sort! { |a, b| b[:entry].date_added <=> a[:entry].date_added }[0..11]
+      i += 1
+    end
+
+    recently_added[0..11]
   end
 
+  private def neighbouring_title_count(entries, index : Int32)
+    count = 1
+    book_title = entries[index].book.title
+    while index < entries.size - 1
+      if book_title == entries[index+1].book.title # is it ok to compare via book.title?
+        count += 1
+      else
+        break
+      end
+      index += 1
+    end
+    count
+  end
   
   private def get_continue_reading_entry(username, title)
     in_progress_entries = title.entries.select do |e|
diff --git a/src/views/home.ecr b/src/views/home.ecr
index e1f8243..bd15c40 100644
--- a/src/views/home.ecr
+++ b/src/views/home.ecr
@@ -4,13 +4,13 @@
   <%- continue_reading.each do |cr| -%>
   <div class="item" data-mtime="<%= cr[:entry].mtime.to_unix %>" data-progress="<%= cr[:percentage] %>" id="<%= cr[:entry].id %>">
       <a class="acard">
-		  <div class="uk-card uk-card-default" onclick="showModal(&quot;<%= cr[:entry].encoded_path %>&quot;, '<%= cr[:entry].pages %>', <%= (cr[:percentage] * 100).round(1) %>, &quot;<%= cr[:entry].book.encoded_display_name %>&quot;, &quot;<%= cr[:entry].encoded_display_name %>&quot;, '<%= cr[:entry].title_id %>', '<%= cr[:entry].id %>')">
+      <div class="uk-card uk-card-default" onclick="showModal(&quot;<%= cr[:entry].encoded_path %>&quot;, '<%= cr[:entry].pages %>', <%= (cr[:percentage] * 100).round(1) %>, &quot;<%= cr[:entry].book.encoded_display_name %>&quot;, &quot;<%= cr[:entry].encoded_display_name %>&quot;, '<%= cr[:entry].title_id %>', '<%= cr[:entry].id %>')">
           <div class="uk-card-media-top">
             <img data-src="<%= cr[:entry].cover_url %>" alt="" data-width data-height uk-img>
           </div>
           <div class="uk-card-body">
             <div class="uk-card-badge uk-label"><%= (cr[:percentage] * 100).round(1) %>%</div>
-			<h3 class="uk-card-title break-word" data-title="<%= cr[:entry].display_name.gsub("\"", "&quot;") %>"><%= cr[:entry].display_name %></h3>
+      <h3 class="uk-card-title break-word" data-title="<%= cr[:entry].display_name.gsub("\"", "&quot;") %>"><%= cr[:entry].display_name %></h3>
               <p><%= cr[:entry].pages %> pages</p>
           </div>
       </div>
@@ -24,20 +24,36 @@
 <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| -%>
-  <div class="item" data-mtime="<%= ra[:entry].mtime.to_unix %>" data-progress="<%= ra[:percentage] %>" id="<%= ra[:entry].id %>">
+    <%- if ra[:grouped_count] == 1 -%>
+    <div class="item" data-progress="<%= ra[:percentage] %>" id="<%= ra[:entry].id %>">
       <a class="acard">
-		  <div class="uk-card uk-card-default" onclick="showModal(&quot;<%= ra[:entry].encoded_path %>&quot;, '<%= ra[:entry].pages %>', <%= (ra[:percentage] * 100).round(1) %>, &quot;<%= ra[:entry].book.encoded_display_name %>&quot;, &quot;<%= ra[:entry].encoded_display_name %>&quot;, '<%= ra[:entry].title_id %>', '<%= ra[:entry].id %>')">
+        <div class="uk-card uk-card-default" onclick="showModal(&quot;<%= ra[:entry].encoded_path %>&quot;, '<%= ra[:entry].pages %>', <%= (ra[:percentage] * 100).round(1) %>, &quot;<%= ra[:entry].book.encoded_display_name %>&quot;, &quot;<%= ra[:entry].encoded_display_name %>&quot;, '<%= ra[:entry].title_id %>', '<%= ra[:entry].id %>')">
           <div class="uk-card-media-top">
             <img data-src="<%= ra[:entry].cover_url %>" alt="" data-width data-height uk-img>
           </div>
           <div class="uk-card-body">
             <div class="uk-card-badge uk-label"><%= (ra[:percentage] * 100).round(1) %>%</div>
-			<h3 class="uk-card-title break-word" data-title="<%= ra[:entry].display_name.gsub("\"", "&quot;") %>"><%= ra[:entry].display_name %></h3>
-              <p><%= ra[:entry].pages %> pages</p>
+            <h3 class="uk-card-title break-word" data-title="<%= ra[:entry].display_name.gsub("\"", "&quot;") %>"><%= ra[:entry].display_name %></h3>
+            <p><%= ra[:entry].pages %> pages</p>
           </div>
-      </div>
+        </div>
       </a>
     </div>
+    <%- else -%>
+    <div class="item">
+      <a class="acard" href="/book/<%= ra[:entry].book.id %>">
+        <div class="uk-card uk-card-default">
+          <div class="uk-card-media-top">
+            <img data-src="<%= ra[:entry].cover_url %>" data-width data-height alt="" uk-img>
+          </div>
+          <div class="uk-card-body">
+            <h3 class="uk-card-title break-word" data-title="<%= ra[:entry].book.display_name.gsub("\"", "&quot;") %>"><%= ra[:entry].book.display_name %></h3>
+            <p><%= ra[:grouped_count] %> new entries</p>
+          </div>
+        </div>
+      </a>
+    </div>
+    <%- end -%>
   <%- end -%>
 </div>
 <%- end -%>
@@ -49,7 +65,7 @@
     <div class="uk-modal-header">
       <div>
         <h4 class="uk-margin-remove-bottom"><a id="modal-title-link"></a></h4>
-		<h3 class="uk-modal-title break-word uk-margin-remove-top" id="modal-entry-title"><span></span></h3>
+    <h3 class="uk-modal-title break-word uk-margin-remove-top" id="modal-entry-title"><span></span></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>

From fa85d9834fd316c51a70d6f37a58e4e342b65a11 Mon Sep 17 00:00:00 2001
From: Jared Turner <yalooze@gmail.com>
Date: Sun, 7 Jun 2020 18:40:31 +0100
Subject: [PATCH 19/22] Onboarding for new libraries and new users

---
 src/routes/main.cr |   7 ++
 src/views/home.ecr | 194 +++++++++++++++++++++++++++------------------
 2 files changed, 123 insertions(+), 78 deletions(-)

diff --git a/src/routes/main.cr b/src/routes/main.cr
index e1ce580..3bde300 100644
--- a/src/routes/main.cr
+++ b/src/routes/main.cr
@@ -69,6 +69,13 @@ class MainRouter < Router
         continue_reading = @context.library.get_continue_reading_entries username
         recently_added = @context.library.get_recently_added_entries username
 
+        new_user = true
+        titles = @context.library.titles
+        titles.each { |t| new_user = false if t.load_percentage(username) > 0 }
+
+        empty_library = true
+        empty_library = false if titles.size > 0
+
         layout "home"
       rescue e
         @context.error e
diff --git a/src/views/home.ecr b/src/views/home.ecr
index bd15c40..018e8aa 100644
--- a/src/views/home.ecr
+++ b/src/views/home.ecr
@@ -1,89 +1,127 @@
-<%- 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| -%>
-  <div class="item" data-mtime="<%= cr[:entry].mtime.to_unix %>" data-progress="<%= cr[:percentage] %>" id="<%= cr[:entry].id %>">
-      <a class="acard">
-      <div class="uk-card uk-card-default" onclick="showModal(&quot;<%= cr[:entry].encoded_path %>&quot;, '<%= cr[:entry].pages %>', <%= (cr[:percentage] * 100).round(1) %>, &quot;<%= cr[:entry].book.encoded_display_name %>&quot;, &quot;<%= cr[:entry].encoded_display_name %>&quot;, '<%= cr[:entry].title_id %>', '<%= cr[:entry].id %>')">
-          <div class="uk-card-media-top">
-            <img data-src="<%= cr[:entry].cover_url %>" alt="" data-width data-height uk-img>
-          </div>
-          <div class="uk-card-body">
-            <div class="uk-card-badge uk-label"><%= (cr[:percentage] * 100).round(1) %>%</div>
-      <h3 class="uk-card-title break-word" data-title="<%= cr[:entry].display_name.gsub("\"", "&quot;") %>"><%= cr[:entry].display_name %></h3>
-              <p><%= cr[:entry].pages %> pages</p>
-          </div>
-      </div>
-      </a>
-    </div>
-  <%- end -%>
-</div>
-<%- end -%>
+<%- if new_user && empty_library -%>
 
-<%- 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| -%>
-    <%- if ra[:grouped_count] == 1 -%>
-    <div class="item" data-progress="<%= ra[:percentage] %>" id="<%= ra[:entry].id %>">
-      <a class="acard">
-        <div class="uk-card uk-card-default" onclick="showModal(&quot;<%= ra[:entry].encoded_path %>&quot;, '<%= ra[:entry].pages %>', <%= (ra[:percentage] * 100).round(1) %>, &quot;<%= ra[:entry].book.encoded_display_name %>&quot;, &quot;<%= ra[:entry].encoded_display_name %>&quot;, '<%= ra[:entry].title_id %>', '<%= ra[:entry].id %>')">
-          <div class="uk-card-media-top">
-            <img data-src="<%= ra[:entry].cover_url %>" alt="" data-width data-height uk-img>
-          </div>
-          <div class="uk-card-body">
-            <div class="uk-card-badge uk-label"><%= (ra[:percentage] * 100).round(1) %>%</div>
-            <h3 class="uk-card-title break-word" data-title="<%= ra[:entry].display_name.gsub("\"", "&quot;") %>"><%= ra[:entry].display_name %></h3>
-            <p><%= ra[:entry].pages %> pages</p>
-          </div>
+  <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><%= @context.config.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>/can/I/access/config_path/from/view?</code></dd>
+      <dt style="font-weight: 500;">Can't see your files yet?</dt>
+      <dd>You must wait <%= @context.config.scan_interval %> minutes for the library scan to complete, or restart Mango.</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="/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="/img/banner.png" style="max-width: 400px; padding: 0 20px;">
+    <p>A self-hosted manga server and reader</p>
+    <a href="/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| -%>
+    <div class="item" data-mtime="<%= cr[:entry].mtime.to_unix %>" data-progress="<%= cr[:percentage] %>" id="<%= cr[:entry].id %>">
+        <a class="acard">
+        <div class="uk-card uk-card-default" onclick="showModal(&quot;<%= cr[:entry].encoded_path %>&quot;, '<%= cr[:entry].pages %>', <%= (cr[:percentage] * 100).round(1) %>, &quot;<%= cr[:entry].book.encoded_display_name %>&quot;, &quot;<%= cr[:entry].encoded_display_name %>&quot;, '<%= cr[:entry].title_id %>', '<%= cr[:entry].id %>')">
+            <div class="uk-card-media-top">
+              <img data-src="<%= cr[:entry].cover_url %>" alt="" data-width data-height uk-img>
+            </div>
+            <div class="uk-card-body">
+              <div class="uk-card-badge uk-label"><%= (cr[:percentage] * 100).round(1) %>%</div>
+        <h3 class="uk-card-title break-word" data-title="<%= cr[:entry].display_name.gsub("\"", "&quot;") %>"><%= cr[:entry].display_name %></h3>
+                <p><%= cr[:entry].pages %> pages</p>
+            </div>
         </div>
-      </a>
-    </div>
-    <%- else -%>
-    <div class="item">
-      <a class="acard" href="/book/<%= ra[:entry].book.id %>">
-        <div class="uk-card uk-card-default">
-          <div class="uk-card-media-top">
-            <img data-src="<%= ra[:entry].cover_url %>" data-width data-height alt="" uk-img>
-          </div>
-          <div class="uk-card-body">
-            <h3 class="uk-card-title break-word" data-title="<%= ra[:entry].book.display_name.gsub("\"", "&quot;") %>"><%= ra[:entry].book.display_name %></h3>
-            <p><%= ra[:grouped_count] %> new entries</p>
-          </div>
-        </div>
-      </a>
-    </div>
+        </a>
+      </div>
     <%- end -%>
+  </div>
   <%- end -%>
-</div>
-<%- end -%>
 
-<!-- TODO: DRY this code with calls in other ecr files? eg. title.ecr -->
-<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>
-        <h4 class="uk-margin-remove-bottom"><a id="modal-title-link"></a></h4>
-    <h3 class="uk-modal-title break-word uk-margin-remove-top" id="modal-entry-title"><span></span></h3>
+  <%- 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| -%>
+      <%- if ra[:grouped_count] == 1 -%>
+      <div class="item" data-progress="<%= ra[:percentage] %>" id="<%= ra[:entry].id %>">
+        <a class="acard">
+          <div class="uk-card uk-card-default" onclick="showModal(&quot;<%= ra[:entry].encoded_path %>&quot;, '<%= ra[:entry].pages %>', <%= (ra[:percentage] * 100).round(1) %>, &quot;<%= ra[:entry].book.encoded_display_name %>&quot;, &quot;<%= ra[:entry].encoded_display_name %>&quot;, '<%= ra[:entry].title_id %>', '<%= ra[:entry].id %>')">
+            <div class="uk-card-media-top">
+              <img data-src="<%= ra[:entry].cover_url %>" alt="" data-width data-height uk-img>
+            </div>
+            <div class="uk-card-body">
+              <div class="uk-card-badge uk-label"><%= (ra[:percentage] * 100).round(1) %>%</div>
+              <h3 class="uk-card-title break-word" data-title="<%= ra[:entry].display_name.gsub("\"", "&quot;") %>"><%= ra[:entry].display_name %></h3>
+              <p><%= ra[:entry].pages %> pages</p>
+            </div>
+          </div>
+        </a>
+      </div>
+      <%- else -%>
+      <div class="item">
+        <a class="acard" href="/book/<%= ra[:entry].book.id %>">
+          <div class="uk-card uk-card-default">
+            <div class="uk-card-media-top">
+              <img data-src="<%= ra[:entry].cover_url %>" data-width data-height alt="" uk-img>
+            </div>
+            <div class="uk-card-body">
+              <h3 class="uk-card-title break-word" data-title="<%= ra[:entry].book.display_name.gsub("\"", "&quot;") %>"><%= ra[:entry].book.display_name %></h3>
+              <p><%= ra[:grouped_count] %> new entries</p>
+            </div>
+          </div>
+        </a>
+      </div>
+      <%- end -%>
+    <%- end -%>
+  </div>
+  <%- end -%>
+
+  <!-- TODO: DRY this code with calls in other ecr files? eg. title.ecr -->
+  <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>
+          <h4 class="uk-margin-remove-bottom"><a id="modal-title-link"></a></h4>
+      <h3 class="uk-modal-title break-word uk-margin-remove-top" id="modal-entry-title"><span></span></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>
-      <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>
+
+<%- end -%>
 
 <% content_for "script" do %>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery.dotdotdot/4.0.11/dotdotdot.js"></script>

From cff599f688a03ad9d04eb36174f1ec045c955990 Mon Sep 17 00:00:00 2001
From: Jared Turner <yalooze@gmail.com>
Date: Mon, 8 Jun 2020 15:23:36 +0100
Subject: [PATCH 20/22] refactor get_recently_added_entries, new_user and
 empty_library

---
 src/library.cr     | 48 +++++++++++++++++-----------------------------
 src/routes/main.cr |  9 ++-------
 2 files changed, 20 insertions(+), 37 deletions(-)

diff --git a/src/library.cr b/src/library.cr
index cadffeb..441bfd2 100644
--- a/src/library.cr
+++ b/src/library.cr
@@ -520,49 +520,37 @@ class Library
     }[0..11]
   end
 
+  alias RA = NamedTuple(entry: Entry, percentage: Float64, grouped_count: Int32)
+
   def get_recently_added_entries(username)
     entries = [] of Entry
     titles.each do |t|
       t.entries.each { |e| entries << e }
     end
     entries.sort! { |a, b| b.date_added <=> a.date_added }
-    # Only grab entries form the last 3 months
-    # otherwise we will be grouping neighbours by Title for the entire
-    # library every time. Is this premature optimisation or reasonable optimisation?
     entries.select! { |e| e.date_added > 3.months.ago }
 
-    i = 0
-    recently_added = [] of NamedTuple(entry: Entry, percentage: Float64, grouped_count: Int32)
-    while i <= entries.size - 1
-      grouped_count = neighbouring_title_count(entries, i)
-      if grouped_count > 1
-        # delete grouped entries (except for first)
-        entries.delete_at(i+1..i+grouped_count-1)
+    # Group Entries if neighbour is same Title
+    recently_added = [] of RA
+    entries.each do |e|
+      last = recently_added.last?
+      if last && e.title_id == last[:entry].title_id
+        # 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
+        recently_added[recently_added.size - 1] = RA.from last_hash
+      else
+        recently_added << {
+          entry:         e,
+          percentage:    e.book.load_percentage(username, e.title),
+          grouped_count: 1,
+        }
       end
-      recently_added << { 
-        entry: entries[i], 
-        percentage: entries[i].book.load_percentage(username, entries[i].title),
-        grouped_count: grouped_count
-      }
-      i += 1
     end
 
     recently_added[0..11]
   end
-
-  private def neighbouring_title_count(entries, index : Int32)
-    count = 1
-    book_title = entries[index].book.title
-    while index < entries.size - 1
-      if book_title == entries[index+1].book.title # is it ok to compare via book.title?
-        count += 1
-      else
-        break
-      end
-      index += 1
-    end
-    count
-  end
   
   private def get_continue_reading_entry(username, title)
     in_progress_entries = title.entries.select do |e|
diff --git a/src/routes/main.cr b/src/routes/main.cr
index 3bde300..2ec45a8 100644
--- a/src/routes/main.cr
+++ b/src/routes/main.cr
@@ -68,14 +68,9 @@ class MainRouter < Router
         username = get_username env
         continue_reading = @context.library.get_continue_reading_entries username
         recently_added = @context.library.get_recently_added_entries username
-
-        new_user = true
         titles = @context.library.titles
-        titles.each { |t| new_user = false if t.load_percentage(username) > 0 }
-
-        empty_library = true
-        empty_library = false if titles.size > 0
-
+        new_user = ! titles.any? { |t| t.load_percentage(username) > 0 }
+        empty_library = titles.size == 0
         layout "home"
       rescue e
         @context.error e

From 0bd94a2290057918e6a41b336a8bc5a0242c1d5b Mon Sep 17 00:00:00 2001
From: Jared Turner <yalooze@gmail.com>
Date: Mon, 8 Jun 2020 15:24:17 +0100
Subject: [PATCH 21/22] Add config path to Config

---
 src/config.cr | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/config.cr b/src/config.cr
index 5e57edf..71177e5 100644
--- a/src/config.cr
+++ b/src/config.cr
@@ -3,6 +3,8 @@ require "yaml"
 class Config
   include YAML::Serializable
 
+  @[YAML::Field(ignore: true)]
+  property path : String = ""
   property port : Int32 = 9000
   property library_path : String = File.expand_path "~/mango/library",
     home: true
@@ -29,6 +31,7 @@ class Config
     cfg_path = File.expand_path path, home: true
     if File.exists? cfg_path
       config = self.from_yaml File.read cfg_path
+      config.path = path
       config.fill_defaults
       return config
     end
@@ -39,6 +42,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

From 6d4e8ea544ec7ffa6878d254b8276f5bba737d20 Mon Sep 17 00:00:00 2001
From: Jared Turner <yalooze@gmail.com>
Date: Mon, 8 Jun 2020 15:24:51 +0100
Subject: [PATCH 22/22] Show config path for empty libraries and link to Admin
 for manual re-scan

---
 src/views/home.ecr | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/home.ecr b/src/views/home.ecr
index 018e8aa..be840d7 100644
--- a/src/views/home.ecr
+++ b/src/views/home.ecr
@@ -8,9 +8,10 @@
       <dt style="font-weight: 500;">Current library path</dt>
       <dd><code><%= @context.config.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>/can/I/access/config_path/from/view?</code></dd>
+      <dd>Update <code>config.yml</code> located at: <code><%= @context.config.path %></code></dd>
       <dt style="font-weight: 500;">Can't see your files yet?</dt>
-      <dd>You must wait <%= @context.config.scan_interval %> minutes for the library scan to complete, or restart Mango.</dd>
+      <dd>You must wait <%= @context.config.scan_interval %> minutes for the library scan to complete
+      <% if is_admin %>, or manually re-scan from <a href="/admin">Admin</a><% end %>.</dd>
     </dl>
   </div>