Merge branch 'dev' into feature/plugin-v2

gulpfile.js

@@ -55,7 +55,7 @@ gulp.task('minify-css', () => {
 gulp.task('copy-files', () => {
 	return gulp.src([
 			'public/*.*',
-			'public/img/*',
+			'public/img/**',
 			'public/webfonts/*',
 			'public/js/*.min.js'
 		], {

public/js/admin.js

@@ -31,6 +31,9 @@ const component = () => {
 					this.scanMs = data.milliseconds;
 					this.scanTitles = data.titles;
 				})
+				.catch(e => {
+					alert('danger', `Failed to trigger a scan. Error: ${e}`);
+				})
 				.always(() => {
 					this.scanning = false;
 				});

public/manifest.json

@@ -0,0 +1,23 @@
+{
+	"name": "Mango",
+	"description": "Mango: A self-hosted manga server and web reader",
+	"icons": [
+		{
+			"src": "/img/icons/icon_x96.png",
+			"sizes": "96x96",
+			"type": "image/png"
+		},
+		{
+			"src": "/img/icons/icon_x192.png",
+			"sizes": "192x192",
+			"type": "image/png"
+		},
+		{
+			"src": "/img/icons/icon_x512.png",
+			"sizes": "512x512",
+			"type": "image/png"
+		}
+	],
+	"display": "fullscreen",
+	"start_url": "/"
+}

src/library/entry.cr

@@ -109,7 +109,7 @@ class Entry
   end
 
   def cover_url
-    return "#{Config.current.base_url}img/icon.png" if @err_msg
+    return "#{Config.current.base_url}img/icons/icon_x192.png" if @err_msg
 
     unless @book.entry_cover_url_cache
       TitleInfo.new @book.dir do |info|
@@ -145,13 +145,17 @@ class Entry
   def read_page(page_num)
     raise "Unreadble archive. #{@err_msg}" if @err_msg
     img = nil
-    sorted_archive_entries do |file, entries|
+    begin
-      page = entries[page_num - 1]
+      sorted_archive_entries do |file, entries|
-      data = file.read_entry page
+        page = entries[page_num - 1]
-      if data
+        data = file.read_entry page
-        img = Image.new data, MIME.from_filename(page.filename), page.filename,
+        if data
-          data.size
+          img = Image.new data, MIME.from_filename(page.filename),
+            page.filename, data.size
+        end
       end
+    rescue e
+      Logger.warn "Unable to read page #{page_num} of #{@zip_path}. Error: #{e}"
     end
     img
   end

src/library/title.cr

@@ -411,7 +411,7 @@ class Title
     cached_cover_url = @cached_cover_url
     return cached_cover_url unless cached_cover_url.nil?
 
-    url = "#{Config.current.base_url}img/icon.png"
+    url = "#{Config.current.base_url}img/icons/icon_x192.png"
     readable_entries = @entries.select &.err_msg.nil?
     if readable_entries.size > 0
       url = readable_entries[0].cover_url

src/views/admin.html.ecr

@@ -40,5 +40,6 @@
 <a class="uk-button uk-button-danger" href="<%= base_url %>logout">Log Out</a>
 
 <% content_for "script" do %>
+  <script src="<%= base_url %>js/alert.js"></script>
   <script src="<%= base_url %>js/admin.js"></script>
 <% end %>

src/views/components/head.html.ecr

@@ -6,6 +6,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="stylesheet" href="<%= base_url %>css/mango.css" />
   <link rel="icon" href="<%= base_url %>favicon.ico">
+  <link rel="manifest" href="<%= base_url %>manifest.json">
 
   <script src="https://polyfill.io/v3/polyfill.min.js?features=MutationObserver%2Cdefault%2CmatchMedia&flats=gated"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>

src/views/layout.html.ecr

@@ -37,7 +37,7 @@
           <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@m">
-          <a class="uk-navbar-item uk-logo" href="<%= base_url %>"><img src="<%= base_url %>img/icon.png" style="width:90px;height:90px;"></a>
+          <a class="uk-navbar-item uk-logo" href="<%= base_url %>"><img src="<%= base_url %>img/icons/icon_x96.png" style="width:90px;height:90px;"></a>
           <ul class="uk-navbar-nav">
             <li><a href="<%= base_url %>">Home</a></li>
             <li><a href="<%= base_url %>library">Library</a></li>