mirror of https://github.com/logseq/logseq
Photo upload wip
parent
23c41cb571
commit
4e0f65a17f
|
@ -42,20 +42,9 @@
|
||||||
(let [files (.-files (.-target e))]
|
(let [files (.-files (.-target e))]
|
||||||
(image/upload
|
(image/upload
|
||||||
files
|
files
|
||||||
(fn [file file-form-data file-name file-type]
|
(fn [file file-name file-type]
|
||||||
;; TODO: set uploading
|
(handler/request-presigned-url file file-name file-type
|
||||||
(.append file-form-data "name" file-name)
|
)))))
|
||||||
(.append file-form-data file-type true)
|
|
||||||
|
|
||||||
;; (citrus/dispatch!
|
|
||||||
;; :image/upload
|
|
||||||
;; file-form-data
|
|
||||||
;; (fn [url]
|
|
||||||
;; (reset! uploading? false)
|
|
||||||
;; (swap! form assoc name url)
|
|
||||||
;; (if on-uploaded
|
|
||||||
;; (on-uploaded form name url))))
|
|
||||||
))))
|
|
||||||
;; :hidden true
|
;; :hidden true
|
||||||
}]])
|
}]])
|
||||||
|
|
||||||
|
|
|
@ -111,20 +111,6 @@
|
||||||
:remote "origin"
|
:remote "origin"
|
||||||
:ref default-branch})))
|
:ref default-branch})))
|
||||||
|
|
||||||
(defn add-commit-push
|
|
||||||
[repo-url file message token push-ok-handler push-error-handler]
|
|
||||||
(util/p-handle
|
|
||||||
(let [files (if (coll? file) file [file])]
|
|
||||||
(doseq [file files]
|
|
||||||
(add repo-url file)))
|
|
||||||
(fn [_]
|
|
||||||
(util/p-handle
|
|
||||||
(commit repo-url message)
|
|
||||||
(fn [_]
|
|
||||||
(push repo-url token)
|
|
||||||
(push-ok-handler))
|
|
||||||
push-error-handler))))
|
|
||||||
|
|
||||||
(defn add-commit
|
(defn add-commit
|
||||||
[repo-url file message commit-ok-handler commit-error-handler]
|
[repo-url file message commit-ok-handler commit-error-handler]
|
||||||
(util/p-handle
|
(util/p-handle
|
||||||
|
|
|
@ -555,12 +555,14 @@
|
||||||
(set-state-kv! :latest-journals journals)))))
|
(set-state-kv! :latest-journals journals)))))
|
||||||
|
|
||||||
(defn request-presigned-url
|
(defn request-presigned-url
|
||||||
[folder filename mime-type]
|
[file filename mime-type]
|
||||||
|
(prn {:filename filename
|
||||||
|
:mime-type mime-type})
|
||||||
(util/post (str config/api "presigned_url")
|
(util/post (str config/api "presigned_url")
|
||||||
{:folder folder
|
{:filename filename
|
||||||
:filename filename
|
|
||||||
:mime-type mime-type}
|
:mime-type mime-type}
|
||||||
(fn [resp]
|
(fn [resp]
|
||||||
|
;; TODO: upload url
|
||||||
(prn {:resp resp}))
|
(prn {:resp resp}))
|
||||||
(fn [_error]
|
(fn [_error]
|
||||||
;; (prn "Get token failed, error: " error)
|
;; (prn "Get token failed, error: " error)
|
||||||
|
|
|
@ -78,26 +78,30 @@
|
||||||
;; ))
|
;; ))
|
||||||
|
|
||||||
(defn upload
|
(defn upload
|
||||||
[files file-cb & {:keys [max-width max-height]
|
[files file-handler & {:keys [max-width max-height files-limit]
|
||||||
:or {max-width 1920
|
:or {max-width 1920
|
||||||
max-height 1080}}]
|
max-height 1080
|
||||||
(doseq [file (array-seq files)]
|
files-limit 1}}]
|
||||||
|
(doseq [file (take files-limit (array-seq files))]
|
||||||
(let [file-type (gobj/get file "type")
|
(let [file-type (gobj/get file "type")
|
||||||
ymd (->> (vals (util/year-month-day-padded))
|
ymd (->> (vals (util/year-month-day-padded))
|
||||||
(string/join "_"))
|
(string/join "_"))
|
||||||
file-name (str ymd "_" (gobj/get file "name"))]
|
file-name (str ymd "_" (gobj/get file "name"))]
|
||||||
(if (= 0 (.indexOf type "image/"))
|
(prn {:type file-type})
|
||||||
(let [img (js/Image.)]
|
(when (= 0 (.indexOf file-type "image/"))
|
||||||
(set! (.-onload img)
|
(file-handler file file-name file-type)
|
||||||
(fn []
|
;; (let [img (js/Image.)]
|
||||||
(get-orientation img
|
;; (set! (.-onload img)
|
||||||
(fn [^js off-canvas]
|
;; (fn []
|
||||||
(let [file-form-data ^js (js/FormData.)
|
;; (get-orientation img
|
||||||
data-url (.toDataURL off-canvas)
|
;; (fn [^js off-canvas]
|
||||||
blob (blob/blob data-url)]
|
;; (let [file-form-data ^js (js/FormData.)
|
||||||
(.append file-form-data "file" blob)
|
;; data-url (.toDataURL off-canvas)
|
||||||
(file-cb file file-form-data file-name file-type)))
|
;; blob (blob/blob data-url)]
|
||||||
max-width
|
;; (.append file-form-data "file" blob)
|
||||||
max-height)))
|
;; (file-cb file file-form-data file-name file-type)))
|
||||||
(set! (.-src img)
|
;; max-width
|
||||||
(create-object-url file)))))))
|
;; max-height)))
|
||||||
|
;; (set! (.-src img)
|
||||||
|
;; (create-object-url file)))
|
||||||
|
))))
|
||||||
|
|
Loading…
Reference in New Issue