Merge pull request #156 from hkalexling/dev

v0.20.0

.ameba.yml

@@ -7,3 +7,8 @@ Lint/UnusedArgument:
  - src/routes/*
 Metrics/CyclomaticComplexity:
  Enabled: false
+Layout/LineLength:
+ Enabled: true
+ MaxLength: 80
+ Excluded:
+ - src/routes/api.cr

Makefile

@@ -29,7 +29,6 @@ test:
 check:
  crystal tool format --check
  ./bin/ameba
- ./dev/linewidth.sh
 
 arm32v7:
  crystal build src/mango.cr --release --progress --error-trace --cross-compile --target='arm-linux-gnueabihf' -o mango-arm32v7

README.md

@@ -52,7 +52,7 @@ The official docker images are available on [Dockerhub](https://hub.docker.com/r
 ### CLI
 
 ```
- Mango - Manga Server and Web Reader. Version 0.19.1
+ Mango - Manga Server and Web Reader. Version 0.20.0
 
  Usage:
 
@@ -82,7 +82,6 @@ library_path: ~/mango/library
 db_path: ~/mango/mango.db
 scan_interval_minutes: 5
 thumbnail_generation_interval_hours: 24
-db_optimization_interval_hours: 24
 log_level: info
 upload_path: ~/mango/uploads
 plugin_path: ~/mango/plugins

migration/ids_signature.7.cr

@@ -0,0 +1,50 @@
+class IDSignature < MG::Base
+ def up : String
+ <<-SQL
+ ALTER TABLE ids ADD COLUMN signature TEXT;
+ SQL
+ end
+
+ def down : String
+ <<-SQL
+ -- remove signature column from ids
+ ALTER TABLE ids RENAME TO tmp;
+
+ CREATE TABLE ids (
+ path TEXT NOT NULL,
+ id TEXT NOT NULL
+ );
+
+ INSERT INTO ids
+ SELECT path, id
+ FROM tmp;
+
+ DROP TABLE tmp;
+
+ -- recreate the indices
+ CREATE UNIQUE INDEX path_idx ON ids (path);
+ CREATE UNIQUE INDEX id_idx ON ids (id);
+
+ -- recreate the foreign key constraint on thumbnails
+ ALTER TABLE thumbnails RENAME TO tmp;
+
+ CREATE TABLE thumbnails (
+ id TEXT NOT NULL,
+ data BLOB NOT NULL,
+ filename TEXT NOT NULL,
+ mime TEXT NOT NULL,
+ size INTEGER NOT NULL,
+ FOREIGN KEY (id) REFERENCES ids (id)
+ ON UPDATE CASCADE
+ ON DELETE CASCADE
+ );
+
+ INSERT INTO thumbnails
+ SELECT * FROM tmp;
+
+ DROP TABLE tmp;
+
+ CREATE UNIQUE INDEX tn_index ON thumbnails (id);
+ SQL
+ end
+end

migration/relative_path.8.cr

@@ -0,0 +1,33 @@
+class RelativePath < MG::Base
+ def up : String
+ base = Config.current.library_path
+ # Escape single quotes in case the path contains them, and remove the
+ # trailing slash (this is a mistake, fixed in DB version 10)
+ base = base.gsub("'", "''").rstrip "/"
+
+ <<-SQL
+ -- update the path column in ids to relative paths
+ UPDATE ids
+ SET path = REPLACE(path, '#{base}', '');
+
+ -- update the path column in titles to relative paths
+ UPDATE titles
+ SET path = REPLACE(path, '#{base}', '');
+ SQL
+ end
+
+ def down : String
+ base = Config.current.library_path
+ base = base.gsub("'", "''").rstrip "/"
+
+ <<-SQL
+ -- update the path column in ids to absolute paths
+ UPDATE ids
+ SET path = '#{base}' || path;
+
+ -- update the path column in titles to absolute paths
+ UPDATE titles
+ SET path = '#{base}' || path;
+ SQL
+ end
+end

migration/relative_path_fix.10.cr

@@ -0,0 +1,31 @@
+# In DB version 8, we replaced the absolute paths in DB with relative paths,
+# but we mistakenly left the starting slashes. This migration removes them.
+class RelativePathFix < MG::Base
+ def up : String
+ <<-SQL
+ -- remove leading slashes from the paths in ids
+ UPDATE ids
+ SET path = SUBSTR(path, 2, LENGTH(path) - 1)
+ WHERE path LIKE '/%';
+
+ -- remove leading slashes from the paths in titles
+ UPDATE titles
+ SET path = SUBSTR(path, 2, LENGTH(path) - 1)
+ WHERE path LIKE '/%';
+ SQL
+ end
+
+ def down : String
+ <<-SQL
+ -- add leading slashes to paths in ids
+ UPDATE ids
+ SET path = '/' || path
+ WHERE path NOT LIKE '/%';
+
+ -- add leading slashes to paths in titles
+ UPDATE titles
+ SET path = '/' || path
+ WHERE path NOT LIKE '/%';
+ SQL
+ end
+end

migration/unavailable.9.cr

@@ -0,0 +1,94 @@
+class UnavailableIDs < MG::Base
+ def up : String
+ <<-SQL
+ -- add unavailable column to ids
+ ALTER TABLE ids ADD COLUMN unavailable INTEGER NOT NULL DEFAULT 0;
+
+ -- add unavailable column to titles
+ ALTER TABLE titles ADD COLUMN unavailable INTEGER NOT NULL DEFAULT 0;
+ SQL
+ end
+
+ def down : String
+ <<-SQL
+ -- remove unavailable column from ids
+ ALTER TABLE ids RENAME TO tmp;
+
+ CREATE TABLE ids (
+ path TEXT NOT NULL,
+ id TEXT NOT NULL,
+ signature TEXT
+ );
+
+ INSERT INTO ids
+ SELECT path, id, signature
+ FROM tmp;
+
+ DROP TABLE tmp;
+
+ -- recreate the indices
+ CREATE UNIQUE INDEX path_idx ON ids (path);
+ CREATE UNIQUE INDEX id_idx ON ids (id);
+
+ -- recreate the foreign key constraint on thumbnails
+ ALTER TABLE thumbnails RENAME TO tmp;
+
+ CREATE TABLE thumbnails (
+ id TEXT NOT NULL,
+ data BLOB NOT NULL,
+ filename TEXT NOT NULL,
+ mime TEXT NOT NULL,
+ size INTEGER NOT NULL,
+ FOREIGN KEY (id) REFERENCES ids (id)
+ ON UPDATE CASCADE
+ ON DELETE CASCADE
+ );
+
+ INSERT INTO thumbnails
+ SELECT * FROM tmp;
+
+ DROP TABLE tmp;
+
+ CREATE UNIQUE INDEX tn_index ON thumbnails (id);
+
+ -- remove unavailable column from titles
+ ALTER TABLE titles RENAME TO tmp;
+
+ CREATE TABLE titles (
+ id TEXT NOT NULL,
+ path TEXT NOT NULL,
+ signature TEXT
+ );
+
+ INSERT INTO titles
+ SELECT path, id, signature
+ FROM tmp;
+
+ DROP TABLE tmp;
+
+ -- recreate the indices
+ CREATE UNIQUE INDEX titles_id_idx on titles (id);
+ CREATE UNIQUE INDEX titles_path_idx on titles (path);
+
+ -- recreate the foreign key constraint on tags
+ ALTER TABLE tags RENAME TO tmp;
+
+ CREATE TABLE tags (
+ id TEXT NOT NULL,
+ tag TEXT NOT NULL,
+ UNIQUE (id, tag),
+ FOREIGN KEY (id) REFERENCES titles (id)
+ ON UPDATE CASCADE
+ ON DELETE CASCADE
+ );
+
+ INSERT INTO tags
+ SELECT * FROM tmp;
+
+ DROP TABLE tmp;
+
+ CREATE INDEX tags_id_idx ON tags (id);
+ CREATE INDEX tags_tag_idx ON tags (tag);
+ SQL
+ end
+end

public/css/mango.less

@@ -66,7 +66,6 @@
 
 // Dark theme
 .uk-light {
- .uk-navbar-dropdown,
  .uk-modal-header,
  .uk-modal-body,
  .uk-modal-footer {
@@ -75,6 +74,7 @@
  .uk-navbar-dropdown,
  .uk-dropdown {
  color: #ccc;
+ background: #333;
  }
  .uk-nav-header,
  .uk-description-list > dt {

public/js/download.js

@@ -156,8 +156,8 @@ const search = () => {
  langs.unshift('All');
  group_names.unshift('All');
 
- $('select#lang-select').append(langs.map(e => `<option>${e}</option>`).join(''));
- $('select#group-select').append(group_names.map(e => `<option>${e}</option>`).join(''));
+ $('select#lang-select').html(langs.map(e => `<option>${e}</option>`).join(''));
+ $('select#group-select').html(group_names.map(e => `<option>${e}</option>`).join(''));
 
  $('#filter-form').removeAttr('hidden');
 
@@ -241,7 +241,7 @@ const buildTable = () => {
  if (v === 'All') return;
  if (k === 'group') {
  chapters = chapters.filter(c => {
- unescaped_groups = Object.entries(c.groups).map(([g, id]) => unescapeHTML(g));
+ const unescaped_groups = Object.entries(c.groups).map(([g, id]) => unescapeHTML(g));
  return unescaped_groups.indexOf(v) >= 0;
  });
  return;

public/js/missing-items.js

@@ -0,0 +1,60 @@
+const component = () => {
+ return {
+ empty: true,
+ titles: [],
+ entries: [],
+ loading: true,
+
+ load() {
+ this.loading = true;
+ this.request('GET', `${base_url}api/admin/titles/missing`, data => {
+ this.titles = data.titles;
+ this.request('GET', `${base_url}api/admin/entries/missing`, data => {
+ this.entries = data.entries;
+ this.loading = false;
+ this.empty = this.entries.length === 0 && this.titles.length === 0;
+ });
+ });
+ },
+ rm(event) {
+ const rawID = event.currentTarget.closest('tr').id;
+ const [type, id] = rawID.split('-');
+ const url = `${base_url}api/admin/${type === 'title' ? 'titles' : 'entries'}/missing/${id}`;
+ this.request('DELETE', url, () => {
+ this.load();
+ });
+ },
+ rmAll() {
+ UIkit.modal.confirm('Are you sure? All metadata associated with these items, including their tags and thumbnails, will be deleted from the database.', {
+ labels: {
+ ok: 'Yes, delete them',
+ cancel: 'Cancel'
+ }
+ }).then(() => {
+ this.request('DELETE', `${base_url}api/admin/titles/missing`, () => {
+ this.request('DELETE', `${base_url}api/admin/entries/missing`, () => {
+ this.load();
+ });
+ });
+ });
+ },
+ request(method, url, cb) {
+ console.log(url);
+ $.ajax({
+ type: method,
+ url: url,
+ contentType: 'application/json'
+ })
+ .done(data => {
+ if (data.error) {
+ alert('danger', `Failed to ${method} ${url}. Error: ${data.error}`);
+ return;
+ }
+ if (cb) cb(data);
+ })
+ .fail((jqXHR, status) => {
+ alert('danger', `Failed to ${method} ${url}. Error: [${jqXHR.status}] ${jqXHR.statusText}`);
+ });
+ }
+ };
+};

shard.yml

@@ -1,5 +1,5 @@
 name: mango
-version: 0.19.1
+version: 0.20.0
 
 authors:
  - Alex Ling <hkalexling@gmail.com>

spec/util_spec.cr

@@ -35,6 +35,23 @@ describe "compare_numerically" do
  end
 end
 
+describe "is_supported_file" do
+ it "returns true when the filename has a supported extension" do
+ filename = "manga.cbz"
+ is_supported_file(filename).should eq true
+ end
+
+ it "returns true when the filename does not have a supported extension" do
+ filename = "info.json"
+ is_supported_file(filename).should eq false
+ end
+
+ it "is case insensitive" do
+ filename = "manga.ZiP"
+ is_supported_file(filename).should eq true
+ end
+end
+
 describe "chapter_sort" do
  it "sorts correctly" do
  ary = ["Vol.1 Ch.01", "Vol.1 Ch.02", "Vol.2 Ch. 2.5", "Ch. 3", "Ch.04"]

src/config.cr

@@ -13,7 +13,6 @@ class Config
  property db_path : String = File.expand_path "~/mango/mango.db", home: true
  property scan_interval_minutes : Int32 = 5
  property thumbnail_generation_interval_hours : Int32 = 24
- property db_optimization_interval_hours : Int32 = 24
  property log_level : String = "info"
  property upload_path : String = File.expand_path "~/mango/uploads",
  home: true