pixeldrain/fnx_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Standardize file viewer template data and fix opengraph funcs

Browse Source
This commit is contained in:
Fornax
2019-02-19 23:10:04 +01:00
parent d27de283a8
commit d27e48fefc
6 changed files with 71 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
webcontroller/file_viewer.go
View File

@@ -2,7 +2,6 @@ package webcontroller
import (
"fmt"
"html/template"
"net/http"
"strings"
@@ -11,10 +10,15 @@ import (
"github.com/julienschmidt/httprouter"
)
type viewerData struct {
Type string // file or list
APIResponse interface{}
}
// ServeFileViewer controller for GET /u/:id
func (wc *WebController) serveFileViewer(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
if p.ByName("id") == "demo" {
wc.serveFileViewerDemo(w) // Required for a-ads.com quality check
wc.serveFileViewerDemo(w, r) // Required for a-ads.com quality check
return
}
@@ -42,34 +46,29 @@ func (wc *WebController) serveFileViewer(w http.ResponseWriter, r *http.Request,
return
}
var ogData OGData
templateData := wc.newTemplateData(w, r)
templateData.OGData = OpenGraphFromFile(*finfo[0])
var err error
if list {
listdata := map[string]interface{}{
"data": finfo,
"date_created": "now",
"title": "Concatenation of files",
"date_lastview": "now",
"views": 0,
templateData.Title = fmt.Sprintf("%d files in Pixeldrain", len(finfo))
templateData.Other = viewerData{
Type: "list",
APIResponse: map[string]interface{}{
"data": finfo,
"date_created": "now",
"title": "Concatenation of files",
"date_lastview": "now",
"views": 0,
},
}
err = wc.templates.Get().ExecuteTemplate(w, "file_viewer", map[string]interface{}{
"Title": fmt.Sprintf("%d files in Pixeldrain", len(finfo)),
"UserStyle": userStyle(r),
"APIResponse": listdata,
"Type": "list",
"OGData": ogData.FromFile(*finfo[0]),
"APIEndpoint": template.URL(wc.conf.APIURLExternal),
})
} else {
err = wc.templates.Get().ExecuteTemplate(w, "file_viewer", map[string]interface{}{
"Title": fmt.Sprintf("%s ~ Pixeldrain file", finfo[0].Name),
"UserStyle": userStyle(r),
"APIResponse": finfo[0],
"Type": "file",
"OGData": ogData.FromFile(*finfo[0]),
"APIEndpoint": template.URL(wc.conf.APIURLExternal),
})
templateData.Title = fmt.Sprintf("%s ~ Pixeldrain file", finfo[0].Name)
templateData.Other = viewerData{
Type: "file",
APIResponse: finfo[0],
}
}
err = wc.templates.Get().ExecuteTemplate(w, "file_viewer", templateData)
if err != nil {
log.Error("Error executing template file_viewer: %s", err)
}
@@ -78,9 +77,11 @@ func (wc *WebController) serveFileViewer(w http.ResponseWriter, r *http.Request,
// ServeFileViewerDemo is a dummy API response that responds with info about a
// non-existent demo file. This is required by the a-ads ad network to allow for
// automatic checking of the presence of the ad unit on this page.
func (wc *WebController) serveFileViewerDemo(w http.ResponseWriter) {
wc.templates.Get().ExecuteTemplate(w, "file_viewer", map[string]interface{}{
"APIResponse": map[string]interface{}{
func (wc *WebController) serveFileViewerDemo(w http.ResponseWriter, r *http.Request) {
templateData := wc.newTemplateData(w, r)
templateData.Other = viewerData{
Type: "file",
APIResponse: map[string]interface{}{
"id": "demo",
"name": "Demo file",
"date_upload": "2017-01-01 12:34:56",
@@ -92,6 +93,9 @@ func (wc *WebController) serveFileViewerDemo(w http.ResponseWriter) {
"mime_image": "/res/img/mime/text.png",
"thumbnail": "/res/img/mime/text.png",
},
"Type": "file",
})
}
err := wc.templates.Get().ExecuteTemplate(w, "file_viewer", templateData)
if err != nil {
log.Error("Error rendering demo file: %s", err)
}
}