From bd34b803f13565a47ce22028d0904ddbff961bb0 Mon Sep 17 00:00:00 2001 From: Alex Ling Date: Wed, 30 Dec 2020 11:12:56 +0000 Subject: [PATCH 01/14] Tokens take precedence over default user setting --- src/handlers/auth_handler.cr | 13 ++++++++++--- src/util/web.cr | 9 ++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/handlers/auth_handler.cr b/src/handlers/auth_handler.cr index 1db4376..3f094eb 100644 --- a/src/handlers/auth_handler.cr +++ b/src/handlers/auth_handler.cr @@ -74,10 +74,17 @@ class AuthHandler < Kemal::Handler end if request_path_startswith env, ["/admin", "/api/admin", "/download"] - unless validate_token_admin(env) || - Storage.default.username_is_admin Config.current.default_username - env.response.status_code = 403 + # The token (if exists) takes precedence over the default user option. + # this is why we check the default username first before checking the + # token. + should_reject = true + if Storage.default.username_is_admin Config.current.default_username + should_reject = false end + if env.session.string? "token" + should_reject = !validate_token_admin(env) + end + env.response.status_code = 403 if should_reject end call_next env diff --git a/src/util/web.cr b/src/util/web.cr index 647a536..504bbaa 100644 --- a/src/util/web.cr +++ b/src/util/web.cr @@ -4,13 +4,16 @@ macro layout(name) base_url = Config.current.base_url begin is_admin = false - if token = env.session.string? "token" - is_admin = @context.storage.verify_admin token - end + # The token (if exists) takes precedence over the default user option. + # this is why we check the default username first before checking the + # token. if Config.current.disable_login is_admin = @context.storage. username_is_admin Config.current.default_username end + if token = env.session.string? "token" + is_admin = @context.storage.verify_admin token + end page = {{name}} render "src/views/#{{{name}}}.html.ecr", "src/views/layout.html.ecr" rescue e From ce88acb9e5b3ff564d5e6d91c64449522115e092 Mon Sep 17 00:00:00 2001 From: Alex Ling Date: Mon, 28 Dec 2020 16:29:29 +0000 Subject: [PATCH 02/14] Simplify the request_path_startswith helper method --- src/util/web.cr | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/util/web.cr b/src/util/web.cr index 504bbaa..03af6a2 100644 --- a/src/util/web.cr +++ b/src/util/web.cr @@ -59,12 +59,7 @@ def hash_to_query(hash) end def request_path_startswith(env, ary) - ary.each do |prefix| - if env.request.path.starts_with? prefix - return true - end - end - false + ary.any? { |prefix| env.request.path.starts_with? prefix } end def requesting_static_file(env) From 45a81ad5f6f6ae334fc6d890cb366811eea8dca1 Mon Sep 17 00:00:00 2001 From: Alex Ling Date: Tue, 29 Dec 2020 04:33:55 +0000 Subject: [PATCH 03/14] Display the entries and sub-titles count --- src/library/title.cr | 14 ++++++++++++-- src/views/components/card.html.ecr | 2 +- src/views/title.html.ecr | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/library/title.cr b/src/library/title.cr index 52e9838..d72bb48 100644 --- a/src/library/title.cr +++ b/src/library/title.cr @@ -108,8 +108,18 @@ class Title ary.reverse end - def size - @entries.size + @title_ids.size + # Returns a string the describes the content of the title + # e.g., - 3 titles and 1 entry + # - 4 entries + # - 1 title + def content_label + ary = [] of String + tsize = titles.size + esize = entries.size + + ary << "#{tsize} #{tsize > 1 ? "titles" : "title"}" if tsize > 0 + ary << "#{esize} #{esize > 1 ? "entries" : "entry"}" if esize > 0 + ary.join " and " end def get_entry(eid) diff --git a/src/views/components/card.html.ecr b/src/views/components/card.html.ecr index a116fee..b85d39e 100644 --- a/src/views/components/card.html.ecr +++ b/src/views/components/card.html.ecr @@ -76,7 +76,7 @@ <% end %> <% if item.is_a? Title %> <% if grouped_count == 1 %> -

<%= item.size %> entries

+

<%= item.content_label %>

<% else %>

<%= grouped_count %> new entries

<% end %> diff --git a/src/views/title.html.ecr b/src/views/title.html.ecr index 9d22f22..53db6ab 100644 --- a/src/views/title.html.ecr +++ b/src/views/title.html.ecr @@ -32,7 +32,7 @@ <%- end -%>
  • <%= title.display_name %>
    • -

    <%= title.size %> entries found

    +

    <%= title.content_label %> found

    From 276f62cb76bfdb45d069eca7ebea6c60301bd5e4 Mon Sep 17 00:00:00 2001 From: Alex Ling Date: Tue, 29 Dec 2020 08:32:55 +0000 Subject: [PATCH 04/14] Update DB for tags --- src/storage.cr | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/src/storage.cr b/src/storage.cr index ffcd753..dde0b0b 100644 --- a/src/storage.cr +++ b/src/storage.cr @@ -35,16 +35,24 @@ class Storage MainFiber.run do DB.open "sqlite3://#{@path}" do |db| begin + # v0.18.0 + db.exec "create table tags (id text, tag text)" + db.exec "create index tags_id_idx on tags (id)" + db.exec "create index tags_tag_idx on tags (tag)" + + # v0.15.0 db.exec "create table thumbnails " \ "(id text, data blob, filename text, " \ "mime text, size integer)" db.exec "create unique index tn_index on thumbnails (id)" + # v0.1.1 db.exec "create table ids" \ "(path text, id text, is_title integer)" db.exec "create unique index path_idx on ids (path)" db.exec "create unique index id_idx on ids (id)" + # v0.1.0 db.exec "create table users" \ "(username text, password text, token text, admin integer)" rescue e @@ -296,6 +304,64 @@ class Storage img end + def get_tags(id : String) : Array(String) + tags = [] of String + MainFiber.run do + get_db do |db| + db.query "select tag from tags where id = (?)", id do |rs| + rs.each do + tags << rs.read String + end + end + end + end + tags + end + + def get_tag_titles(tag : String) : Array(String) + tids = [] of String + MainFiber.run do + get_db do |db| + db.query "select id from tags where tag = (?)", tag do |rs| + rs.each do + tids << rs.read String + end + end + end + end + tids + end + + def list_tags : Array(String) + tags = [] of String + MainFiber.run do + get_db do |db| + db.query "select distinct tag from tags" do |rs| + rs.each do + tags << rs.read String + end + end + end + end + tags + end + + def add_tag(id : String, tag : String) + MainFiber.run do + get_db do |db| + db.exec "insert into tags values (?, ?)", id, tag + end + end + end + + def delete_tag(id : String, tag : String) + MainFiber.run do + get_db do |db| + db.exec "delete from tags where id = (?) and tag = (?)", id, tag + end + end + end + def optimize MainFiber.run do Logger.info "Starting DB optimization" @@ -322,6 +388,15 @@ class Storage db.exec "delete from thumbnails where id not in (select id from ids)" Logger.info "#{trash_thumbnails_count} dangling thumbnails deleted" end + + # Delete dangling tags + trash_tags_count = db.query_one "select count(*) from tags " \ + "where id not in " \ + "(select id from ids)", as: Int32 + if trash_tags_count > 0 + db.exec "delete from tags where id not in (select id from ids)" + Logger.info "#{trash_tags_count} dangling tags deleted" + end end Logger.info "DB optimization finished" end From bfc1b697bd54105838562f43ed60ea9e9c9acac3 Mon Sep 17 00:00:00 2001 From: Alex Ling Date: Tue, 29 Dec 2020 16:39:53 +0000 Subject: [PATCH 05/14] Add tag related methods for `Title` --- src/library/title.cr | 12 ++++++++++++ src/storage.cr | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/library/title.cr b/src/library/title.cr index d72bb48..f9af6f7 100644 --- a/src/library/title.cr +++ b/src/library/title.cr @@ -122,6 +122,18 @@ class Title ary.join " and " end + def tags + Storage.default.get_title_tags @id + end + + def add_tag(tag) + Storage.default.add_tag @id, tag + end + + def delete_tag(tag) + Storage.default.delete_tag @id, tag + end + def get_entry(eid) @entries.find { |e| e.id == eid } end diff --git a/src/storage.cr b/src/storage.cr index dde0b0b..63ac460 100644 --- a/src/storage.cr +++ b/src/storage.cr @@ -304,7 +304,7 @@ class Storage img end - def get_tags(id : String) : Array(String) + def get_title_tags(id : String) : Array(String) tags = [] of String MainFiber.run do get_db do |db| From a6862e86d4560476591d31bb396221a838a6cc26 Mon Sep 17 00:00:00 2001 From: Alex Ling Date: Wed, 30 Dec 2020 05:35:02 +0000 Subject: [PATCH 06/14] Update alpine --- src/views/components/head.html.ecr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/components/head.html.ecr b/src/views/components/head.html.ecr index c65ddea..2fe57ef 100644 --- a/src/views/components/head.html.ecr +++ b/src/views/components/head.html.ecr @@ -12,7 +12,7 @@ - - + + From 40a24f4247069b337e28af61a623457ee4f68edb Mon Sep 17 00:00:00 2001 From: Alex Ling Date: Wed, 30 Dec 2020 05:35:28 +0000 Subject: [PATCH 07/14] Add tags to the web UI --- public/js/title.js | 30 ++++++++++++++++++++++++++++++ src/views/components/tags.html.ecr | 15 +++++++++++++++ src/views/title.html.ecr | 2 ++ 3 files changed, 47 insertions(+) create mode 100644 src/views/components/tags.html.ecr diff --git a/public/js/title.js b/public/js/title.js index d46c173..6f53265 100644 --- a/public/js/title.js +++ b/public/js/title.js @@ -252,3 +252,33 @@ const bulkProgress = (action, el) => { deselectAll(); }); }; + +const tagsComponent = () => { + return { + tags: tags, + newTag: '', + inputShown: false, + add() { + this.tags.push(this.newTag); + this.newTag = ''; + }, + keydown(event) { + if (event.key === 'Enter') + this.add() + }, + rm(event) { + const tag = event.currentTarget.id.split('-')[0]; + const idx = this.tags.indexOf(tag); + if (idx < 0) return; + this.tags.splice(idx, 1); + }, + toggleInput(nextTick) { + this.inputShown = !this.inputShown; + if (this.inputShown) { + nextTick(() => { + $('#tag-input').get(0).focus(); + }); + } + } + }; +}; diff --git a/src/views/components/tags.html.ecr b/src/views/components/tags.html.ecr new file mode 100644 index 0000000..a443393 --- /dev/null +++ b/src/views/components/tags.html.ecr @@ -0,0 +1,15 @@ + +
    +

    + Tags: + + +

    + +
    diff --git a/src/views/title.html.ecr b/src/views/title.html.ecr index 53db6ab..ff14fee 100644 --- a/src/views/title.html.ecr +++ b/src/views/title.html.ecr @@ -33,6 +33,8 @@
  • <%= title.display_name %>

    • <%= title.content_label %> found

    +<% tags = title.tags %> +<%= render_component "tags" %>
    From 0f1d1099f61c198ad2c0733ca701b1d45280f8f8 Mon Sep 17 00:00:00 2001 From: Alex Ling Date: Wed, 30 Dec 2020 07:24:32 +0000 Subject: [PATCH 08/14] Add unique constraint to tags and error handling --- src/storage.cr | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/storage.cr b/src/storage.cr index 63ac460..d145181 100644 --- a/src/storage.cr +++ b/src/storage.cr @@ -36,7 +36,7 @@ class Storage DB.open "sqlite3://#{@path}" do |db| begin # v0.18.0 - db.exec "create table tags (id text, tag text)" + db.exec "create table tags (id text, tag text, unique (id, tag))" db.exec "create index tags_id_idx on tags (id)" db.exec "create index tags_tag_idx on tags (tag)" @@ -347,11 +347,17 @@ class Storage end def add_tag(id : String, tag : String) + err = nil MainFiber.run do - get_db do |db| - db.exec "insert into tags values (?, ?)", id, tag + begin + get_db do |db| + db.exec "insert into tags values (?, ?)", id, tag + end + rescue e + err = e end end + raise err.not_nil! if err end def delete_tag(id : String, tag : String) From b05ed5776239b20832db104538788cfceb345fca Mon Sep 17 00:00:00 2001 From: Alex Ling Date: Wed, 30 Dec 2020 07:25:13 +0000 Subject: [PATCH 09/14] Add API endpoints for tags --- public/js/title.js | 34 +++++++++++++++++++++++++++++----- src/routes/api.cr | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 5 deletions(-) diff --git a/public/js/title.js b/public/js/title.js index 6f53265..4fbb428 100644 --- a/public/js/title.js +++ b/public/js/title.js @@ -259,8 +259,11 @@ const tagsComponent = () => { newTag: '', inputShown: false, add() { - this.tags.push(this.newTag); - this.newTag = ''; + const tag = this.newTag; + this.request(tag, 'PUT', () => { + this.tags.push(tag); + this.newTag = ''; + }); }, keydown(event) { if (event.key === 'Enter') @@ -268,9 +271,11 @@ const tagsComponent = () => { }, rm(event) { const tag = event.currentTarget.id.split('-')[0]; - const idx = this.tags.indexOf(tag); - if (idx < 0) return; - this.tags.splice(idx, 1); + this.request(tag, 'DELETE', () => { + const idx = this.tags.indexOf(tag); + if (idx < 0) return; + this.tags.splice(idx, 1); + }); }, toggleInput(nextTick) { this.inputShown = !this.inputShown; @@ -279,6 +284,25 @@ const tagsComponent = () => { $('#tag-input').get(0).focus(); }); } + }, + request(tag, method, cb) { + const tid = $('.upload-field').attr('data-title-id'); + const url = `${base_url}api/tags/${tid}/${encodeURIComponent(tag)}`; + $.ajax({ + url: url, + method: method, + dataType: 'json' + }) + .done(data => { + if (data.success) + cb(); + else { + alert('danger', data.error); + } + }) + .fail((jqXHR, status) => { + alert('danger', `Error: [${jqXHR.status}] ${jqXHR.statusText}`); + }); } }; }; diff --git a/src/routes/api.cr b/src/routes/api.cr index ad4f497..4f5f334 100644 --- a/src/routes/api.cr +++ b/src/routes/api.cr @@ -685,6 +685,50 @@ class APIRouter < Router end end + Koa.describe "Adds a new tag to a title" + Koa.path "tid", desc: "A title ID" + Koa.response 200, ref: "$result" + put "/api/tags/:tid/:tag" do |env| + begin + title = (@context.library.get_title env.params.url["tid"]).not_nil! + tag = env.params.url["tag"] + + title.add_tag tag + send_json env, { + "success" => true, + "error" => nil, + }.to_json + rescue e + @context.error e + send_json env, { + "success" => false, + "error" => e.message, + }.to_json + end + end + + Koa.describe "Deletes a tag from a title" + Koa.path "tid", desc: "A title ID" + Koa.response 200, ref: "$result" + delete "/api/tags/:tid/:tag" do |env| + begin + title = (@context.library.get_title env.params.url["tid"]).not_nil! + tag = env.params.url["tag"] + + title.delete_tag tag + send_json env, { + "success" => true, + "error" => nil, + }.to_json + rescue e + @context.error e + send_json env, { + "success" => false, + "error" => e.message, + }.to_json + end + end + doc = Koa.generate @@api_json = doc.to_json if doc From c6ee5409f8364787cf10e3eac483348bd53e4796 Mon Sep 17 00:00:00 2001 From: Alex Ling Date: Wed, 30 Dec 2020 08:14:55 +0000 Subject: [PATCH 10/14] Trim input tag --- public/js/title.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/title.js b/public/js/title.js index 4fbb428..284ae5e 100644 --- a/public/js/title.js +++ b/public/js/title.js @@ -259,7 +259,7 @@ const tagsComponent = () => { newTag: '', inputShown: false, add() { - const tag = this.newTag; + const tag = this.newTag.trim(); this.request(tag, 'PUT', () => { this.tags.push(tag); this.newTag = ''; From 1eace2c64ca61117fdf4b901d6875f548c385c8b Mon Sep 17 00:00:00 2001 From: Alex Ling Date: Wed, 30 Dec 2020 08:15:20 +0000 Subject: [PATCH 11/14] Add the /tags/:tag page --- src/library/library.cr | 25 ++----------------------- src/routes/main.cr | 25 +++++++++++++++++++++++++ src/util/util.cr | 25 +++++++++++++++++++++++++ src/views/components/tags.html.ecr | 2 +- src/views/tags.html.ecr | 30 ++++++++++++++++++++++++++++++ 5 files changed, 83 insertions(+), 24 deletions(-) create mode 100644 src/views/tags.html.ecr diff --git a/src/library/library.cr b/src/library/library.cr index 35d9e89..a7e1c49 100644 --- a/src/library/library.cr +++ b/src/library/library.cr @@ -68,29 +68,8 @@ class Library end end - # This is a hack to bypass a compiler bug - ary = titles - - case opt.not_nil!.method - when .time_modified? - ary.sort! { |a, b| (a.mtime <=> b.mtime).or \ - compare_numerically a.title, b.title } - when .progress? - ary.sort! do |a, b| - (a.load_percentage(username) <=> b.load_percentage(username)).or \ - compare_numerically a.title, b.title - end - else - unless opt.method.auto? - Logger.warn "Unknown sorting method #{opt.not_nil!.method}. Using " \ - "Auto instead" - end - ary.sort! { |a, b| compare_numerically a.title, b.title } - end - - ary.reverse! unless opt.not_nil!.ascend - - ary + # Helper function from src/util/util.cr + sort_titles titles, opt.not_nil!, username end def deep_titles diff --git a/src/routes/main.cr b/src/routes/main.cr index cb919cf..67719b8 100644 --- a/src/routes/main.cr +++ b/src/routes/main.cr @@ -114,6 +114,31 @@ class MainRouter < Router end end + get "/tags/:tag" do |env| + begin + username = get_username env + tag = env.params.url["tag"] + + sort_opt = SortOptions.new + get_sort_opt + + title_ids = Storage.default.get_tag_titles tag + + raise "Tag #{tag} not found" if title_ids.empty? + + titles = title_ids.map { |id| @context.library.get_title id } + .select Title + + titles = sort_titles titles, sort_opt, username + percentage = titles.map &.load_percentage username + + layout "tags" + rescue e + @context.error e + env.response.status_code = 404 + end + end + get "/api" do |env| render "src/views/api.html.ecr" end diff --git a/src/util/util.cr b/src/util/util.cr index 3fc1b2d..d7c0412 100644 --- a/src/util/util.cr +++ b/src/util/util.cr @@ -67,3 +67,28 @@ def env_is_true?(key : String) : Bool return false unless val val.downcase.in? "1", "true" end + +def sort_titles(titles : Array(Title), opt : SortOptions, username : String) + ary = titles + + case opt.method + when .time_modified? + ary.sort! { |a, b| (a.mtime <=> b.mtime).or \ + compare_numerically a.title, b.title } + when .progress? + ary.sort! do |a, b| + (a.load_percentage(username) <=> b.load_percentage(username)).or \ + compare_numerically a.title, b.title + end + else + unless opt.method.auto? + Logger.warn "Unknown sorting method #{opt.not_nil!.method}. Using " \ + "Auto instead" + end + ary.sort! { |a, b| compare_numerically a.title, b.title } + end + + ary.reverse! unless opt.not_nil!.ascend + + ary +end diff --git a/src/views/components/tags.html.ecr b/src/views/components/tags.html.ecr index a443393..7795dcf 100644 --- a/src/views/components/tags.html.ecr +++ b/src/views/components/tags.html.ecr @@ -6,7 +6,7 @@ Tags: diff --git a/src/views/tags.html.ecr b/src/views/tags.html.ecr new file mode 100644 index 0000000..58300e1 --- /dev/null +++ b/src/views/tags.html.ecr @@ -0,0 +1,30 @@ +

    Tag: <%= tag %>

    +

    <%= titles.size %> titles tagged

    +
    +
    + + + + +
    +
    + <% hash = { + "auto" => "Auto", + "time_modified" => "Date Modified", + "progress" => "Progress" + } %> + <%= render_component "sort-form" %> +
    +
    +
    + <% titles.each_with_index do |item, i| %> + <% progress = percentage[i] %> + <%= render_component "card" %> + <% end %> +
    + +<% content_for "script" do %> + <%= render_component "dots-scripts" %> + + +<% end %> From 81884567889374f71f2aae5076ffb00fb0d13bb2 Mon Sep 17 00:00:00 2001 From: Alex Ling Date: Wed, 30 Dec 2020 10:40:06 +0000 Subject: [PATCH 12/14] Finish tagging --- public/js/title.js | 26 +++++++++++++++++------ src/routes/api.cr | 27 ++++++++++++++++++++++++ src/routes/main.cr | 14 +++++++++++- src/views/components/tags.html.ecr | 7 ++---- src/views/tag.html.ecr | 30 ++++++++++++++++++++++++++ src/views/tags.html.ecr | 34 ++++++------------------------ src/views/title.html.ecr | 3 ++- 7 files changed, 99 insertions(+), 42 deletions(-) create mode 100644 src/views/tag.html.ecr diff --git a/public/js/title.js b/public/js/title.js index 284ae5e..fb4f4c1 100644 --- a/public/js/title.js +++ b/public/js/title.js @@ -255,12 +255,22 @@ const bulkProgress = (action, el) => { const tagsComponent = () => { return { - tags: tags, + loading: true, + tags: [], newTag: '', inputShown: false, + tid: $('.upload-field').attr('data-title-id'), + load() { + const url = `${base_url}api/tags/${this.tid}`; + this.request(url, 'GET', (data) => { + this.tags = data.tags; + this.loading = false; + }); + }, add() { const tag = this.newTag.trim(); - this.request(tag, 'PUT', () => { + const url = `${base_url}api/tags/${this.tid}/${encodeURIComponent(tag)}`; + this.request(url, 'PUT', () => { this.tags.push(tag); this.newTag = ''; }); @@ -271,7 +281,8 @@ const tagsComponent = () => { }, rm(event) { const tag = event.currentTarget.id.split('-')[0]; - this.request(tag, 'DELETE', () => { + const url = `${base_url}api/tags/${this.tid}/${encodeURIComponent(tag)}`; + this.request(url, 'DELETE', () => { const idx = this.tags.indexOf(tag); if (idx < 0) return; this.tags.splice(idx, 1); @@ -285,9 +296,10 @@ const tagsComponent = () => { }); } }, - request(tag, method, cb) { - const tid = $('.upload-field').attr('data-title-id'); - const url = `${base_url}api/tags/${tid}/${encodeURIComponent(tag)}`; + buildURL(tid, tag) { + + }, + request(url, method, cb) { $.ajax({ url: url, method: method, @@ -295,7 +307,7 @@ const tagsComponent = () => { }) .done(data => { if (data.success) - cb(); + cb(data); else { alert('danger', data.error); } diff --git a/src/routes/api.cr b/src/routes/api.cr index 4f5f334..9a85215 100644 --- a/src/routes/api.cr +++ b/src/routes/api.cr @@ -160,6 +160,12 @@ class APIRouter < Router "ids" => "$strAry", } + Koa.object "tagsResult", { + "success" => "boolean", + "tags" => "$strAry?", + "error" => "string?", + } + Koa.describe "Returns a page in a manga entry" Koa.path "tid", desc: "Title ID" Koa.path "eid", desc: "Entry ID" @@ -685,6 +691,27 @@ class APIRouter < Router end end + Koa.describe "Gets the tags of a title" + Koa.path "tid", desc: "A title ID" + Koa.response 200, ref: "$tagsResult" + get "/api/tags/:tid" do |env| + begin + title = (@context.library.get_title env.params.url["tid"]).not_nil! + tags = title.tags + + send_json env, { + "success" => true, + "tags" => tags, + }.to_json + rescue e + @context.error e + send_json env, { + "success" => false, + "error" => e.message, + }.to_json + end + end + Koa.describe "Adds a new tag to a title" Koa.path "tid", desc: "A title ID" Koa.response 200, ref: "$result" diff --git a/src/routes/main.cr b/src/routes/main.cr index 67719b8..67bbd31 100644 --- a/src/routes/main.cr +++ b/src/routes/main.cr @@ -132,13 +132,25 @@ class MainRouter < Router titles = sort_titles titles, sort_opt, username percentage = titles.map &.load_percentage username - layout "tags" + layout "tag" rescue e @context.error e env.response.status_code = 404 end end + get "/tags" do |env| + tags = Storage.default.list_tags + encoded_tags = tags.map do |t| + URI.encode_www_form t, space_to_plus: false + end + counts = tags.map do |t| + Storage.default.get_tag_titles(t).size + end + + layout "tags" + end + get "/api" do |env| render "src/views/api.html.ecr" end diff --git a/src/views/components/tags.html.ecr b/src/views/components/tags.html.ecr index 7795dcf..4385569 100644 --- a/src/views/components/tags.html.ecr +++ b/src/views/components/tags.html.ecr @@ -1,12 +1,9 @@ - -
    +

    Tags: diff --git a/src/views/tag.html.ecr b/src/views/tag.html.ecr new file mode 100644 index 0000000..c6f2332 --- /dev/null +++ b/src/views/tag.html.ecr @@ -0,0 +1,30 @@ +

    Tag: <%= tag %>

    +

    <%= titles.size %> <%= titles.size > 1 ? "titles" : "title" %> tagged

    +
    +
    +
    + + +
    +
    +
    + <% hash = { + "auto" => "Auto", + "time_modified" => "Date Modified", + "progress" => "Progress" + } %> + <%= render_component "sort-form" %> +
    +
    +
    + <% titles.each_with_index do |item, i| %> + <% progress = percentage[i] %> + <%= render_component "card" %> + <% end %> +
    + +<% content_for "script" do %> + <%= render_component "dots-scripts" %> + + +<% end %> diff --git a/src/views/tags.html.ecr b/src/views/tags.html.ecr index 58300e1..21fc3cc 100644 --- a/src/views/tags.html.ecr +++ b/src/views/tags.html.ecr @@ -1,30 +1,8 @@ -

    Tag: <%= tag %>

    -

    <%= titles.size %> titles tagged

    -
    -
    -
    - - -
    -
    -
    - <% hash = { - "auto" => "Auto", - "time_modified" => "Date Modified", - "progress" => "Progress" - } %> - <%= render_component "sort-form" %> -
    -
    -
    - <% titles.each_with_index do |item, i| %> - <% progress = percentage[i] %> - <%= render_component "card" %> - <% end %> -
    +

    Tags

    +

    <%= tags.size %> <%= tags.size > 1 ? "tags" : "tag" %> found

    -<% content_for "script" do %> - <%= render_component "dots-scripts" %> - - +<% tags.zip(encoded_tags, counts).each do |tag, encoded, count| %> + + <%= tag %> (<%= count %> <%= count > 1 ? "titles" : "title" %>) + <% end %> diff --git a/src/views/title.html.ecr b/src/views/title.html.ecr index ff14fee..5f5c232 100644 --- a/src/views/title.html.ecr +++ b/src/views/title.html.ecr @@ -33,8 +33,9 @@
  • <%= title.display_name %>

    • <%= title.content_label %> found

    -<% tags = title.tags %> + <%= render_component "tags" %> +
    From 981a1f0226db3f13e2896b35411014d62e40761e Mon Sep 17 00:00:00 2001 From: Alex Ling Date: Wed, 30 Dec 2020 10:44:02 +0000 Subject: [PATCH 13/14] Add /tags to nav bar --- src/views/layout.html.ecr | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/layout.html.ecr b/src/views/layout.html.ecr index 0646534..2c240de 100644 --- a/src/views/layout.html.ecr +++ b/src/views/layout.html.ecr @@ -11,6 +11,7 @@
    • Home
    • Library
      • +
    • Tags
      • <% if is_admin %>
    • Admin
    • @@ -40,6 +41,7 @@
      • Home
      • Library
        • +
      • Tags
        • <% if is_admin %>
      • Admin
      • From 93f745aecb3f3bd39ee682589384e67e874d6a6b Mon Sep 17 00:00:00 2001 From: Alex Ling Date: Wed, 30 Dec 2020 11:12:39 +0000 Subject: [PATCH 14/14] Only admins can add or delete tags --- public/js/title.js | 11 +++++------ src/routes/api.cr | 6 ++++-- src/views/components/tags.html.ecr | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/public/js/title.js b/public/js/title.js index fb4f4c1..7ddd093 100644 --- a/public/js/title.js +++ b/public/js/title.js @@ -256,11 +256,13 @@ const bulkProgress = (action, el) => { const tagsComponent = () => { return { loading: true, + isAdmin: false, tags: [], newTag: '', inputShown: false, tid: $('.upload-field').attr('data-title-id'), - load() { + load(admin) { + this.isAdmin = admin; const url = `${base_url}api/tags/${this.tid}`; this.request(url, 'GET', (data) => { this.tags = data.tags; @@ -269,7 +271,7 @@ const tagsComponent = () => { }, add() { const tag = this.newTag.trim(); - const url = `${base_url}api/tags/${this.tid}/${encodeURIComponent(tag)}`; + const url = `${base_url}api/admin/tags/${this.tid}/${encodeURIComponent(tag)}`; this.request(url, 'PUT', () => { this.tags.push(tag); this.newTag = ''; @@ -281,7 +283,7 @@ const tagsComponent = () => { }, rm(event) { const tag = event.currentTarget.id.split('-')[0]; - const url = `${base_url}api/tags/${this.tid}/${encodeURIComponent(tag)}`; + const url = `${base_url}api/admin/tags/${this.tid}/${encodeURIComponent(tag)}`; this.request(url, 'DELETE', () => { const idx = this.tags.indexOf(tag); if (idx < 0) return; @@ -295,9 +297,6 @@ const tagsComponent = () => { $('#tag-input').get(0).focus(); }); } - }, - buildURL(tid, tag) { - }, request(url, method, cb) { $.ajax({ diff --git a/src/routes/api.cr b/src/routes/api.cr index 9a85215..4ec7407 100644 --- a/src/routes/api.cr +++ b/src/routes/api.cr @@ -715,7 +715,8 @@ class APIRouter < Router Koa.describe "Adds a new tag to a title" Koa.path "tid", desc: "A title ID" Koa.response 200, ref: "$result" - put "/api/tags/:tid/:tag" do |env| + Koa.tag "admin" + put "/api/admin/tags/:tid/:tag" do |env| begin title = (@context.library.get_title env.params.url["tid"]).not_nil! tag = env.params.url["tag"] @@ -737,7 +738,8 @@ class APIRouter < Router Koa.describe "Deletes a tag from a title" Koa.path "tid", desc: "A title ID" Koa.response 200, ref: "$result" - delete "/api/tags/:tid/:tag" do |env| + Koa.tag "admin" + delete "/api/admin/tags/:tid/:tag" do |env| begin title = (@context.library.get_title env.params.url["tid"]).not_nil! tag = env.params.url["tag"] diff --git a/src/views/components/tags.html.ecr b/src/views/components/tags.html.ecr index 4385569..67588a5 100644 --- a/src/views/components/tags.html.ecr +++ b/src/views/components/tags.html.ecr @@ -1,12 +1,12 @@ -
        +

        Tags: - +