Fix docker build, add GOBINARY flag for make

GOBINARY defaults to "go", but if you want to build on a normal system,
you'll likely set it to go1.16rc1 with "make all GOBINARY=go1.16rc1".

.drone.yml

@@ -23,13 +23,13 @@ steps:
           event: tag
 
 ---
-name: jfa-go-git
+name: jfa-go-1.16-git
 kind: pipeline
 type: docker
 
 steps:
     - name: build
-      image: golang:latest
+      image: golang:1.16rc1-buster
       commands:
         - apt update -y
         - apt install build-essential python3-pip curl software-properties-common sed upx -y
@@ -48,6 +48,7 @@ steps:
 trigger:
     branch:
         - main
+        - go1.16
     event:
         exclude:
             - pull_request

.gitignore

@@ -4,6 +4,7 @@ dist/
 build/
 data/
 version.go
+embed.go
 notes
 docs/*
 lang/langtostruct.py

.goreleaser.yml

@@ -25,6 +25,7 @@ before:
     - npx esbuild --bundle ts/setup.ts --outfile=./data/web/js/setup.js --minify
     - go get -u github.com/swaggo/swag/cmd/swag
     - swag init -g main.go
+    - python3 embed.py internal
 builds:
     - dir: ./
       env:
@@ -43,10 +44,6 @@ archives:
         linux: Linux
         windows: Windows
         amd64: x86_64
-    files:
-        - data/*
-        - data/**/*
-        - data/**/**/*
 checksum:
     name_template: 'checksums.txt'
 snapshot:

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:latest AS build
+FROM golang:1.16rc1-buster AS build
 
 COPY . /opt/build
 
@@ -6,10 +6,10 @@ RUN apt update -y \
     && apt install build-essential python3-pip curl software-properties-common sed upx -y \
     && (curl -sL https://deb.nodesource.com/setup_14.x | bash -) \
     && apt install nodejs \
-    && (cd /opt/build; make all; make compress) \
+    && (cd /opt/build; make all-external; make compress) \
     && sed -i 's#id="password_resets-watch_directory" placeholder="/config/jellyfin"#id="password_resets-watch_directory" value="/jf" disabled#g' /opt/build/build/data/html/setup.html
 
-FROM golang:latest
+FROM golang:1.16rc1-buster
 
 COPY --from=build /opt/build/build /opt/jfa-go
 

Makefile

@@ -1,37 +1,39 @@
+GOBINARY ?= go
+
 npm:
 	$(info installing npm dependencies)
 	npm install
 
 configuration:
 	$(info Fixing config-base)
-	-mkdir -p build/data
+	-mkdir -p data
-	python3 config/fixconfig.py -i config/config-base.json -o build/data/config-base.json
+	python3 config/fixconfig.py -i config/config-base.json -o data/config-base.json
 	$(info Generating config-default.ini)
-	python3 config/generate_ini.py -i config/config-base.json -o build/data/config-default.ini
+	python3 config/generate_ini.py -i config/config-base.json -o data/config-default.ini
 
 email:
 	$(info Generating email html)
-	python3 mail/generate.py -o build/data/
+	python3 mail/generate.py -o data/
 
 typescript:
 	$(info compiling typescript)
-	-mkdir -p build/data/web/js
+	-mkdir -p data/web/js
-	-npx esbuild --bundle ts/admin.ts --outfile=./build/data/web/js/admin.js --minify
+	-npx esbuild --bundle ts/admin.ts --outfile=./data/web/js/admin.js --minify
-	-npx esbuild --bundle ts/form.ts --outfile=./build/data/web/js/form.js --minify
+	-npx esbuild --bundle ts/form.ts --outfile=./data/web/js/form.js --minify
-	-npx esbuild --bundle ts/setup.ts --outfile=./build/data/web/js/setup.js --minify
+	-npx esbuild --bundle ts/setup.ts --outfile=./data/web/js/setup.js --minify
 
 ts-debug:
 	$(info compiling typescript w/ sourcemaps)
-	-mkdir -p build/data/web/js
+	-mkdir -p data/web/js
-	-npx esbuild --bundle ts/admin.ts --sourcemap --outfile=./build/data/web/js/admin.js
+	-npx esbuild --bundle ts/admin.ts --sourcemap --outfile=./data/web/js/admin.js
-	-npx esbuild --bundle ts/form.ts --sourcemap --outfile=./build/data/web/js/form.js
+	-npx esbuild --bundle ts/form.ts --sourcemap --outfile=./data/web/js/form.js
-	-npx esbuild --bundle ts/setup.ts --sourcemap --outfile=./build/data/web/js/setup.js
+	-npx esbuild --bundle ts/setup.ts --sourcemap --outfile=./data/web/js/setup.js
-	-rm -r build/data/web/js/ts
+	-rm -r data/web/js/ts
 	$(info copying typescript)
-	cp -r ts build/data/web/js
+	cp -r ts data/web/js
 
 swagger:
-	go1.16rc1 get github.com/swaggo/swag/cmd/swag
+	$(GOBINARY) get github.com/swaggo/swag/cmd/swag
 	swag init -g main.go
 
 version:
@@ -39,33 +41,42 @@ version:
 
 compile:
 	$(info Downloading deps)
-	go1.16rc1 mod download
+	$(GOBINARY) mod download
 	$(info Building)
 	mkdir -p build
-	CGO_ENABLED=0 go1.16rc1 build -o build/jfa-go *.go
+	cd build && CGO_ENABLED=0 $(GOBINARY) build -o ./jfa-go ../*.go
 
 compress:
 	upx --lzma build/jfa-go
 
 bundle-css:
-	-mkdir -p build/data/web/css
+	-mkdir -p data/web/css
 	$(info bundling css)
-	npx esbuild --bundle css/base.css --outfile=build/data/web/css/bundle.css --external:remixicon.css --minify
+	npx esbuild --bundle css/base.css --outfile=data/web/css/bundle.css --external:remixicon.css --minify
 
 copy:
 	$(info copying fonts)
-	cp -r node_modules/remixicon/fonts/remixicon.css node_modules/remixicon/fonts/remixicon.woff2 build/data/web/css/
+	cp -r node_modules/remixicon/fonts/remixicon.css node_modules/remixicon/fonts/remixicon.woff2 data/web/css/
 	$(info copying html)
-	cp -r html build/data/
+	cp -r html data/
 	$(info copying static data)
-	-mkdir -p build/data/web
+	-mkdir -p data/web
-	cp -r static/* build/data/web/
+	cp -r static/* data/web/
 	$(info copying language files)
-	cp -r lang build/data/
+	cp -r lang data/
 
+embed:
+	python embed.py internal
+
+noembed:
+	python embed.py external
+	-mkdir -p build
+	$(info copying internal data into build/)
+	cp -r data build/
 
 install:
 	cp -r build $(DESTDIR)/jfa-go
 
-all: configuration npm email version typescript bundle-css swagger compile copy
+all: configuration npm email version typescript bundle-css swagger copy embed compile
-debug: configuration npm email version ts-debug bundle-css swagger compile copy
+all-external: configuration npm email version ts-debug bundle-css swagger copy noembed compile
+debug: configuration npm email version ts-debug bundle-css swagger copy noembed compile

config.go

@@ -15,7 +15,7 @@ var emailEnabled = false
 func (app *appContext) GetPath(sect, key string) (fs.FS, string) {
 	val := app.config.Section(sect).Key(key).MustString("")
 	if strings.HasPrefix(val, "jfa-go:") {
-		return app.localFS, strings.TrimPrefix(val, "jfa-go:")
+		return localFS, "data/" + strings.TrimPrefix(val, "jfa-go:")
 	}
 	return app.systemFS, val
 }
@@ -47,7 +47,6 @@ func (app *appContext) loadConfig() error {
 	app.config.Section("invite_emails").Key("email_text").SetValue(app.config.Section("invite_emails").Key("email_text").MustString("jfa-go:" + "invite-email.txt"))
 
 	app.config.Section("email_confirmation").Key("email_html").SetValue(app.config.Section("email_confirmation").Key("email_html").MustString("jfa-go:" + "confirmation.html"))
-	fmt.Println(app.config.Section("email_confirmation").Key("email_html").String())
 	app.config.Section("email_confirmation").Key("email_text").SetValue(app.config.Section("email_confirmation").Key("email_text").MustString("jfa-go:" + "confirmation.txt"))
 
 	app.config.Section("notifications").Key("expiry_html").SetValue(app.config.Section("notifications").Key("expiry_html").MustString("jfa-go:" + "expired.html"))

config/config-base.json

@@ -860,6 +860,14 @@
                     "type": "text",
                     "value": "",
                     "description": "Path to directory containing custom versions of web ui pages. See wiki for more info."
+                },
+                "lang_files": {
+                    "name": "Custom language files directory",
+                    "required": false,
+                    "requires_restart": true,
+                    "type": "text",
+                    "value": "",
+                    "description": "The path to a directory CONTAINING a 'lang/' directory, which follow the same form as the internal one. See GitHub for more info."
                 }
             }
         }

embed.py

@@ -0,0 +1,46 @@
+#!/usr/bin/python
+import sys
+import argparse
+
+parser = argparse.ArgumentParser()
+parser.add_argument("embed", metavar="<true/false>|<internal/external>|<yes/no>", type=str)
+trues = ["true", "internal", "yes", "y"]
+falses = ["false", "external", "no", "n"]
+
+EMBED = parser.parse_args().embed
+
+with open("embed.go", "w") as f:
+    if EMBED in trues:
+        f.write("""package main
+import (
+    "embed"
+    "log"
+)
+
+//go:embed data data/html data/web data/web/css data/web/js
+var localFS embed.FS
+
+//go:embed lang/common lang/admin lang/email lang/form lang/setup
+var langFS embed.FS
+
+func loadLocalFS() {
+    log.Println("Using internal storage")
+}""")
+    elif EMBED in falses:
+        f.write("""package main
+import (
+    "io/fs"
+    "os"
+    "log"
+    "path/filepath"
+)
+
+var localFS fs.FS
+var langFS fs.FS
+
+func loadLocalFS() {
+    log.Println("Using external storage")
+    executable, _ := os.Executable()
+    localFS = os.DirFS(filepath.Dir(executable))
+    langFS = os.DirFS(filepath.Join(filepath.Dir(executable), "data"))
+}""")

go.mod

@@ -1,6 +1,6 @@
 module github.com/hrfee/jfa-go
 
-go 1.14
+go 1.16
 
 replace github.com/hrfee/jfa-go/docs => ./docs
 
@@ -50,7 +50,6 @@ require (
 	golang.org/x/net v0.0.0-20210119194325-5f4716e94777 // indirect
 	golang.org/x/sys v0.0.0-20210123111255-9b0068b26619 // indirect
 	golang.org/x/text v0.3.5 // indirect
-	golang.org/x/tools v0.1.0 // indirect
 	google.golang.org/protobuf v1.25.0 // indirect
 	gopkg.in/ini.v1 v1.62.0
 )

go.sum

@@ -21,6 +21,7 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -156,14 +157,22 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M=
+github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/renameio v0.1.0 h1:GOZbcHa3HfsPKPlmyPyN2KEohoMXOhdMbHrvbpl2QaA=
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/safehtml v0.0.2 h1:ZOt2VXg4x24bW0m2jtzAOkhoXV0iM8vNKc0paByCZqM=
+github.com/google/safehtml v0.0.2/go.mod h1:L4KWwDsUJdECRAEpZoBn3O64bQaywRscowZjJAzjHnU=
 github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hrfee/jfa-go/jfapi v0.0.0-20210109010027-4aae65518089 h1:WRk+JAywI8V4u+PBQpdvXBX73yCZxgnLwyIiX7xL+Xc=
 github.com/hrfee/jfa-go/jfapi v0.0.0-20210109010027-4aae65518089/go.mod h1:Al1Rd1JGtpS+3KnK8t7+J0CZVDbT86QJrXHR6kZijds=
+github.com/jba/templatecheck v0.5.0 h1:sZwNjXG3xNApuwKmgUWEo2JuxmG0sgNaELl0zwRQ9x8=
+github.com/jba/templatecheck v0.5.0/go.mod h1:/1k7EajoSErFI9GLHAsiIJEaNLt3ALKNw2TV7z2SYv4=
 github.com/jordan-wright/email v0.0.0-20200602115436-fd8a7622303e h1:OGunVjqY7y4U4laftpEHv+mvZBlr7UGimJXKEGQtg48=
 github.com/jordan-wright/email v0.0.0-20200602115436-fd8a7622303e/go.mod h1:Fy2gCFfZhay8jplf/Csj6cyH/oshQTkLQYZbKkcV+SY=
 github.com/jordan-wright/email v4.0.1-0.20200917010138-e1c00e156980+incompatible h1:CL0ooBNfbNyJTJATno+m0h+zM5bW6v7fKlboKUGP/dI=
@@ -177,6 +186,8 @@ github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGn
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/knz/strtime v0.0.0-20200318182718-be999391ffa9 h1:GQE1iatYDRrIidq4Zf/9ZzKWyrTk2sXOYc1JADbkAjQ=
 github.com/knz/strtime v0.0.0-20200318182718-be999391ffa9/go.mod h1:4ZxfWkxwtc7dBeifERVVWRy9F9rTU9p0yCDgeCtlius=
 github.com/knz/strtime v0.0.0-20200924090105-187c67f2bf5e h1:ViPE0JEOvtw5I0EGUiFSr2VNKGNU+3oBT+oHbDXHbxk=
@@ -246,21 +257,31 @@ github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rogpeppe/go-internal v1.5.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rogpeppe/go-internal v1.6.2 h1:aIihoIOHCiLZHxyoNQ+ABL4NKhFTgKLBdMLyEAh98m0=
+github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/sanity-io/litter v1.3.0 h1:5ZO+weUsqdSWMUng5JnpkW/Oz8iTXiIdeumhQr1sSjs=
+github.com/sanity-io/litter v1.3.0/go.mod h1:5Z71SvaYy5kcGtyglXOC9rrUi3c1E8CamFWjQsazTh0=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
+github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
+github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
+github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
@@ -311,6 +332,7 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v1.0.1 h1:tY9CJiPnMXf1ERmG2EyK7gNUd+c6RKGD0IfU8WdUSz8=
 github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1 h1:ruQGxdhGHe7FWOJPT0mKs5+pD2Xs1Bm/kdGlHO04FmM=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -330,8 +352,11 @@ golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTk
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 h1:XQyxROzUlZH+WIQwySDgnISgOivlhjIEwaQaJEJrrN0=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.0 h1:8pl+sMODzuvGJkmj2W4kZihvVb5mKm8pB/X44PIQHv8=
+golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -345,6 +370,7 @@ golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 h1:k7pJ2yAPLPgbskkFdhRCsA77k2fySZ1zf2zCjvQCiIM=
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200923182212-328152dc79b1 h1:Iu68XRPd67wN4aRGGWwwq6bZo/25jR6uu52l/j2KkUE=
@@ -371,6 +397,7 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -421,34 +448,10 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190606050223-4d9ae51c2468/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190611222205-d73e1c7e250b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59 h1:QjA/9ArTfVTLfEhClDCG7SGrZkZixxWpwNCDiwJfh88=
 golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200820010801-b793a1359eac/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200923182640-463111b69878 h1:VUw1+Jf6KJPf82mbTQMia6HCnNMv2BbAipkEZ4KTcqQ=
-golang.org/x/tools v0.0.0-20200923182640-463111b69878/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
-golang.org/x/tools v0.0.0-20200924182824-0f1c53950d78 h1:3JUoxVhcskhsIDEc7vg0MUUEpmPPN5TfG+E97z/Fn90=
-golang.org/x/tools v0.0.0-20200924182824-0f1c53950d78/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
-golang.org/x/tools v0.0.0-20200929191002-f1e51e6b9437 h1:XSFqH8m531iIGazX5lrUC9j3slbwsZ1GFByqdUrLqmI=
-golang.org/x/tools v0.0.0-20200929191002-f1e51e6b9437/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
-golang.org/x/tools v0.0.0-20201008184944-d01b322e6f06 h1:w9ail9jFLaySAm61Zjhciu0LQ5i8YTy2pimlNLx4uuk=
-golang.org/x/tools v0.0.0-20201008184944-d01b322e6f06/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
-golang.org/x/tools v0.0.0-20201017001424-6003fad69a88 h1:ZB1XYzdDo7c/O48jzjMkvIjnC120Z9/CwgDWhePjQdQ=
-golang.org/x/tools v0.0.0-20201017001424-6003fad69a88/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
-golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9 h1:sEvmEcJVKBNUvgCUClbUQeHOAa9U0I2Ce1BooMvVCY4=
-golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201103235415-b653051172e4 h1:Qe0EMgvVYb6tmJhJHljCj3gS96hvSTkGNaIzp/ivq10=
-golang.org/x/tools v0.0.0-20201103235415-b653051172e4/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201113202037-1643af1435f3 h1:7R7+wzd5VuLvCNyHZ/MG511kkoP/DBEzkbh8qUsFbY8=
-golang.org/x/tools v0.0.0-20201113202037-1643af1435f3/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201114224030-61ea331ec02b h1:Ych5r0Z6MLML1fgf5hTg9p5bV56Xqx9xv9hLgMBATWs=
-golang.org/x/tools v0.0.0-20201114224030-61ea331ec02b/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201120155355-20be4ac4bd6e h1:t96dS3DO8DGjawSLJL/HIdz8CycAd2v07XxqB3UPTi0=
 golang.org/x/tools v0.0.0-20201120155355-20be4ac4bd6e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210104081019-d8d6ddbec6ee h1:5xKxdl/RhlelmSPaxyVeq5PYSmJ4H14yeQT58qP1F6o=
-golang.org/x/tools v0.0.0-20210104081019-d8d6ddbec6ee/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY=
-golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -478,8 +481,11 @@ google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM=
 gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
 gopkg.in/go-playground/validator.v8 v8.18.2 h1:lFB4DoMU6B626w8ny76MV7VX6W2VHct2GVOI3xgiMrQ=
@@ -510,3 +516,9 @@ gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc h1:/hemPrYIhOhy8zYrNj+069zDB68us2sMGsfkFJO0iZs=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.1-2020.1.6 h1:W18jzjh8mfPez+AwGLxmOImucz/IFjpNlrKVnaj2YVc=
+honnef.co/go/tools v0.0.1-2020.1.6/go.mod h1:pyyisuGw24ruLjrr1ddx39WE0y9OooInRzEYLhQB2YY=
+mvdan.cc/gofumpt v0.1.0 h1:hsVv+Y9UsZ/mFZTxJZuHVI6shSQCtzZ11h1JEFPAZLw=
+mvdan.cc/gofumpt v0.1.0/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48=
+mvdan.cc/xurls/v2 v2.2.0 h1:NSZPykBXJFCetGZykLAxaL6SIpvbVy/UFEniIfHAa8A=
+mvdan.cc/xurls/v2 v2.2.0/go.mod h1:EV1RMtya9D6G5DMYPGD8zTQzaHet6Jh8gFlRgGRJeO8=

main.go

@@ -50,7 +50,7 @@ type User struct {
 	Password string `json:"password"`
 }
 
-// contains everything the application needs, essentially. Wouldn't do this in the future.
+// contains (almost) everything the application needs, essentially. This was a dumb design decision imo.
 type appContext struct {
 	// defaults         *Config
 	config         *ini.File
@@ -59,7 +59,6 @@ type appContext struct {
 	configBase     settings
 	dataPath       string
 	systemFS       fs.FS
-	localFS        fs.FS
 	webFS          httpFS
 	cssClass       string
 	jellyfinLogin  bool
@@ -84,8 +83,8 @@ type appContext struct {
 
 func (app *appContext) loadHTML(router *gin.Engine) {
 	customPath := app.config.Section("files").Key("html_templates").MustString("")
-	templatePath := "html"
+	templatePath := "data/html"
-	htmlFiles, err := fs.ReadDir(app.localFS, templatePath)
+	htmlFiles, err := fs.ReadDir(localFS, templatePath)
 	if err != nil {
 		app.err.Fatalf("Couldn't access template directory: \"%s\"", templatePath)
 		return
@@ -100,7 +99,7 @@ func (app *appContext) loadHTML(router *gin.Engine) {
 			loadFiles[i] = filepath.Join(filepath.Join(customPath, f.Name()))
 		}
 	}
-	tmpl, err := template.ParseFS(app.localFS, loadFiles...)
+	tmpl, err := template.ParseFS(localFS, loadFiles...)
 	if err != nil {
 		app.err.Fatalf("Failed to load templates: %v", err)
 	}
@@ -194,20 +193,20 @@ func start(asDaemon, firstCall bool) {
 	/*
 		set default config, data and local paths
 		also, confusing naming here. data_path is not the internal 'data' directory, rather the users .config/jfa-go folder.
-		local_path is the internal 'data' directory.
+		localFS/data is the internal 'data' directory.
 	*/
 	userConfigDir, _ := os.UserConfigDir()
 	app.dataPath = filepath.Join(userConfigDir, "jfa-go")
 	app.configPath = filepath.Join(app.dataPath, "config.ini")
-	executable, _ := os.Executable()
+	// executable, _ := os.Executable()
-	app.localFS = os.DirFS(filepath.Join(filepath.Dir(executable), "data"))
+	// localFS = os.DirFS(filepath.Join(filepath.Dir(executable), "data"))
+	// langFS = os.DirFS(filepath.Join(filepath.Dir(executable), "data", "lang"))
 	app.systemFS = os.DirFS("/")
-	wfs := os.DirFS(filepath.Join(filepath.Dir(executable), "data", "web"))
+	// wfs := os.DirFS(filepath.Join(filepath.Dir(executable), "data", "web"))
 	app.webFS = httpFS{
-		hfs: http.FS(wfs),
+		hfs: http.FS(localFS),
-		fs:  wfs,
+		fs:  localFS,
 	}
-	app.webFS.fs = wfs
 
 	app.info = log.New(os.Stdout, "[INFO] ", log.Ltime)
 	app.err = log.New(os.Stdout, "[ERROR] ", log.Ltime|log.Lshortfile)
@@ -264,7 +263,7 @@ func start(asDaemon, firstCall bool) {
 	}
 	if _, err := os.Stat(app.configPath); os.IsNotExist(err) {
 		firstRun = true
-		dConfig, err := fs.ReadFile(app.localFS, "config-default.ini")
+		dConfig, err := fs.ReadFile(localFS, "data/config-default.ini")
 		if err != nil {
 			app.err.Fatalf("Couldn't find default config file")
 		}
@@ -339,11 +338,17 @@ func start(asDaemon, firstCall bool) {
 		}()
 	}
 
-	app.storage.lang.CommonPath = filepath.Join("lang", "common")
+	app.storage.lang.CommonPath = "lang/common"
-	app.storage.lang.FormPath = filepath.Join("lang", "form")
+	app.storage.lang.FormPath = "lang/form"
-	app.storage.lang.AdminPath = filepath.Join("lang", "admin")
+	app.storage.lang.AdminPath = "lang/admin"
-	app.storage.lang.EmailPath = filepath.Join("lang", "email")
+	app.storage.lang.EmailPath = "lang/email"
-	err := app.storage.loadLang()
+	externalLang := app.config.Section("files").Key("lang_files").MustString("")
+	var err error
+	if externalLang == "" {
+		err = app.storage.loadLang(langFS)
+	} else {
+		err = app.storage.loadLang(langFS, os.DirFS(externalLang))
+	}
 	if err != nil {
 		app.info.Fatalf("Failed to load language files: %+v\n", err)
 	}
@@ -422,8 +427,8 @@ func start(asDaemon, firstCall bool) {
 
 		}
 
-		app.configBasePath = "config-base.json"
+		app.configBasePath = "data/config-base.json"
-		configBase, _ := fs.ReadFile(app.localFS, app.configBasePath)
+		configBase, _ := fs.ReadFile(localFS, app.configBasePath)
 		json.Unmarshal(configBase, &app.configBase)
 
 		themes := map[string]string{
@@ -571,8 +576,8 @@ func start(asDaemon, firstCall bool) {
 	} else {
 		debugMode = false
 		address = "0.0.0.0:8056"
-		app.storage.lang.SetupPath = filepath.Join("lang", "setup")
+		app.storage.lang.SetupPath = "lang/setup"
-		err := app.storage.loadLangSetup()
+		err := app.storage.loadLangSetup(langFS)
 		if err != nil {
 			app.info.Fatalf("Failed to load language files: %+v\n", err)
 		}
@@ -747,6 +752,7 @@ func main() {
 	if flagPassed("test") {
 		TEST = true
 	}
+	loadLocalFS()
 	if flagPassed("start") {
 		args := []string{}
 		for i, f := range os.Args {

setup.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"encoding/json"
-	"os"
+	"io/fs"
 	"path/filepath"
 	"strings"
 
@@ -70,13 +70,14 @@ func (app *appContext) TestJF(gc *gin.Context) {
 	gc.JSON(200, map[string]bool{"success": true})
 }
 
-func (st *Storage) loadLangSetup() error {
+// The first filesystem passed should be the localFS, to ensure the local lang files are loaded first.
+func (st *Storage) loadLangSetup(filesystems ...fs.FS) error {
 	st.lang.Setup = map[string]setupLang{}
 	var english setupLang
-	load := func(fname string) error {
+	load := func(filesystem fs.FS, fname string) error {
 		index := strings.TrimSuffix(fname, filepath.Ext(fname))
 		lang := setupLang{}
-		f, err := os.ReadFile(filepath.Join(st.lang.SetupPath, fname))
+		f, err := fs.ReadFile(filesystem, filepath.Join(st.lang.SetupPath, fname))
 		if err != nil {
 			return err
 		}
@@ -107,22 +108,35 @@ func (st *Storage) loadLangSetup() error {
 		st.lang.Setup[index] = lang
 		return nil
 	}
-	err := load("en-us.json")
+	engFound := false
-	if err != nil {
+	var err error
+	for _, filesystem := range filesystems {
+		err = load(filesystem, "en-us.json")
+		if err == nil {
+			engFound = true
+		}
+	}
+	if !engFound {
 		return err
 	}
 	english = st.lang.Setup["en-us"]
-	files, err := os.ReadDir(st.lang.SetupPath)
+	setupLoaded := false
-	if err != nil {
+	for _, filesystem := range filesystems {
-		return err
+		files, err := fs.ReadDir(filesystem, st.lang.SetupPath)
-	}
+		if err != nil {
-	for _, f := range files {
+			return err
-		if f.Name() != "en-us.json" {
+		}
-			err = load(f.Name())
+		for _, f := range files {
-			if err != nil {
+			if f.Name() != "en-us.json" {
-				return err
+				err = load(filesystem, f.Name())
+				if err == nil {
+					setupLoaded = true
+				}
 			}
 		}
 	}
+	if !setupLoaded {
+		return err
+	}
 	return nil
 }

static.go

@@ -6,18 +6,20 @@ import (
 	"strings"
 )
 
+// Since the gin-static middleware uses a version of http.Filesystem with an extra Exists() func, we extend it here.
+
 type httpFS struct {
-	hfs http.FileSystem
+	hfs http.FileSystem // Created by converting fs.FS using http.FS()
 	fs  fs.FS
 }
 
 func (f httpFS) Open(name string) (http.File, error) {
-	return f.hfs.Open(name)
+	return f.hfs.Open("data/web" + name)
 }
 
 func (f httpFS) Exists(prefix string, filepath string) bool {
 	if p := strings.TrimPrefix(filepath, prefix); len(p) < len(filepath) {
-		stats, err := fs.Stat(f.fs, p)
+		stats, err := fs.Stat(f.fs, "data/web/"+p)
 		if err != nil {
 			return false
 		}

storage.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"encoding/json"
+	"io/fs"
 	"log"
 	"os"
 	"path/filepath"
@@ -62,20 +63,20 @@ type Lang struct {
 	Setup           setupLangs
 }
 
-func (st *Storage) loadLang() (err error) {
+func (st *Storage) loadLang(filesystems ...fs.FS) (err error) {
-	err = st.loadLangCommon()
+	err = st.loadLangCommon(filesystems...)
 	if err != nil {
 		return
 	}
-	err = st.loadLangAdmin()
+	err = st.loadLangAdmin(filesystems...)
 	if err != nil {
 		return
 	}
-	err = st.loadLangForm()
+	err = st.loadLangForm(filesystems...)
 	if err != nil {
 		return
 	}
-	err = st.loadLangEmail()
+	err = st.loadLangEmail(filesystems...)
 	return
 }
 
@@ -120,13 +121,13 @@ func patchQuantityStrings(english, other *map[string]quantityString) {
 	}
 }
 
-func (st *Storage) loadLangCommon() error {
+func (st *Storage) loadLangCommon(filesystems ...fs.FS) error {
 	st.lang.Common = map[string]commonLang{}
 	var english commonLang
-	load := func(fname string) error {
+	load := func(filesystem fs.FS, fname string) error {
 		index := strings.TrimSuffix(fname, filepath.Ext(fname))
 		lang := commonLang{}
-		f, err := os.ReadFile(filepath.Join(st.lang.CommonPath, fname))
+		f, err := fs.ReadFile(filesystem, filepath.Join(st.lang.CommonPath, fname))
 		if err != nil {
 			return err
 		}
@@ -143,33 +144,46 @@ func (st *Storage) loadLangCommon() error {
 		st.lang.Common[index] = lang
 		return nil
 	}
-	err := load("en-us.json")
+	engFound := false
-	if err != nil {
+	var err error
+	for _, filesystem := range filesystems {
+		err = load(filesystem, "en-us.json")
+		if err == nil {
+			engFound = true
+		}
+	}
+	if !engFound {
 		return err
 	}
 	english = st.lang.Common["en-us"]
-	files, err := os.ReadDir(st.lang.CommonPath)
+	commonLoaded := false
-	if err != nil {
+	for _, filesystem := range filesystems {
-		return err
+		files, err := fs.ReadDir(filesystem, st.lang.CommonPath)
-	}
+		if err != nil {
-	for _, f := range files {
+			continue
-		if f.Name() != "en-us.json" {
+		}
-			err = load(f.Name())
+		for _, f := range files {
-			if err != nil {
+			if f.Name() != "en-us.json" {
-				return err
+				err = load(filesystem, f.Name())
+				if err == nil {
+					commonLoaded = true
+				}
 			}
 		}
 	}
+	if !commonLoaded {
+		return err
+	}
 	return nil
 }
 
-func (st *Storage) loadLangAdmin() error {
+func (st *Storage) loadLangAdmin(filesystems ...fs.FS) error {
 	st.lang.Admin = map[string]adminLang{}
 	var english adminLang
-	load := func(fname string) error {
+	load := func(filesystem fs.FS, fname string) error {
 		index := strings.TrimSuffix(fname, filepath.Ext(fname))
 		lang := adminLang{}
-		f, err := os.ReadFile(filepath.Join(st.lang.AdminPath, fname))
+		f, err := fs.ReadFile(filesystem, filepath.Join(st.lang.AdminPath, fname))
 		if err != nil {
 			return err
 		}
@@ -194,33 +208,46 @@ func (st *Storage) loadLangAdmin() error {
 		st.lang.Admin[index] = lang
 		return nil
 	}
-	err := load("en-us.json")
+	engFound := false
-	if err != nil {
+	var err error
+	for _, filesystem := range filesystems {
+		err = load(filesystem, "en-us.json")
+		if err == nil {
+			engFound = true
+		}
+	}
+	if !engFound {
 		return err
 	}
 	english = st.lang.Admin["en-us"]
-	files, err := os.ReadDir(st.lang.AdminPath)
+	adminLoaded := false
-	if err != nil {
+	for _, filesystem := range filesystems {
-		return err
+		files, err := fs.ReadDir(filesystem, st.lang.AdminPath)
-	}
+		if err != nil {
-	for _, f := range files {
+			continue
-		if f.Name() != "en-us.json" {
+		}
-			err = load(f.Name())
+		for _, f := range files {
-			if err != nil {
+			if f.Name() != "en-us.json" {
-				return err
+				err = load(filesystem, f.Name())
+				if err == nil {
+					adminLoaded = true
+				}
 			}
 		}
 	}
+	if !adminLoaded {
+		return err
+	}
 	return nil
 }
 
-func (st *Storage) loadLangForm() error {
+func (st *Storage) loadLangForm(filesystems ...fs.FS) error {
 	st.lang.Form = map[string]formLang{}
 	var english formLang
-	load := func(fname string) error {
+	load := func(filesystem fs.FS, fname string) error {
 		index := strings.TrimSuffix(fname, filepath.Ext(fname))
 		lang := formLang{}
-		f, err := os.ReadFile(filepath.Join(st.lang.FormPath, fname))
+		f, err := fs.ReadFile(filesystem, filepath.Join(st.lang.FormPath, fname))
 		if err != nil {
 			return err
 		}
@@ -250,33 +277,46 @@ func (st *Storage) loadLangForm() error {
 		st.lang.Form[index] = lang
 		return nil
 	}
-	err := load("en-us.json")
+	engFound := false
-	if err != nil {
+	var err error
+	for _, filesystem := range filesystems {
+		err = load(filesystem, "en-us.json")
+		if err == nil {
+			engFound = true
+		}
+	}
+	if !engFound {
 		return err
 	}
 	english = st.lang.Form["en-us"]
-	files, err := os.ReadDir(st.lang.FormPath)
+	formLoaded := false
-	if err != nil {
+	for _, filesystem := range filesystems {
-		return err
+		files, err := fs.ReadDir(filesystem, st.lang.FormPath)
-	}
+		if err != nil {
-	for _, f := range files {
+			continue
-		if f.Name() != "en-us.json" {
+		}
-			err = load(f.Name())
+		for _, f := range files {
-			if err != nil {
+			if f.Name() != "en-us.json" {
-				return err
+				err = load(filesystem, f.Name())
+				if err == nil {
+					formLoaded = true
+				}
 			}
 		}
 	}
+	if !formLoaded {
+		return err
+	}
 	return nil
 }
 
-func (st *Storage) loadLangEmail() error {
+func (st *Storage) loadLangEmail(filesystems ...fs.FS) error {
 	st.lang.Email = map[string]emailLang{}
 	var english emailLang
-	load := func(fname string) error {
+	load := func(filesystem fs.FS, fname string) error {
 		index := strings.TrimSuffix(fname, filepath.Ext(fname))
 		lang := emailLang{}
-		f, err := os.ReadFile(filepath.Join(st.lang.EmailPath, fname))
+		f, err := fs.ReadFile(filesystem, filepath.Join(st.lang.EmailPath, fname))
 		if err != nil {
 			return err
 		}
@@ -299,23 +339,36 @@ func (st *Storage) loadLangEmail() error {
 		st.lang.Email[index] = lang
 		return nil
 	}
-	err := load("en-us.json")
+	engFound := false
-	if err != nil {
+	var err error
+	for _, filesystem := range filesystems {
+		err = load(filesystem, "en-us.json")
+		if err == nil {
+			engFound = true
+		}
+	}
+	if !engFound {
 		return err
 	}
 	english = st.lang.Email["en-us"]
-	files, err := os.ReadDir(st.lang.EmailPath)
+	emailLoaded := false
-	if err != nil {
+	for _, filesystem := range filesystems {
-		return err
+		files, err := fs.ReadDir(filesystem, st.lang.EmailPath)
-	}
+		if err != nil {
-	for _, f := range files {
+			continue
-		if f.Name() != "en-us.json" {
+		}
-			err = load(f.Name())
+		for _, f := range files {
-			if err != nil {
+			if f.Name() != "en-us.json" {
-				return err
+				err = load(filesystem, f.Name())
+				if err == nil {
+					emailLoaded = true
+				}
 			}
 		}
 	}
+	if !emailLoaded {
+		return err
+	}
 	return nil
 }
 

version.py

@@ -1,6 +1,6 @@
 import subprocess
 import sys
-import os
+
 try:
     version = sys.argv[1].replace('v', '')
 except IndexError: