move assets to server package

_do_gen_assets

@@ -1,6 +1,7 @@
 #!/bin/sh
 
 embed_bin_path=/tmp/gonicembed
+assets_path=server/assets
 
 # only build once for some slightly faster live page reloading
 if ! test -e "$embed_bin_path"; then
@@ -9,12 +10,12 @@ if ! test -e "$embed_bin_path"; then
         cmd/gonicembed/main.go
 fi
 
-find assets/ \
+find $assets_path/ \
     -type f \
     ! -name '*.go' \
     -exec "$embed_bin_path" \
-        -out-path assets/assets_gen.go \
+        -out-path $assets_path/assets_gen.go \
         -package-name assets \
         -assets-var-name Bytes \
-        -asset-path-prefix assets/ \
+        -asset-path-prefix $assets_path/ \
         {} +

server/assets/assets_gen.go

@@ -9,7 +9,7 @@ type EmbeddedAsset struct {
 }
 var Bytes = map[string]*EmbeddedAsset{
 "pages/change_password.tmpl": &EmbeddedAsset{
-	ModTime: time.Unix(1584672536, 0),
+	ModTime: time.Unix(1584838852, 0),
 	Bytes: []byte{
 0x7b,0x7b,0x20,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x22,0x75,0x73,0x65,0x72,0x22,0x20,0x7d,0x7d,0x0a,0x3c,0x64,0x69,0x76,
 0x20,0x63,0x6c,0x61,0x73,0x73,0x3d,0x22,0x70,0x61,0x64,0x64,0x65,0x64,0x20,0x62,0x6f,0x78,0x22,0x3e,0x0a,0x20,0x20,0x20,
@@ -37,7 +37,7 @@ var Bytes = map[string]*EmbeddedAsset{
 0x3e,0x0a,0x3c,0x2f,0x64,0x69,0x76,0x3e,0x0a,0x7b,0x7b,0x20,0x65,0x6e,0x64,0x20,0x7d,0x7d,0x0a,
 }},
 "pages/login.tmpl": &EmbeddedAsset{
-	ModTime: time.Unix(1584672536, 0),
+	ModTime: time.Unix(1584838852, 0),
 	Bytes: []byte{
 0x7b,0x7b,0x20,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x22,0x63,0x6f,0x6e,0x74,0x65,0x6e,0x74,0x22,0x20,0x7d,0x7d,0x0a,0x3c,
 0x64,0x69,0x76,0x20,0x63,0x6c,0x61,0x73,0x73,0x3d,0x22,0x70,0x61,0x64,0x64,0x65,0x64,0x20,0x62,0x6f,0x78,0x22,0x3e,0x0a,
@@ -60,7 +60,7 @@ var Bytes = map[string]*EmbeddedAsset{
 0x66,0x6f,0x72,0x6d,0x3e,0x0a,0x3c,0x2f,0x64,0x69,0x76,0x3e,0x0a,0x7b,0x7b,0x20,0x65,0x6e,0x64,0x20,0x7d,0x7d,0x0a,
 }},
 "pages/home.tmpl": &EmbeddedAsset{
-	ModTime: time.Unix(1584672536, 0),
+	ModTime: time.Unix(1584838852, 0),
 	Bytes: []byte{
 0x7b,0x7b,0x20,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x22,0x75,0x73,0x65,0x72,0x22,0x20,0x7d,0x7d,0x0a,0x3c,0x64,0x69,0x76,
 0x20,0x63,0x6c,0x61,0x73,0x73,0x3d,0x22,0x70,0x61,0x64,0x64,0x65,0x64,0x20,0x62,0x6f,0x78,0x22,0x3e,0x0a,0x20,0x20,0x20,
@@ -364,7 +364,7 @@ var Bytes = map[string]*EmbeddedAsset{
 0x3c,0x2f,0x64,0x69,0x76,0x3e,0x0a,0x7b,0x7b,0x20,0x65,0x6e,0x64,0x20,0x7d,0x7d,0x0a,
 }},
 "pages/delete_user.tmpl": &EmbeddedAsset{
-	ModTime: time.Unix(1584672536, 0),
+	ModTime: time.Unix(1584838852, 0),
 	Bytes: []byte{
 0x7b,0x7b,0x20,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x22,0x75,0x73,0x65,0x72,0x22,0x20,0x7d,0x7d,0x0a,0x3c,0x64,0x69,0x76,
 0x20,0x63,0x6c,0x61,0x73,0x73,0x3d,0x22,0x70,0x61,0x64,0x64,0x65,0x64,0x20,0x62,0x6f,0x78,0x22,0x3e,0x0a,0x20,0x20,0x20,
@@ -390,7 +390,7 @@ var Bytes = map[string]*EmbeddedAsset{
 0x6e,0x64,0x20,0x7d,0x7d,0x0a,
 }},
 "pages/update_lastfm_api_key.tmpl": &EmbeddedAsset{
-	ModTime: time.Unix(1584672536, 0),
+	ModTime: time.Unix(1584838852, 0),
 	Bytes: []byte{
 0x7b,0x7b,0x20,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x22,0x75,0x73,0x65,0x72,0x22,0x20,0x7d,0x7d,0x0a,0x3c,0x64,0x69,0x76,
 0x20,0x63,0x6c,0x61,0x73,0x73,0x3d,0x22,0x70,0x61,0x64,0x64,0x65,0x64,0x20,0x62,0x6f,0x78,0x22,0x3e,0x0a,0x20,0x20,0x20,
@@ -431,7 +431,7 @@ var Bytes = map[string]*EmbeddedAsset{
 0x7b,0x20,0x65,0x6e,0x64,0x20,0x7d,0x7d,0x0a,
 }},
 "pages/change_own_password.tmpl": &EmbeddedAsset{
-	ModTime: time.Unix(1584672536, 0),
+	ModTime: time.Unix(1584838852, 0),
 	Bytes: []byte{
 0x7b,0x7b,0x20,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x22,0x75,0x73,0x65,0x72,0x22,0x20,0x7d,0x7d,0x0a,0x3c,0x64,0x69,0x76,
 0x20,0x63,0x6c,0x61,0x73,0x73,0x3d,0x22,0x70,0x61,0x64,0x64,0x65,0x64,0x20,0x62,0x6f,0x78,0x22,0x3e,0x0a,0x20,0x20,0x20,
@@ -457,7 +457,7 @@ var Bytes = map[string]*EmbeddedAsset{
 0x2f,0x64,0x69,0x76,0x3e,0x0a,0x7b,0x7b,0x20,0x65,0x6e,0x64,0x20,0x7d,0x7d,0x0a,
 }},
 "pages/create_user.tmpl": &EmbeddedAsset{
-	ModTime: time.Unix(1584672536, 0),
+	ModTime: time.Unix(1584838852, 0),
 	Bytes: []byte{
 0x7b,0x7b,0x20,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x22,0x75,0x73,0x65,0x72,0x22,0x20,0x7d,0x7d,0x0a,0x3c,0x64,0x69,0x76,
 0x20,0x63,0x6c,0x61,0x73,0x73,0x3d,0x22,0x70,0x61,0x64,0x64,0x65,0x64,0x20,0x62,0x6f,0x78,0x22,0x3e,0x0a,0x20,0x20,0x20,
@@ -486,7 +486,7 @@ var Bytes = map[string]*EmbeddedAsset{
 0x7d,0x0a,
 }},
 "pages/not_found.tmpl": &EmbeddedAsset{
-	ModTime: time.Unix(1584668398, 0),
+	ModTime: time.Unix(1584838852, 0),
 	Bytes: []byte{
 0x7b,0x7b,0x20,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x22,0x63,0x6f,0x6e,0x74,0x65,0x6e,0x74,0x22,0x20,0x7d,0x7d,0x0a,0x3c,
 0x64,0x69,0x76,0x20,0x63,0x6c,0x61,0x73,0x73,0x3d,0x22,0x70,0x61,0x64,0x64,0x65,0x64,0x22,0x3e,0x0a,0x20,0x20,0x20,0x20,
@@ -496,7 +496,7 @@ var Bytes = map[string]*EmbeddedAsset{
 0x20,0x7d,0x7d,0x0a,
 }},
 "static/reset.css": &EmbeddedAsset{
-	ModTime: time.Unix(1584026305, 0),
+	ModTime: time.Unix(1584838852, 0),
 	Bytes: []byte{
 0x2f,0x2a,0x20,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x6d,0x65,0x79,0x65,0x72,0x77,0x65,0x62,0x2e,0x63,0x6f,0x6d,0x2f,0x65,
 0x72,0x69,0x63,0x2f,0x74,0x6f,0x6f,0x6c,0x73,0x2f,0x63,0x73,0x73,0x2f,0x72,0x65,0x73,0x65,0x74,0x2f,0x0a,0x20,0x20,0x20,
@@ -547,7 +547,7 @@ var Bytes = map[string]*EmbeddedAsset{
 0x30,0x3b,0x0a,0x7d,0x0a,
 }},
 "static/favicon.ico": &EmbeddedAsset{
-	ModTime: time.Unix(1565382588, 0),
+	ModTime: time.Unix(1584838852, 0),
 	Bytes: []byte{
 0x00,0x00,0x01,0x00,0x01,0x00,0x20,0x20,0x00,0x00,0x01,0x00,0x20,0x00,0xa8,0x10,0x00,0x00,0x16,0x00,0x00,0x00,0x28,0x00,
 0x00,0x00,0x20,0x00,0x00,0x00,0x40,0x00,0x00,0x00,0x01,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -730,7 +730,7 @@ var Bytes = map[string]*EmbeddedAsset{
 0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
 }},
 "static/gonic.png": &EmbeddedAsset{
-	ModTime: time.Unix(1565382588, 0),
+	ModTime: time.Unix(1584838852, 0),
 	Bytes: []byte{
 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52,0x00,0x00,0x0e,0x8c,0x00,0x00,0x03,0xbd,
 0x08,0x06,0x00,0x00,0x00,0x02,0x78,0xa4,0xad,0x00,0x00,0x0c,0x4c,0x7a,0x54,0x58,0x74,0x52,0x61,0x77,0x20,0x70,0x72,0x6f,
@@ -10805,7 +10805,7 @@ var Bytes = map[string]*EmbeddedAsset{
 0x55,0x23,0xfe,0x00,0x00,0x00,0x00,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
 }},
 "static/main.css": &EmbeddedAsset{
-	ModTime: time.Unix(1584672536, 0),
+	ModTime: time.Unix(1584838852, 0),
 	Bytes: []byte{
 0x3a,0x72,0x6f,0x6f,0x74,0x20,0x7b,0x0a,0x20,0x20,0x2d,0x2d,0x73,0x69,0x7a,0x65,0x3a,0x20,0x31,0x33,0x70,0x78,0x3b,0x0a,
 0x7d,0x0a,0x0a,0x40,0x6d,0x65,0x64,0x69,0x61,0x20,0x6f,0x6e,0x6c,0x79,0x20,0x73,0x63,0x72,0x65,0x65,0x6e,0x20,0x61,0x6e,
@@ -10891,7 +10891,7 @@ var Bytes = map[string]*EmbeddedAsset{
 0x6f,0x6e,0x74,0x2d,0x73,0x74,0x79,0x6c,0x65,0x3a,0x20,0x69,0x74,0x61,0x6c,0x69,0x63,0x3b,0x0a,0x7d,0x0a,
 }},
 "partials/head.tmpl": &EmbeddedAsset{
-	ModTime: time.Unix(1584026305, 0),
+	ModTime: time.Unix(1584838852, 0),
 	Bytes: []byte{
 0x7b,0x7b,0x20,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x22,0x68,0x65,0x61,0x64,0x22,0x20,0x7d,0x7d,0x0a,0x3c,0x6c,0x69,0x6e,
 0x6b,0x20,0x72,0x65,0x6c,0x3d,0x22,0x73,0x74,0x79,0x6c,0x65,0x73,0x68,0x65,0x65,0x74,0x22,0x20,0x68,0x72,0x65,0x66,0x3d,
@@ -10918,7 +10918,7 @@ var Bytes = map[string]*EmbeddedAsset{
 0x65,0x3d,0x6e,0x6f,0x22,0x3e,0x0a,0x7b,0x7b,0x20,0x65,0x6e,0x64,0x20,0x7d,0x7d,0x0a,
 }},
 "layouts/base.tmpl": &EmbeddedAsset{
-	ModTime: time.Unix(1584026305, 0),
+	ModTime: time.Unix(1584838852, 0),
 	Bytes: []byte{
 0x7b,0x7b,0x20,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x22,0x6c,0x61,0x79,0x6f,0x75,0x74,0x22,0x20,0x7d,0x7d,0x0a,0x3c,0x21,
 0x64,0x6f,0x63,0x74,0x79,0x70,0x65,0x20,0x68,0x74,0x6d,0x6c,0x3e,0x0a,0x3c,0x68,0x74,0x6d,0x6c,0x3e,0x0a,0x20,0x20,0x20,
@@ -10962,7 +10962,7 @@ var Bytes = map[string]*EmbeddedAsset{
 0x6f,0x64,0x79,0x3e,0x0a,0x3c,0x2f,0x68,0x74,0x6d,0x6c,0x3e,0x0a,0x7b,0x7b,0x20,0x65,0x6e,0x64,0x20,0x7d,0x7d,0x0a,
 }},
 "layouts/user.tmpl": &EmbeddedAsset{
-	ModTime: time.Unix(1583945627, 0),
+	ModTime: time.Unix(1584838852, 0),
 	Bytes: []byte{
 0x7b,0x7b,0x20,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x22,0x63,0x6f,0x6e,0x74,0x65,0x6e,0x74,0x22,0x20,0x7d,0x7d,0x0a,0x3c,
 0x64,0x69,0x76,0x20,0x63,0x6c,0x61,0x73,0x73,0x3d,0x22,0x73,0x69,0x64,0x65,0x2d,0x70,0x61,0x64,0x64,0x65,0x64,0x20,0x6c,

server/ctrladmin/ctrl.go

@@ -18,8 +18,8 @@ import (
 	"github.com/oxtoacart/bpool"
 	"github.com/wader/gormstore"
 
-	"senan.xyz/g/gonic/assets"
 	"senan.xyz/g/gonic/db"
+	"senan.xyz/g/gonic/server/assets"
 	"senan.xyz/g/gonic/server/ctrlbase"
 	"senan.xyz/g/gonic/version"
 )

server/server.go

@@ -10,9 +10,9 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"senan.xyz/g/gonic/assets"
 	"senan.xyz/g/gonic/db"
 	"senan.xyz/g/gonic/scanner"
+	"senan.xyz/g/gonic/server/assets"
 	"senan.xyz/g/gonic/server/ctrladmin"
 	"senan.xyz/g/gonic/server/ctrlbase"
 	"senan.xyz/g/gonic/server/ctrlsubsonic"