simon/smeagol
1
0
Fork 0
mirror of https://github.com/journeyman-cc/smeagol.git synced 2026-04-12 18:05:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

#44: fixed

Browse source
This commit is contained in:
Simon Brooke 2020-02-05 18:21:02 +00:00
parent ab2ec82f5e
commit 3f667afb35
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/smeagol/routes/wiki.clj
View file

@ -165,7 +165,7 @@
"Render a form to allow the upload of a file." "Render a form to allow the upload of a file."
[request] [request]
(let [params (keywordize-keys (:params request)) (let [params (keywordize-keys (:params request))
data-path (str util/content-dir "/content/uploads/") data-path (str util/content-dir "/uploads/")
git-repo (hist/load-or-init-repo util/content-dir) git-repo (hist/load-or-init-repo util/content-dir)
upload (:upload params) upload (:upload params)
uploaded (if upload (ul/store-upload params data-path)) uploaded (if upload (ul/store-upload params data-path))

12
src/smeagol/uploads.clj
View file

@ -59,8 +59,12 @@
(timbre/debug (timbre/debug
(str "store-upload mv file: " tmp-file " to: " path filename)) (str "store-upload mv file: " tmp-file " to: " path filename))
(if tmp-file (if tmp-file
(do (try
(.renameTo tmp-file (do
(File. (str path filename))) (.renameTo tmp-file
filename) (File. (str path filename)))
filename)
(catch Exception x
(timbre/error (str "Failed to move " tmp-file " to " path filename "; " (type x) ": " (.getMessage x)))
(throw x)))
(throw (Exception. "No file found?"))))) (throw (Exception. "No file found?")))))