From 3a60286c3aaffe46967d1e24e738f51e5892ce00 Mon Sep 17 00:00:00 2001 From: Leeingnyo Date: Sun, 15 May 2022 17:02:29 +0900 Subject: [PATCH] Run 'crystal tool format' --- src/library/cache.cr | 8 ++++---- src/library/entry.cr | 3 ++- src/routes/admin.cr | 2 +- src/routes/api.cr | 4 ++-- src/util/util.cr | 3 +-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/library/cache.cr b/src/library/cache.cr index 10e4f60..f35af8b 100644 --- a/src/library/cache.cr +++ b/src/library/cache.cr @@ -76,8 +76,8 @@ class SortedEntriesCacheEntry < CacheEntry(Array(String), Array(Entry)) entries : Array(Entry), opt : SortOptions?) entries_sig = Digest::SHA1.hexdigest (entries.map &.id).to_s user_context = opt && opt.method == SortMethod::Progress ? username : "" - sig = Digest::SHA1.hexdigest (book_id + entries_sig + user_context + - (opt ? opt.to_tuple.to_s : "nil")) + sig = Digest::SHA1.hexdigest(book_id + entries_sig + user_context + + (opt ? opt.to_tuple.to_s : "nil")) "#{sig}:sorted_entries" end end @@ -101,8 +101,8 @@ class SortedTitlesCacheEntry < CacheEntry(Array(String), Array(Title)) def self.gen_key(username : String, titles : Array(Title), opt : SortOptions?) titles_sig = Digest::SHA1.hexdigest (titles.map &.id).to_s user_context = opt && opt.method == SortMethod::Progress ? username : "" - sig = Digest::SHA1.hexdigest (titles_sig + user_context + - (opt ? opt.to_tuple.to_s : "nil")) + sig = Digest::SHA1.hexdigest(titles_sig + user_context + + (opt ? opt.to_tuple.to_s : "nil")) "#{sig}:sorted_titles" end end diff --git a/src/library/entry.cr b/src/library/entry.cr index 7399b0d..627f4fc 100644 --- a/src/library/entry.cr +++ b/src/library/entry.cr @@ -9,7 +9,8 @@ abstract class Entry def initialize( @id, @title, @book, @size, @pages, @mtime, - @encoded_path, @encoded_title, @err_msg) + @encoded_path, @encoded_title, @err_msg + ) end def self.new(ctx : YAML::ParseContext, node : YAML::Nodes::Node) diff --git a/src/routes/admin.cr b/src/routes/admin.cr index 23481f9..6987a11 100644 --- a/src/routes/admin.cr +++ b/src/routes/admin.cr @@ -63,7 +63,7 @@ struct AdminRouter redirect_url = URI.new \ path: "/admin/user/edit", query: hash_to_query({"username" => original_username, \ - "admin" => admin, "error" => e.message}) + "admin" => admin, "error" => e.message}) redirect env, redirect_url.to_s end diff --git a/src/routes/api.cr b/src/routes/api.cr index 840ce92..bf2c4c9 100644 --- a/src/routes/api.cr +++ b/src/routes/api.cr @@ -1144,9 +1144,9 @@ struct APIRouter raise "Entry ID `#{eid}` of `#{title.title}` not found" if entry.nil? if entry.is_a? DirectoryEntry - file_hash = Digest::SHA1.hexdigest (entry.path + entry.mtime.to_s + entry.size) + file_hash = Digest::SHA1.hexdigest(entry.path + entry.mtime.to_s + entry.size) else - file_hash = Digest::SHA1.hexdigest (entry.path + entry.mtime.to_s) + file_hash = Digest::SHA1.hexdigest(entry.path + entry.mtime.to_s) end e_tag = "W/#{file_hash}" if e_tag == prev_e_tag diff --git a/src/util/util.cr b/src/util/util.cr index 7d834fb..e08bd9d 100644 --- a/src/util/util.cr +++ b/src/util/util.cr @@ -3,7 +3,7 @@ ENTRIES_IN_HOME_SECTIONS = 8 UPLOAD_URL_PREFIX = "/uploads" STATIC_DIRS = %w(/css /js /img /webfonts /favicon.ico /robots.txt) SUPPORTED_FILE_EXTNAMES = [".zip", ".cbz", ".rar", ".cbr"] -SUPPORTED_IMG_TYPES = %w( +SUPPORTED_IMG_TYPES = %w( image/jpeg image/png image/webp @@ -13,7 +13,6 @@ SUPPORTED_IMG_TYPES = %w( image/svg+xml ) - def random_str UUID.random.to_s.gsub "-", "" end