hopefully fix issues with empty extension
Docker / build (push) Waiting to run
Details
Docker / build (push) Waiting to run
Details
This commit is contained in:
parent
f863cc34d9
commit
ecc11e4cbf
|
@ -136,7 +136,8 @@ module Paste69
|
||||||
end
|
end
|
||||||
|
|
||||||
if form.has_key?("file")
|
if form.has_key?("file")
|
||||||
filename, body = form["file"]
|
_filename, body = form["file"]
|
||||||
|
_, filename = form["filename"] || {nil, _filename}
|
||||||
@utils.store_file(
|
@utils.store_file(
|
||||||
body,
|
body,
|
||||||
content_type,
|
content_type,
|
||||||
|
|
|
@ -91,13 +91,13 @@ module Paste69
|
||||||
|
|
||||||
# Also generate a new management token
|
# Also generate a new management token
|
||||||
paste.mgmt_token = Random.new.urlsafe_base64(config.get("storage.secret_bytes").as_i)
|
paste.mgmt_token = Random.new.urlsafe_base64(config.get("storage.secret_bytes").as_i)
|
||||||
|
|
||||||
is_updated = true
|
|
||||||
else
|
else
|
||||||
# The file already exists, update the expiration as needed
|
# The file already exists, update the expiration as needed
|
||||||
paste.expiration = [paste.expiration!, expiration].max.to_i64
|
paste.expiration = [paste.expiration!, expiration].max.to_i64
|
||||||
is_new = false
|
is_new = false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
is_updated = true
|
||||||
else
|
else
|
||||||
mime = utils.get_mime(data, filename)
|
mime = utils.get_mime(data, filename)
|
||||||
ext = utils.get_ext(mime, filename)
|
ext = utils.get_ext(mime, filename)
|
||||||
|
|
|
@ -125,11 +125,11 @@ module Paste69
|
||||||
gmime = mime.split(";")[0]
|
gmime = mime.split(";")[0]
|
||||||
guess = MIME.extensions(gmime).first?
|
guess = MIME.extensions(gmime).first?
|
||||||
|
|
||||||
if !ext
|
if !ext || ext.empty?
|
||||||
override = @config.get("storage.ext_override").as_h
|
override = @config.get("storage.ext_override").as_h
|
||||||
if gmime.in?(override)
|
if gmime.in?(override)
|
||||||
ext = override[gmime].as_s
|
ext = override[gmime].as_s
|
||||||
elsif guess
|
elsif guess && !guess.empty?
|
||||||
ext = guess
|
ext = guess
|
||||||
else
|
else
|
||||||
ext = ".bin"
|
ext = ".bin"
|
||||||
|
|
Loading…
Reference in New Issue