Standardize file viewer template data and fix opengraph funcs

res/static/script/compiled/home.js

@@ -300,7 +300,7 @@ var UploadWorker = /** @class */ (function () {
     };
     UploadWorker.prototype.newFile = function () {
         var file = this.manager.grabFile();
-        if (file === undefined) {
+        if (file === undefined) { // No more files in the queue. We're finished
             this.uploading = false;
             console.debug("No files left in queue");
             return; // Stop the thread

res/template/file_viewer.html

@@ -178,7 +178,7 @@
 		<script>
 			// This info gets filled in on the server side to prevent having to make an API call right after the page loads.
 			// Just to slice another few milliseconds from the load time :)
-			Viewer.init('{{.Type}}', {{.APIResponse}});
+			Viewer.init('{{.Other.Type}}', {{.Other.APIResponse}});
 		</script>
 
 		{{template "analytics"}}

webcontroller/file_viewer.go

@@ -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{}{
+		templateData.Title = fmt.Sprintf("%d files in Pixeldrain", len(finfo))
-			"data":          finfo,
+		templateData.Other = viewerData{
-			"date_created":  "now",
+			Type: "list",
-			"title":         "Concatenation of files",
+			APIResponse: map[string]interface{}{
-			"date_lastview": "now",
+				"data":          finfo,
-			"views":         0,
+				"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{}{
+		templateData.Title = fmt.Sprintf("%s ~ Pixeldrain file", finfo[0].Name)
-			"Title":       fmt.Sprintf("%s ~ Pixeldrain file", finfo[0].Name),
+		templateData.Other = viewerData{
-			"UserStyle":   userStyle(r),
+			Type:        "file",
-			"APIResponse": finfo[0],
+			APIResponse: finfo[0],
-			"Type":        "file",
+		}
-			"OGData":      ogData.FromFile(*finfo[0]),
-			"APIEndpoint": template.URL(wc.conf.APIURLExternal),
-		})
 	}
+	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) {
+func (wc *WebController) serveFileViewerDemo(w http.ResponseWriter, r *http.Request) {
-	wc.templates.Get().ExecuteTemplate(w, "file_viewer", map[string]interface{}{
+	templateData := wc.newTemplateData(w, r)
-		"APIResponse": map[string]interface{}{
+	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)
+	}
 }

webcontroller/list_viewer.go

@@ -2,7 +2,6 @@ package webcontroller
 
 import (
 	"fmt"
-	"html/template"
 	"net/http"
 
 	"fornaxian.com/pixeldrain-web/pixelapi"
@@ -23,22 +22,20 @@ func (wc *WebController) serveListViewer(w http.ResponseWriter, r *http.Request,
 		return
 	}
 
-	var ogData OGData
+	var templateData = wc.newTemplateData(w, r)
-	listdata := map[string]interface{}{
+	templateData.Title = fmt.Sprintf("%s ~ Pixeldrain list", list.Title)
-		"id":           list.ID,
+	templateData.OGData = OpenGraphFromList(*list)
-		"data":         list.Files,
+	templateData.Other = viewerData{
-		"date_created": list.DateCreated,
+		Type: "list",
-		"title":        list.Title,
+		APIResponse: map[string]interface{}{
-		"views":        0,
+			"id":           list.ID,
+			"data":         list.Files,
+			"date_created": list.DateCreated,
+			"title":        list.Title,
+			"views":        0,
+		},
 	}
-	err = wc.templates.Get().ExecuteTemplate(w, "file_viewer", map[string]interface{}{
+	err = wc.templates.Get().ExecuteTemplate(w, "file_viewer", templateData)
-		"Title":       fmt.Sprintf("%s ~ Pixeldrain list", list.Title),
-		"UserStyle":   userStyle(r),
-		"APIResponse": listdata,
-		"Type":        "list",
-		"OGData":      ogData.FromList(*list),
-		"APIEndpoint": template.URL(wc.conf.APIURLExternal),
-	})
 	if err != nil {
 		log.Error("Error executing template file_viewer: %s", err)
 	}

webcontroller/opengraph.go

@@ -15,26 +15,24 @@ type OGData struct {
 	Image       string
 }
 
-// FromFile populates the OGData object from FileInfo. It returns itself for
+// OpenGraphFromFile populates the OGData object from FileInfo
-// compactness.
+func OpenGraphFromFile(f pixelapi.FileInfo) (og OGData) {
-func (d *OGData) FromFile(f pixelapi.FileInfo) *OGData {
+	og.Title = f.Name
-	d.Title = f.Name
+	og.Type = "website"
-	d.Type = "website"
+	og.SiteName = "Pixeldrain"
-	d.SiteName = "Pixeldrain"
+	og.Description = "View " + f.Name + " on Pixeldrain"
-	d.Description = "View " + f.Name + " on Pixeldrain"
+	og.URL = "/u/" + f.ID
-	d.URL = "/u/" + f.ID
+	og.Image = "/api/file/" + f.ID + "/thumbnail"
-	d.Image = "/api/file/" + f.ID + "/thumbnail"
+	return og
-	return d
 }
 
-// FromList populated the OGData object from a List. It returns itself for
+// OpenGraphFromList populates the OGData object from a List
-// compactness.
+func OpenGraphFromList(l pixelapi.List) (og OGData) {
-func (d *OGData) FromList(l pixelapi.List) *OGData {
+	og.Title = l.Title
-	d.Title = l.Title
+	og.Type = "website"
-	d.Type = "website"
+	og.SiteName = "Pixeldrain"
-	d.SiteName = "Pixeldrain"
+	og.Description = "View " + l.Title + " on Pixeldrain"
-	d.Description = "View " + l.Title + " on Pixeldrain"
+	og.URL = "/l/" + l.ID
-	d.URL = "/l/" + l.ID
+	og.Image = "/api/file/" + l.Files[0].ID + "/thumbnail"
-	d.Image = "/api/file/" + l.Files[0].ID + "/thumbnail"
+	return og
-	return d
 }

webcontroller/template_data.go

@@ -21,7 +21,10 @@ type TemplateData struct {
 
 	Other    interface{}
 	URLQuery url.Values
-	Title    string
+
+	// Only used on file viewer page
+	Title  string
+	OGData OGData
 }
 
 func (wc *WebController) newTemplateData(w http.ResponseWriter, r *http.Request) *TemplateData {