From 0fea58d27d36bd1462526d0313d641af151e4360 Mon Sep 17 00:00:00 2001 From: Wim Brand Date: Tue, 11 Feb 2020 21:52:14 +0100 Subject: [PATCH] fix skynet links --- res/include/script/dependencies/UploadManager.js | 2 +- res/include/script/file_viewer/Viewer.js | 4 ++-- webcontroller/file_viewer.go | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/res/include/script/dependencies/UploadManager.js b/res/include/script/dependencies/UploadManager.js index c2b6549..92ca40b 100644 --- a/res/include/script/dependencies/UploadManager.js +++ b/res/include/script/dependencies/UploadManager.js @@ -99,7 +99,7 @@ UploadManager.prototype.uploadThread = function() { console.debug("Starting upload of " + job.name); let form = new FormData(); - form.append('file', job.file); + form.append('file', job.file, job.name); let xhr = new XMLHttpRequest(); xhr.open("POST", this.uploadEndpoint, true); diff --git a/res/include/script/file_viewer/Viewer.js b/res/include/script/file_viewer/Viewer.js index eeae310..e208e65 100644 --- a/res/include/script/file_viewer/Viewer.js +++ b/res/include/script/file_viewer/Viewer.js @@ -243,8 +243,8 @@ function fileFromAPIResp(resp) { function fileFromSkyNet(resp) { let file = fileFromAPIResp(resp) file.icon_href = "/res/img/mime/empty.png" - file.get_href = "https://sky.pixeldrain.com/"+resp.id - file.download_href = "https://sky.pixeldrain.com/"+resp.id+"?attachment=1" + file.get_href = "https://sky.pixeldrain.com/file/"+resp.id + file.download_href = "https://sky.pixeldrain.com/file/"+resp.id+"?attachment=1" file.availability_href = "" file.view_href = "" file.timeseries_href = "" diff --git a/webcontroller/file_viewer.go b/webcontroller/file_viewer.go index cb0e448..0bbfe60 100644 --- a/webcontroller/file_viewer.go +++ b/webcontroller/file_viewer.go @@ -165,7 +165,7 @@ func (wc *WebController) serveSkynetViewer(w http.ResponseWriter, r *http.Reques // Get the first few bytes from the file to probe the content type and // length - rq, err := http.NewRequest("GET", "https://sky.pixeldrain.com/"+p.ByName("id"), nil) + rq, err := http.NewRequest("GET", "https://sky.pixeldrain.com/file/"+p.ByName("id"), nil) if err != nil { log.Warn("Failed to make request to sia portal: %s", err) w.WriteHeader(http.StatusInternalServerError) @@ -183,7 +183,8 @@ func (wc *WebController) serveSkynetViewer(w http.ResponseWriter, r *http.Reques defer resp.Body.Close() if resp.StatusCode >= 500 { - log.Warn("Sia portal returned error: %s", err) + head, _ := ioutil.ReadAll(resp.Body) + log.Warn("Sia portal returned error: %s", head) w.WriteHeader(http.StatusInternalServerError) wc.templates.Get().ExecuteTemplate(w, "500", templateData) return