Support all image types (resolves #192)

This commit is contained in:
Alex Ling 2021-09-06 13:32:10 +00:00
parent da8a485087
commit f67e4e6cb9
5 changed files with 9 additions and 10 deletions

View File

@ -40,8 +40,7 @@ class Entry
file = ArchiveFile.new @zip_path
@pages = file.entries.count do |e|
SUPPORTED_IMG_TYPES.includes? \
MIME.from_filename? e.filename
filename_is_image e.filename
end
file.close
end
@ -103,8 +102,7 @@ class Entry
ArchiveFile.open @zip_path do |file|
entries = file.entries
.select { |e|
SUPPORTED_IMG_TYPES.includes? \
MIME.from_filename? e.filename
filename_is_image e.filename
}
.sort! { |a, b|
compare_numerically a.filename, b.filename

View File

@ -1,5 +1,3 @@
SUPPORTED_IMG_TYPES = ["image/jpeg", "image/png", "image/webp"]
enum SortMethod
Auto
Title

View File

@ -456,9 +456,8 @@ struct APIRouter
entry_id = env.params.query["eid"]?
title = Library.default.get_title(title_id).not_nil!
unless SUPPORTED_IMG_TYPES.includes? \
MIME.from_filename? filename
raise "The uploaded image must be either JPEG or PNG"
unless filename_is_image filename
raise "The uploaded file must be an image"
end
ext = File.extname filename

View File

@ -120,3 +120,7 @@ class String
match / s.size
end
end
def filename_is_image(fn : String) : Bool
MIME.from_filename?(fn).try(&.starts_with?("image/")) || false
end

View File

@ -101,7 +101,7 @@
<span uk-icon="icon: cloud-upload"></span>
<span class="uk-text-middle">Upload a cover image by dropping it here or</span>
<div uk-form-custom>
<input type="file" accept="<%= SUPPORTED_IMG_TYPES.join ", " %>">
<input type="file" accept="image/*">
<span class="uk-link">selecting one</span>
</div>
</div>