From 78535fb08ebe667f27da6b44a9af52aae1148434 Mon Sep 17 00:00:00 2001
From: Thomas Boerger <thomas@webhippie.de>
Date: Sat, 28 Jan 2017 23:14:56 +0100
Subject: [PATCH] Allow custom public files (#782)

* Allow custom public files

* Gofmt code, lots of places not related to this pr
---
 cmd/web.go                 |  5 +++++
 models/attachment.go       |  1 -
 models/pull.go             |  2 +-
 modules/public/public.go   | 17 +++++++++++++++++
 routers/init.go            |  2 +-
 routers/repo/attachment.go |  1 -
 routers/repo/release.go    |  4 ++--
 7 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/cmd/web.go b/cmd/web.go
index f21244a54..2e5ae8cd5 100644
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -88,6 +88,11 @@ func newMacaron() *macaron.Macaron {
 	if setting.Protocol == setting.FCGI {
 		m.SetURLPrefix(setting.AppSubURL)
 	}
+	m.Use(public.Custom(
+		&public.Options{
+			SkipLogging: setting.DisableRouterLog,
+		},
+	))
 	m.Use(public.Static(
 		&public.Options{
 			Directory:   path.Join(setting.StaticRootPath, "public"),
diff --git a/models/attachment.go b/models/attachment.go
index 149d9ea5b..104ad1d92 100644
--- a/models/attachment.go
+++ b/models/attachment.go
@@ -31,7 +31,6 @@ type Attachment struct {
 	CreatedUnix int64
 }
 
-
 // BeforeInsert is invoked from XORM before inserting an object of this type.
 func (a *Attachment) BeforeInsert() {
 	a.CreatedUnix = time.Now().Unix()
diff --git a/models/pull.go b/models/pull.go
index ab057ac32..382738bf2 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -14,6 +14,7 @@ import (
 	"time"
 
 	"code.gitea.io/git"
+	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/process"
 	"code.gitea.io/gitea/modules/setting"
@@ -21,7 +22,6 @@ import (
 	api "code.gitea.io/sdk/gitea"
 	"github.com/Unknwon/com"
 	"github.com/go-xorm/xorm"
-	"code.gitea.io/gitea/modules/base"
 )
 
 var pullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength)
diff --git a/modules/public/public.go b/modules/public/public.go
index 9c9e9d533..6f28ebc03 100644
--- a/modules/public/public.go
+++ b/modules/public/public.go
@@ -4,6 +4,13 @@
 
 package public
 
+import (
+	"path"
+
+	"code.gitea.io/gitea/modules/setting"
+	"gopkg.in/macaron.v1"
+)
+
 //go:generate go-bindata -tags "bindata" -ignore "\\.go|\\.less" -pkg "public" -o "bindata.go" ../../public/...
 //go:generate go fmt bindata.go
 //go:generate sed -i.bak s/..\/..\/public\/// bindata.go
@@ -14,3 +21,13 @@ type Options struct {
 	Directory   string
 	SkipLogging bool
 }
+
+// Custom implements the macaron static handler for serving custom assets.
+func Custom(opts *Options) macaron.Handler {
+	return macaron.Static(
+		path.Join(setting.CustomPath, "public"),
+		macaron.StaticOptions{
+			SkipLogging: opts.SkipLogging,
+		},
+	)
+}
diff --git a/routers/init.go b/routers/init.go
index 23bf7ae62..048ded15f 100644
--- a/routers/init.go
+++ b/routers/init.go
@@ -12,13 +12,13 @@ import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/cron"
 	"code.gitea.io/gitea/modules/highlight"
+	"code.gitea.io/gitea/modules/indexer"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/mailer"
 	"code.gitea.io/gitea/modules/markdown"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/ssh"
 	macaron "gopkg.in/macaron.v1"
-	"code.gitea.io/gitea/modules/indexer"
 )
 
 func checkRunMode() {
diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go
index 2ba389f07..c2efb11c1 100644
--- a/routers/repo/attachment.go
+++ b/routers/repo/attachment.go
@@ -70,4 +70,3 @@ func UploadAttachment(ctx *context.Context) {
 		"uuid": attach.UUID,
 	})
 }
-
diff --git a/routers/repo/release.go b/routers/repo/release.go
index 3e0fc94e4..e63521dae 100644
--- a/routers/repo/release.go
+++ b/routers/repo/release.go
@@ -169,7 +169,7 @@ func NewRelease(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("repo.release.new_release")
 	ctx.Data["PageIsReleaseList"] = true
 	ctx.Data["tag_target"] = ctx.Repo.Repository.DefaultBranch
-	renderAttachmentSettings(ctx);
+	renderAttachmentSettings(ctx)
 	ctx.HTML(200, tplReleaseNew)
 }
 
@@ -250,7 +250,7 @@ func EditRelease(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("repo.release.edit_release")
 	ctx.Data["PageIsReleaseList"] = true
 	ctx.Data["PageIsEditRelease"] = true
-	renderAttachmentSettings(ctx);
+	renderAttachmentSettings(ctx)
 
 	tagName := ctx.Params("*")
 	rel, err := models.GetRelease(ctx.Repo.Repository.ID, tagName)