@ -3,6 +3,7 @@ package main
import ( import (
"context"
"context"
"crypto/rand"
"crypto/rand"
"embed"
"encoding/base64"
"encoding/base64"
"encoding/json"
"encoding/json"
"flag"
"flag"
@ -51,6 +52,12 @@ type User struct {
Password string ` json:"password" `
Password string ` json:"password" `
} }
//go:embed build/data build/data/html build/data/web build/data/web/css build/data/web/js build/data/web/js/ts
var localFS embed . FS
//go:embed lang/common lang/admin lang/email lang/form lang/setup
var langFS embed . FS
// contains everything the application needs, essentially. Wouldn't do this in the future.
// contains everything the application needs, essentially. Wouldn't do this in the future.
type appContext struct { type appContext struct {
// defaults *Config
// defaults *Config
@ -60,8 +67,6 @@ type appContext struct {
configBase settings
configBase settings
dataPath string
dataPath string
systemFS fs . FS
systemFS fs . FS
localFS fs . FS
langFS fs . FS
webFS httpFS
webFS httpFS
cssClass string
cssClass string
jellyfinLogin bool
jellyfinLogin bool
@ -86,8 +91,8 @@ type appContext struct {
func ( app * appContext ) loadHTML ( router * gin . Engine ) { func ( app * appContext ) loadHTML ( router * gin . Engine ) {
customPath := app . config . Section ( "files" ) . Key ( "html_templates" ) . MustString ( "" )
customPath := app . config . Section ( "files" ) . Key ( "html_templates" ) . MustString ( "" )
templatePath := " html"
templatePath := " build/data/ html"
htmlFiles , err := fs . ReadDir ( app. localFS, templatePath )
htmlFiles , err := fs . ReadDir ( , templatePath )
if err != nil {
if err != nil {
app . err . Fatalf ( "Couldn't access template directory: \"%s\"" , templatePath )
app . err . Fatalf ( "Couldn't access template directory: \"%s\"" , templatePath )
return
return
@ -102,7 +107,7 @@ func (app *appContext) loadHTML(router *gin.Engine) {
loadFiles [ i ] = filepath . Join ( filepath . Join ( customPath , f . Name ( ) ) )
loadFiles [ i ] = filepath . Join ( filepath . Join ( customPath , f . Name ( ) ) )
}
}
}
}
tmpl , err := template . ParseFS ( app. localFS, loadFiles ... )
tmpl , err := template . ParseFS ( , loadFiles ... )
if err != nil {
if err != nil {
app . err . Fatalf ( "Failed to load templates: %v" , err )
app . err . Fatalf ( "Failed to load templates: %v" , err )
}
}
@ -201,16 +206,15 @@ func start(asDaemon, firstCall bool) {
userConfigDir , _ := os . UserConfigDir ( )
userConfigDir , _ := os . UserConfigDir ( )
app . dataPath = filepath . Join ( userConfigDir , "jfa-go" )
app . dataPath = filepath . Join ( userConfigDir , "jfa-go" )
app . configPath = filepath . Join ( app . dataPath , "config.ini" )
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"))
app . langFS = os . DirFS ( filepath . Join ( filepath . Dir ( executable ) , "data" , "lang" ) )
// langFS = os.DirFS(filepath.Join(filepath.Dir(executable), "data", "lang"))
app . systemFS = os . DirFS ( "/" )
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 {
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 . info = log . New ( os . Stdout , "[INFO] " , log . Ltime )
app . err = log . New ( os . Stdout , "[ERROR] " , log . Ltime | log . Lshortfile )
app . err = log . New ( os . Stdout , "[ERROR] " , log . Ltime | log . Lshortfile )
@ -267,7 +271,7 @@ func start(asDaemon, firstCall bool) {
}
}
if _ , err := os . Stat ( app . configPath ) ; os . IsNotExist ( err ) {
if _ , err := os . Stat ( app . configPath ) ; os . IsNotExist ( err ) {
firstRun = true
firstRun = true
dConfig , err := fs . ReadFile ( app. localFS, " config-default.ini")
dConfig , err := fs . ReadFile ( , " build/data/ config-default.ini")
if err != nil {
if err != nil {
app . err . Fatalf ( "Couldn't find default config file" )
app . err . Fatalf ( "Couldn't find default config file" )
}
}
@ -342,16 +346,16 @@ func start(asDaemon, firstCall bool) {
} ( )
} ( )
}
}
app . storage . lang . CommonPath = " common"
app . storage . lang . CommonPath = " lang/ common"
app . storage . lang . FormPath = " form"
app . storage . lang . FormPath = " lang/ form"
app . storage . lang . AdminPath = " admin"
app . storage . lang . AdminPath = " lang/ admin"
app . storage . lang . EmailPath = " email"
app . storage . lang . EmailPath = " lang/ email"
externalLang := app . config . Section ( "files" ) . Key ( "lang_files" ) . MustString ( "" )
externalLang := app . config . Section ( "files" ) . Key ( "lang_files" ) . MustString ( "" )
var err error
var err error
if externalLang == "" {
if externalLang == "" {
err = app . storage . loadLang ( app. langFS)
err = app . storage . loadLang ( )
} else {
} else {
err = app . storage . loadLang ( app. langFS, os . DirFS ( externalLang ) )
err = app . storage . loadLang ( , os . DirFS ( externalLang ) )
}
}
if err != nil {
if err != nil {
app . info . Fatalf ( "Failed to load language files: %+v\n" , err )
app . info . Fatalf ( "Failed to load language files: %+v\n" , err )
@ -431,8 +435,8 @@ func start(asDaemon, firstCall bool) {
}
}
app . configBasePath = " config-base.json"
app . configBasePath = " build/data/ config-base.json"
configBase , _ := fs . ReadFile ( app. localFS, app . configBasePath )
configBase , _ := fs . ReadFile ( , app . configBasePath )
json . Unmarshal ( configBase , & app . configBase )
json . Unmarshal ( configBase , & app . configBase )
themes := map [ string ] string {
themes := map [ string ] string {
@ -580,8 +584,8 @@ func start(asDaemon, firstCall bool) {
} else {
} else {
debugMode = false
debugMode = false
address = "0.0.0.0:8056"
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 {
if err != nil {
app . info . Fatalf ( "Failed to load language files: %+v\n" , err )
app . info . Fatalf ( "Failed to load language files: %+v\n" , err )
}
}
Harvey Tindall
4 years ago