@@ -49,24 +49,24 @@
Pixeldrain Public Beta
- Note that this is an experimental version of Pixeldrain server,
- the Pixeldrain backend has been completely redesigned from the
- ground up to be more extensible, efficient and scalable. The
- server this web application runs on is considered a testing
+ Note that this is an experimental version of Pixeldrain server,
+ the Pixeldrain backend has been completely redesigned from the
+ ground up to be more extensible, efficient and scalable. The
+ server this web application runs on is considered a testing
environment. Database resets can happen when architectural
changes need to be applied.
- The Sia integration is still very experimental and could
+ The Sia integration is still very experimental and could
fail, resulting in data loss. Do not upload files to this server
- that you cannot afford to lose. Use the stable main server instead:
+ that you cannot afford to lose. Use the stable main server instead:
https://pixeldrain.com.
- But don't let all that stop you from trying the new Pixeldrain!
- The upload restrictions that the main site has haven't been
- implemented in this version yet, so you can upload as much as
- you want. The server only has 256 GiB of space available, if it
+ But don't let all that stop you from trying the new Pixeldrain!
+ The upload restrictions that the main site has haven't been
+ implemented in this version yet, so you can upload as much as
+ you want. The server only has 256 GiB of space available, if it
starts running out of space files will be purged from the local
filesystem and served from Sia on the next request.
@@ -105,16 +105,16 @@
Legality
- I cannot be held liable for any illegal and / or copyrighted
+ I cannot be held liable for any illegal and / or copyrighted
material that's uploaded by the users of this application.
- Files uploaded to this website are subjected to local laws. If
- laws are being broken, and I've been notified of the fact I'll
- have to delete the offending content (as the server does not
+ Files uploaded to this website are subjected to local laws. If
+ laws are being broken, and I've been notified of the fact I'll
+ have to delete the offending content (as the server does not
support geo filtering yet). If you find any files on this domain
that break the law, please contact me at
abuse@pixeldrain.com,
and I'll take care of it.
-
Please share responsibly.
+
Please share responsibly.
Funding
@@ -149,14 +149,13 @@
Missing
- Features which are in
+ Features which are in
https://pixeldrain.com, but
not in https://sia.pixeldrain.com.
These will be added soon enough.
- Zip explorer
- - Text file viewer (yes, you can upload text but not view it yet)
- Some video formats (mime type detection is not complete)
- Registration / Login system
- Bandwidth Tracker
diff --git a/webcontroller/apidoc.go b/webcontroller/apidoc.go
deleted file mode 100644
index 4d5c598..0000000
--- a/webcontroller/apidoc.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package webcontroller
-
-import (
- "net/http"
-
- "fornaxian.com/pixeldrain-web/log"
- "fornaxian.com/pixeldrain-web/webcontroller/templates"
-
- "github.com/julienschmidt/httprouter"
-)
-
-// ServeAPIDoc serves the API docuementation
-func ServeAPIDoc(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
- err := templates.Get().ExecuteTemplate(w, "apidoc", nil)
- if err != nil {
- log.Error("Error executing template apidoc: %s", err)
- }
-}
diff --git a/webcontroller/favicon.go b/webcontroller/favicon.go
deleted file mode 100644
index a6ff59f..0000000
--- a/webcontroller/favicon.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package webcontroller
-
-import (
- "net/http"
-
- "github.com/julienschmidt/httprouter"
-
- "fornaxian.com/pixeldrain-web/conf"
-)
-
-// ServeFavicon yes we need a controller for this
-func ServeFavicon(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
- http.ServeFile(w, r, conf.StaticResourceDir()+"favicon.ico")
-}
diff --git a/webcontroller/filePreview.go b/webcontroller/filePreview.go
index 8bd5067..da3fe1e 100644
--- a/webcontroller/filePreview.go
+++ b/webcontroller/filePreview.go
@@ -10,7 +10,6 @@ import (
"path/filepath"
"strings"
- "fornaxian.com/pixeldrain-web/conf"
"fornaxian.com/pixeldrain-web/pixelapi"
"github.com/Fornaxian/log"
@@ -19,19 +18,22 @@ import (
)
// ServeFilePreview controller for GET /u/:id/preview
-func ServeFilePreview(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+func (wc *WebController) serveFilePreview(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
if p.ByName("id") == "demo" {
- ServeFilePreviewDemo(w) // Required for a-ads.com quality check
+ serveFilePreviewDemo(w) // Required for a-ads.com quality check
return
}
- inf := pixelapi.GetFileInfo(p.ByName("id")) // TODO: Error handling
+ inf := wc.api.GetFileInfo(p.ByName("id")) // TODO: Error handling
if inf == nil {
- ServeNotFound(w, r)
+ wc.serveNotFound(w, r)
return
}
- var fp FilePreview
+ var fp = FilePreview{
+ APIURL: wc.conf.APIURLExternal,
+ PixelAPI: wc.api,
+ }
io.WriteString(w, fp.Run(inf))
}
@@ -39,12 +41,15 @@ type FilePreview struct {
FileInfo *pixelapi.FileInfo
FileURL string
DownloadURL string
+
+ APIURL string
+ PixelAPI *pixelapi.PixelAPI
}
func (f FilePreview) Run(inf *pixelapi.FileInfo) string {
f.FileInfo = inf
- f.FileURL = conf.ApiUrlExternal() + "/file/" + f.FileInfo.ID
- f.DownloadURL = conf.ApiUrlExternal() + "/file/" + f.FileInfo.ID + "/download"
+ f.FileURL = f.APIURL + "/file/" + f.FileInfo.ID
+ f.DownloadURL = f.APIURL + "/file/" + f.FileInfo.ID + "/download"
if strings.HasPrefix(f.FileInfo.MimeType, "image") {
return f.image()
@@ -139,7 +144,7 @@ func (f FilePreview) text() string {
)
}
- body, err := pixelapi.GetFile(f.FileInfo.ID)
+ body, err := f.PixelAPI.GetFile(f.FileInfo.ID)
if err != nil {
log.Error("Can't download text file for preview: %s", err)
return fmt.Sprintf(htmlOut, "",
@@ -189,6 +194,29 @@ func (f FilePreview) def() string {
f.FileInfo.FileName,
f.FileInfo.MimeType,
f.DownloadURL,
- conf.ApiUrlExternal()+f.FileInfo.ThumbnailHREF,
+ f.APIURL+f.FileInfo.ThumbnailHREF,
)
}
+
+// ServeFilePreviewDemo serves the content of the demo file. It contains a nice
+// message to the human reviewers of the a-ads ad network so they can properly
+// categorize the website.
+func serveFilePreviewDemo(w http.ResponseWriter) {
+ io.WriteString(w,
+ `
+
+ , __ _
+/|/ \o | | | o
+ |___/ _ | | __| ,_ __, _ _
+ | | /\/ |/ |/ / | / | / | | / |/ |
+ | |_/ /\_/|__/|__/\_/|_/ |_/\_/|_/|_/ | |_/
+
+This is a demonstration of Pixeldrain's file viewer.
+
+The website automatically detects what kind of file you requested and prepares a page for viewing it properly. This is what a text file would look like on Pixeldrain. You can upload your own text file at pixeldrain.com/t.
+
+Pixeldrain is a free service for sharing files with large or small groups of people. For more information visit the home page by pressing the home button on the toolbar at the left side of the screen.
+
+Press the Details button or "i" for more info about Pixeldrain's file viewer.
+
- , __ _
-/|/ \o | | | o
- |___/ _ | | __| ,_ __, _ _
- | | /\/ |/ |/ / | / | / | | / |/ |
- | |_/ /\_/|__/|__/\_/|_/ |_/\_/|_/|_/ | |_/
-
-This is a demonstration of Pixeldrain's file viewer.
-
-The website automatically detects what kind of file you requested and prepares a page for viewing it properly. This is what a text file would look like on Pixeldrain. You can upload your own text file at pixeldrain.com/t.
-
-Pixeldrain is a free service for sharing files with large or small groups of people. For more information visit the home page by pressing the home button on the toolbar at the left side of the screen.
-
-Press the Details button or "i" for more info about Pixeldrain's file viewer.
-