From 2706929bb438ed8c149256b3904a4a9db4ae41ed Mon Sep 17 00:00:00 2001 From: lukas Date: Mon, 6 Sep 2021 20:20:33 +0200 Subject: [PATCH 1/2] load and save config file --- apiGo/config/Config.go | 98 ++++++++++++++++++++++++++++++++++++++++++ apiGo/go.mod | 1 + apiGo/go.sum | 49 +++++++++++++++++++++ apiGo/main.go | 3 ++ 4 files changed, 151 insertions(+) create mode 100644 apiGo/config/Config.go diff --git a/apiGo/config/Config.go b/apiGo/config/Config.go new file mode 100644 index 0000000..f1f46cb --- /dev/null +++ b/apiGo/config/Config.go @@ -0,0 +1,98 @@ +package config + +import ( + "errors" + "fmt" + "github.com/pelletier/go-toml/v2" + "os" +) + +type DatabaseT struct { + DBName string + DBPassword string + DBUser string + DBPort uint16 + DBHost string +} + +type FileConfT struct { + Database DatabaseT +} + +func defaultConig() *FileConfT { + return &FileConfT{Database: DatabaseT{ + DBName: "mediacenter", + DBPassword: "mediapassword", + DBUser: "mediacenteruser", + DBPort: 3306, + DBHost: "127.0.0.1", + }} +} + +var liveConf FileConfT + +func Init() { + cfgname := "openmediacenter.cfg" + cfgpath := "/etc/" + + // load config from disk + dat, err := os.ReadFile(cfgpath + cfgname) + if err != nil { + // handle error if not exists or no sufficient read access + if _, ok := err.(*os.PathError); ok { + + // check if config exists on local dir + dat, err = os.ReadFile(cfgname) + if err != nil { + // config really doesn't exist! + fmt.Printf("config not existing -- generating new empty config at %s%s\n", cfgpath, cfgname) + + // generate new default config + obj, _ := toml.Marshal(defaultConig()) + liveConf = *defaultConig() + + err := os.WriteFile(cfgpath+cfgname, obj, 777) + if err != nil { + if errors.Is(err, os.ErrPermission) { + // permisson denied to create file try to create at current dir + err = os.WriteFile(cfgname, obj, 777) + if err != nil { + fmt.Println("failed to create default config file!") + } else { + fmt.Println("config file created at .") + } + } else { + fmt.Println(err.Error()) + } + } + } else { + // ok decode local config + decodeConfig(&dat) + } + + } else { + // other error + fmt.Println(err.Error()) + } + } else { + decodeConfig(&dat) + } +} + +func decodeConfig(bin *[]byte) { + config := FileConfT{} + + err := toml.Unmarshal(*bin, &config) + if err != nil { + fmt.Println(err) + + } else { + fmt.Println("Successfully loaded config file!") + + liveConf = config + } +} + +func GetConfig() *FileConfT { + return &liveConf +} diff --git a/apiGo/go.mod b/apiGo/go.mod index 3615d28..8c8f167 100644 --- a/apiGo/go.mod +++ b/apiGo/go.mod @@ -4,6 +4,7 @@ go 1.16 require ( github.com/go-sql-driver/mysql v1.5.0 + github.com/pelletier/go-toml/v2 v2.0.0-beta.3 gopkg.in/oauth2.v3 v3.12.0 nhooyr.io/websocket v1.8.7 ) diff --git a/apiGo/go.sum b/apiGo/go.sum index 1671ea2..2427f80 100644 --- a/apiGo/go.sum +++ b/apiGo/go.sum @@ -1,59 +1,92 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= 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= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8= +github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/gavv/httpexpect v2.0.0+incompatible h1:1X9kcRshkSKEjNJJxX9Y9mQ5BRfbxU5kORdjhlA1yX8= github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc= +github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14= github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= +github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no= github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= +github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY= github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= github.com/go-session/session v3.1.2+incompatible/go.mod h1:8B3iivBQjrz/JtC68Np2T1yBBLxTan3mn/3OM0CyRt0= github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= +github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8= github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= +github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls= github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/imkira/go-interpol v1.1.0 h1:KIiKr0VSG2CUW1hl1jpiyuzuJeKUUpC8iM1AIE7N1Vk= github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA= +github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.10.3 h1:OP96hzwJVBIHYU52pVTI6CczrxPvrGfgqF9N5eTO0Q8= github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= +github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/moul/http2curl v1.0.0 h1:dRMWoAtb+ePxMlLkrCbAqh4TlPHXvoGUSQ323/9Zahs= github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.10.2/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/pelletier/go-toml/v2 v2.0.0-beta.3 h1:PNCTU4naEJ8mKal97P3A2qDU74QRQGlv4FXiL1XDqi4= +github.com/pelletier/go-toml/v2 v2.0.0-beta.3/go.mod h1:aNseLYu/uKskg0zpr/kbr2z8yGuWtotWf/0BpGIAL2Y= +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/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.7.1-0.20210427113832-6241f9ab9942 h1:t0lM6y/M5IiUZyvbBTcngso8SZEZICH7is9B6g/obVU= +github.com/stretchr/testify v1.7.1-0.20210427113832-6241f9ab9942/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/tidwall/btree v0.0.0-20170113224114-9876f1454cf0 h1:QnyrPZZvPmR0AtJCxxfCtI1qN+fYpKTKJ/5opWmZ34k= github.com/tidwall/btree v0.0.0-20170113224114-9876f1454cf0/go.mod h1:huei1BkDWJ3/sLXmO+bsCNELL+Bp2Kks9OLyQFkzvA8= github.com/tidwall/buntdb v1.1.0 h1:H6LzK59KiNjf1nHVPFrYj4Qnl8d8YLBsYamdL8N+Bao= @@ -70,16 +103,26 @@ github.com/tidwall/rtree v0.0.0-20180113144539-6cd427091e0e h1:+NL1GDIUOKxVfbp2K github.com/tidwall/rtree v0.0.0-20180113144539-6cd427091e0e/go.mod h1:/h+UnNGt0IhNNJLkGikcdcJqm66zGD/uJGMRxK/9+Ao= github.com/tidwall/tinyqueue v0.0.0-20180302190814-1e39f5511563 h1:Otn9S136ELckZ3KKDyCkxapfufrqDqwmGjcHfAyXRrE= github.com/tidwall/tinyqueue v0.0.0-20180302190814-1e39f5511563/go.mod h1:mLqSmt7Dv/CNneF2wfcChfN1rvapyQr01LGKnKex0DQ= +github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= +github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= +github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.6.0 h1:uWF8lgKmeaIewWVPwi4GRq2P6+R46IgYZdxWtM+GtEY= github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w= github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= +github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= +github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0 h1:6fRhSjgLCkTD3JnJxvaJ4Sj+TYblw757bqYgZaOq5ZY= github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI= +github.com/yudai/gojsondiff v1.0.0 h1:27cbfqXLVEJ1o8I6v3y9lg8Ydm53EKqHXAOMxEGlCOA= github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= +github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3IfnEUduWvb9is428/nNb5L3U01M= github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -87,6 +130,7 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +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/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -94,12 +138,14 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42 h1:vEOn+mP2zCOVzKckCZy6YsCtDblrpj/w7B9nxGNELpg= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -109,6 +155,9 @@ gopkg.in/oauth2.v3 v3.12.0/go.mod h1:XEYgKqWX095YiPT+Aw5y3tCn+7/FMnlTFKrupgSiJ3I gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g= nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= diff --git a/apiGo/main.go b/apiGo/main.go index 9d96e0e..62105f7 100644 --- a/apiGo/main.go +++ b/apiGo/main.go @@ -6,6 +6,7 @@ import ( "log" "net/http" "openmediacenter/apiGo/api" + "openmediacenter/apiGo/config" "openmediacenter/apiGo/database" settings2 "openmediacenter/apiGo/database/settings" "openmediacenter/apiGo/static" @@ -19,6 +20,8 @@ func main() { db, verbose, pathPrefix := handleCommandLineArguments() // todo some verbosity logger or sth + config.Init() + fmt.Printf("Use verbose output: %t\n", verbose) fmt.Printf("Videopath prefix: %s\n", *pathPrefix) From aa49d601ab3ae090369af36d6de3fd76e2c54916 Mon Sep 17 00:00:00 2001 From: lukas Date: Thu, 9 Sep 2021 23:33:04 +0200 Subject: [PATCH 2/2] override config entries with cli args use getconfig instead of settings file --- apiGo/api/Settings.go | 5 +- apiGo/api/TVShows.go | 4 +- apiGo/api/Video.go | 4 +- apiGo/config/Config.go | 174 ++++++++++++++++++++++------ apiGo/database/Database.go | 17 +-- apiGo/database/settings/Settings.go | 20 ---- apiGo/main.go | 43 +------ 7 files changed, 156 insertions(+), 111 deletions(-) delete mode 100644 apiGo/database/settings/Settings.go diff --git a/apiGo/api/Settings.go b/apiGo/api/Settings.go index b3a6a63..c5dedde 100644 --- a/apiGo/api/Settings.go +++ b/apiGo/api/Settings.go @@ -4,6 +4,7 @@ import ( "encoding/json" "fmt" "openmediacenter/apiGo/api/types" + "openmediacenter/apiGo/config" "openmediacenter/apiGo/database" "openmediacenter/apiGo/database/settings" "openmediacenter/apiGo/videoparser" @@ -88,8 +89,8 @@ func getSettingsFromDB() { MediacenterName: sett.MediacenterName, VideoPath: serverVideoPath, TVShowPath: serverTVShowPath, - TVShowEnabled: settings.TVShowsEnabled(), - FullDeleteEnabled: settings.VideosDeletable(), + TVShowEnabled: !config.GetConfig().Features.DisableTVSupport, + FullDeleteEnabled: config.GetConfig().Features.FullyDeletableVideos, } str, _ := json.Marshal(res) diff --git a/apiGo/api/TVShows.go b/apiGo/api/TVShows.go index 7969392..7004c61 100644 --- a/apiGo/api/TVShows.go +++ b/apiGo/api/TVShows.go @@ -2,13 +2,13 @@ package api import ( "fmt" + "openmediacenter/apiGo/config" "openmediacenter/apiGo/database" - "openmediacenter/apiGo/database/settings" ) func AddTvshowHandlers() { // do not add handlers if tvshows not enabled - if !settings.TVShowsEnabled() { + if config.GetConfig().Features.DisableTVSupport { return } diff --git a/apiGo/api/Video.go b/apiGo/api/Video.go index b1dbe53..4af0ba5 100644 --- a/apiGo/api/Video.go +++ b/apiGo/api/Video.go @@ -5,8 +5,8 @@ import ( "fmt" "net/url" "openmediacenter/apiGo/api/types" + "openmediacenter/apiGo/config" "openmediacenter/apiGo/database" - "openmediacenter/apiGo/database/settings" "os" "strconv" ) @@ -448,7 +448,7 @@ func addToVideoHandlers() { } // only allow deletion of video if cli flag is set, independent of passed api arg - if settings.VideosDeletable() && args.FullyDelete { + if config.GetConfig().Features.FullyDeletableVideos && args.FullyDelete { // get physical path of video to delete query = fmt.Sprintf("SELECT movie_url FROM videos WHERE movie_id=%d", args.MovieId) var vidpath string diff --git a/apiGo/config/Config.go b/apiGo/config/Config.go index f1f46cb..a8f292e 100644 --- a/apiGo/config/Config.go +++ b/apiGo/config/Config.go @@ -2,6 +2,7 @@ package config import ( "errors" + "flag" "fmt" "github.com/pelletier/go-toml/v2" "os" @@ -15,18 +16,40 @@ type DatabaseT struct { DBHost string } -type FileConfT struct { - Database DatabaseT +type FeaturesT struct { + DisableTVSupport bool + FullyDeletableVideos bool } -func defaultConig() *FileConfT { - return &FileConfT{Database: DatabaseT{ - DBName: "mediacenter", - DBPassword: "mediapassword", - DBUser: "mediacenteruser", - DBPort: 3306, - DBHost: "127.0.0.1", - }} +type GeneralT struct { + VerboseLogging bool + ReindexPrefix string +} + +type FileConfT struct { + Database DatabaseT + General GeneralT + Features FeaturesT +} + +func defaultConfig() *FileConfT { + return &FileConfT{ + Database: DatabaseT{ + DBName: "mediacenter", + DBPassword: "mediapassword", + DBUser: "mediacenteruser", + DBPort: 3306, + DBHost: "127.0.0.1", + }, + General: GeneralT{ + VerboseLogging: false, + ReindexPrefix: "/var/www/openmediacenter", + }, + Features: FeaturesT{ + DisableTVSupport: false, + FullyDeletableVideos: false, + }, + } } var liveConf FileConfT @@ -44,32 +67,11 @@ func Init() { // check if config exists on local dir dat, err = os.ReadFile(cfgname) if err != nil { - // config really doesn't exist! - fmt.Printf("config not existing -- generating new empty config at %s%s\n", cfgpath, cfgname) - - // generate new default config - obj, _ := toml.Marshal(defaultConig()) - liveConf = *defaultConig() - - err := os.WriteFile(cfgpath+cfgname, obj, 777) - if err != nil { - if errors.Is(err, os.ErrPermission) { - // permisson denied to create file try to create at current dir - err = os.WriteFile(cfgname, obj, 777) - if err != nil { - fmt.Println("failed to create default config file!") - } else { - fmt.Println("config file created at .") - } - } else { - fmt.Println(err.Error()) - } - } + generateNewConfig(cfgpath, cfgname) } else { // ok decode local config decodeConfig(&dat) } - } else { // other error fmt.Println(err.Error()) @@ -77,6 +79,32 @@ func Init() { } else { decodeConfig(&dat) } + + handleCommandLineArguments() +} + +func generateNewConfig(cfgpath string, cfgname string) { + // config really doesn't exist! + fmt.Printf("config not existing -- generating new empty config at %s%s\n", cfgpath, cfgname) + + // generate new default config + obj, _ := toml.Marshal(defaultConfig()) + liveConf = *defaultConfig() + + err := os.WriteFile(cfgpath+cfgname, obj, 777) + if err != nil { + if errors.Is(err, os.ErrPermission) { + // permisson denied to create file try to create at current dir + err = os.WriteFile(cfgname, obj, 777) + if err != nil { + fmt.Println("failed to create default config file!") + } else { + fmt.Println("config file created at .") + } + } else { + fmt.Println(err.Error()) + } + } } func decodeConfig(bin *[]byte) { @@ -85,7 +113,7 @@ func decodeConfig(bin *[]byte) { err := toml.Unmarshal(*bin, &config) if err != nil { fmt.Println(err) - + liveConf = *defaultConfig() } else { fmt.Println("Successfully loaded config file!") @@ -93,6 +121,86 @@ func decodeConfig(bin *[]byte) { } } +// handleCommandLineArguments let cli args override the config +func handleCommandLineArguments() { + // get a defaultconfig obj to set defaults + dconf := defaultConfig() + + const ( + DBHost = "DBHost" + DBPort = "DBPort" + DBUser = "DBUser" + DBPassword = "DBPassword" + DBName = "DBName" + Verbose = "v" + ReindexPrefix = "ReindexPrefix" + DisableTVSupport = "DisableTVSupport" + FullyDeletableVideos = "FullyDeletableVideos" + ) + + dbhostPtr := flag.String(DBHost, dconf.Database.DBHost, "database host name") + dbPortPtr := flag.Int(DBPort, int(dconf.Database.DBPort), "database port") + dbUserPtr := flag.String(DBUser, dconf.Database.DBUser, "database username") + dbPassPtr := flag.String(DBPassword, dconf.Database.DBPassword, "database username") + dbNamePtr := flag.String(DBName, dconf.Database.DBName, "database name") + + verbosePtr := flag.Bool(Verbose, dconf.General.VerboseLogging, "Verbose log output") + + pathPrefix := flag.String(ReindexPrefix, dconf.General.ReindexPrefix, "Prefix path for videos to reindex") + + disableTVShowSupport := flag.Bool(DisableTVSupport, dconf.Features.DisableTVSupport, "Disable the TVShow support and pages") + videosFullyDeletable := flag.Bool(FullyDeletableVideos, dconf.Features.FullyDeletableVideos, "Allow deletion from harddisk") + + flag.Parse() + + if isFlagPassed(DBHost) { + liveConf.Database.DBHost = *dbhostPtr + } + + if isFlagPassed(DBPort) { + liveConf.Database.DBPort = uint16(*dbPortPtr) + } + + if isFlagPassed(DBName) { + liveConf.Database.DBName = *dbNamePtr + } + + if isFlagPassed(DBUser) { + liveConf.Database.DBUser = *dbUserPtr + } + + if isFlagPassed(DBPassword) { + liveConf.Database.DBPassword = *dbPassPtr + } + + if isFlagPassed(Verbose) { + liveConf.General.VerboseLogging = *verbosePtr + } + + if isFlagPassed(ReindexPrefix) { + liveConf.General.ReindexPrefix = *pathPrefix + } + + if isFlagPassed(DisableTVSupport) { + liveConf.Features.DisableTVSupport = *disableTVShowSupport + } + + if isFlagPassed(FullyDeletableVideos) { + liveConf.Features.FullyDeletableVideos = *videosFullyDeletable + } +} + +// isFlagPassed check whether a flag was passed +func isFlagPassed(name string) bool { + found := false + flag.Visit(func(f *flag.Flag) { + if f.Name == name { + found = true + } + }) + return found +} + func GetConfig() *FileConfT { return &liveConf } diff --git a/apiGo/database/Database.go b/apiGo/database/Database.go index 5eb7f3f..e72723d 100644 --- a/apiGo/database/Database.go +++ b/apiGo/database/Database.go @@ -5,23 +5,14 @@ import ( "fmt" _ "github.com/go-sql-driver/mysql" "openmediacenter/apiGo/api/types" + "openmediacenter/apiGo/config" ) var db *sql.DB var DBName string -// store the command line parameter for Videoprefix -var SettingsVideoPrefix = "" - -type DatabaseConfig struct { - DBHost string - DBPort int - DBUser string - DBPassword string - DBName string -} - -func InitDB(dbconf *DatabaseConfig) { +func InitDB() { + dbconf := config.GetConfig().Database DBName = dbconf.DBName // Open up our database connection. @@ -128,6 +119,6 @@ func GetSettings() (result types.SettingsType, PathPrefix string, sizes types.Se result.TMDBGrabbing = TMDBGrabbing != 0 result.PasswordEnabled = result.Password != "-1" result.DarkMode = DarkMode != 0 - PathPrefix = SettingsVideoPrefix + PathPrefix = config.GetConfig().General.ReindexPrefix return } diff --git a/apiGo/database/settings/Settings.go b/apiGo/database/settings/Settings.go deleted file mode 100644 index d13d305..0000000 --- a/apiGo/database/settings/Settings.go +++ /dev/null @@ -1,20 +0,0 @@ -package settings - -var tvShowEnabled bool -var videosDeletable bool - -func TVShowsEnabled() bool { - return tvShowEnabled -} - -func SetTVShowEnabled(enabled bool) { - tvShowEnabled = enabled -} - -func VideosDeletable() bool { - return videosDeletable -} - -func SetVideosDeletable(deletable bool) { - videosDeletable = deletable -} diff --git a/apiGo/main.go b/apiGo/main.go index 62105f7..76507f1 100644 --- a/apiGo/main.go +++ b/apiGo/main.go @@ -1,14 +1,12 @@ package main import ( - "flag" "fmt" "log" "net/http" "openmediacenter/apiGo/api" "openmediacenter/apiGo/config" "openmediacenter/apiGo/database" - settings2 "openmediacenter/apiGo/database/settings" "openmediacenter/apiGo/static" "openmediacenter/apiGo/videoparser" ) @@ -17,18 +15,13 @@ func main() { fmt.Println("init OpenMediaCenter server") port := 8081 - db, verbose, pathPrefix := handleCommandLineArguments() - // todo some verbosity logger or sth - config.Init() - fmt.Printf("Use verbose output: %t\n", verbose) - fmt.Printf("Videopath prefix: %s\n", *pathPrefix) + // todo some verbosity logger or sth + fmt.Printf("Use verbose output: %t\n", config.GetConfig().General.VerboseLogging) + fmt.Printf("Videopath prefix: %s\n", config.GetConfig().General.ReindexPrefix) - // set pathprefix in database settings object - database.SettingsVideoPrefix = *pathPrefix - - database.InitDB(db) + database.InitDB() defer database.Close() api.AddVideoHandlers() @@ -47,31 +40,3 @@ func main() { fmt.Printf("OpenMediacenter server up and running on port %d\n", port) log.Fatal(http.ListenAndServe(fmt.Sprintf(":%d", port), nil)) } - -func handleCommandLineArguments() (*database.DatabaseConfig, bool, *string) { - dbhostPtr := flag.String("DBHost", "127.0.0.1", "database host name") - dbPortPtr := flag.Int("DBPort", 3306, "database port") - dbUserPtr := flag.String("DBUser", "mediacenteruser", "database username") - dbPassPtr := flag.String("DBPassword", "mediapassword", "database username") - dbNamePtr := flag.String("DBName", "mediacenter", "database name") - - verbosePtr := flag.Bool("v", true, "Verbose log output") - - pathPrefix := flag.String("ReindexPrefix", "/var/www/openmediacenter", "Prefix path for videos to reindex") - - disableTVShowSupport := flag.Bool("DisableTVSupport", false, "Disable the TVShow support and pages") - videosFullyDeletable := flag.Bool("FullyDeletableVideos", false, "Allow deletion from harddisk") - - flag.Parse() - - settings2.SetTVShowEnabled(!*disableTVShowSupport) - settings2.SetVideosDeletable(*videosFullyDeletable) - - return &database.DatabaseConfig{ - DBHost: *dbhostPtr, - DBPort: *dbPortPtr, - DBUser: *dbUserPtr, - DBPassword: *dbPassPtr, - DBName: *dbNamePtr, - }, *verbosePtr, pathPrefix -}