123niel/tsviewer
1
0
Fork 0
forked from Cliffbreak/tsviewer
Code Issues Pull requests Releases Wiki Activity

Compare commits

merge into: 123niel:master
Branches Tags
123niel:master
Cliffbreak:master
...
pull from: Cliffbreak:master
Branches Tags
Cliffbreak:master
123niel:master

5 commits
master ... master

Author SHA1 Message Date
Hendrik Schlehlein
59bd3d7139 changed config to yaml; removed flag support 2019-04-22 02:51:02 +02:00
Alpha
a454dbc947 Change ReadME 2019-02-07 21:46:45 +01:00
alpha
8416fcbdb4 chnages 2019-02-07 15:13:13 +01:00
alpha
cf378679fb Changes in ReadME 2019-02-07 15:08:42 +01:00
Moritz
d57986721d Merge branch 'master' of 123niel/tsviewer into master 
Geprüft
Mit freundlichen Grüßen
Eichhorn
 2019-02-07 14:02:28 +00:00
3 changed files with 47 additions and 124 deletions
Show stats Expand all files Collapse all files

2
.gitignore vendored
View file

@ -13,3 +13,5 @@
*.out *.out
# Custom Blacklist # Custom Blacklist
#CM

4
README.md
View file

@ -1,8 +1,6 @@
# tsviewer **[WIP]** # tsviewer **[ALPHA 1.0.1]**
A TS3 Viewer with REST API. A TS3 Viewer with REST API.
I´m a sick Fuck i like the sick F09ck
## DOCKER-Config ## DOCKER-Config
```bash ```bash

165
config/config.go
View file

@ -1,161 +1,84 @@
package config package config
import ( import (
"encoding/json"
"flag"
"io/ioutil"
"log"
"os" "os"
"strconv" "strconv"
"github.com/spf13/viper"
) )
type Config struct { type Config struct {
User User `json:"user"` User struct {
ServerTS ServerTS `json:"serverTS"` Nickname string
ServerWeb ServerWeb `json:"serverWeb"` Name string
} Password string
}
type User struct { ServerTS struct {
Nickname string `json:"nickname"` IP string
Name string `json:"name"` PortServer uint16
Password string `json:"password"` PortQuery uint16
} }
ServerWeb struct {
type ServerTS struct { Port uint16
IP string `json:"ip"` }
PortServer uint16 `json:"portServer"`
PortQuery uint16 `json:"portQuery"`
}
type ServerWeb struct {
Port uint16 `json:"port"`
} }
const FileName = "config.json" const FileName = "config.json"
func New() (*Config, error) { func New() (*Config, error) {
config := defaults() viper.SetConfigName("config")
viper.SetConfigFile("yaml")
configFile, err := os.Open(FileName) viper.AddConfigPath(".")
if err != nil { if err := viper.ReadInConfig(); err != nil {
if err := config.createFile(); err != nil { return nil, err
return nil, err
}
log.Println(config)
return &config, nil
}
defer configFile.Close()
jsonParser := json.NewDecoder(configFile)
jsonParser.Decode(&config)
config.overrideWithEnv()
config.overrideWithFlags()
return &config, nil
}
func (config Config) createFile() error {
configJSON, err := json.MarshalIndent(config, "", " ")
if err != nil {
return err
} }
return ioutil.WriteFile(FileName, configJSON, 0644) setDefaults()
var config Config
err := viper.Unmarshal(&config)
config.overrideWithEnvironmentVars()
return &config, err
} }
func defaults() Config { func setDefaults() {
return Config{ viper.SetDefault("User.Nickname", "serveradmin")
User: User{ viper.SetDefault("User.Name", "serveradmin")
Nickname: "serveradmin", viper.SetDefault("User.Password", "<changeMe>")
Name: "serveradmin", viper.SetDefault("ServerTS.IP", "127.0.0.1")
Password: "", viper.SetDefault("ServerTS.PortServer", "9987")
}, viper.SetDefault("ServerTS.PortQuery", "10011")
ServerTS: ServerTS{ viper.SetDefault("ServerWeb.Port", "80")
IP: "127.0.0.1",
PortServer: 9987,
PortQuery: 10011,
},
ServerWeb: ServerWeb{
Port: 80,
},
}
} }
func (config *Config) overrideWithEnv() { func (config *Config) overrideWithEnvironmentVars() {
nickname := os.Getenv("TS3_NICKNAME") if nickname := os.Getenv("TS3_NICKNAME"); nickname != "" {
username := os.Getenv("TS3_NAME")
password := os.Getenv("TS3_PW")
tsIP := os.Getenv("TS3_IP")
tsPort, _ := strconv.Atoi(os.Getenv("TS3_PORT"))
tsQuery, _ := strconv.Atoi(os.Getenv("TS3_QUERY"))
webPort, _ := strconv.Atoi(os.Getenv("WEB_PORT"))
if nickname != "" {
config.User.Nickname = nickname config.User.Nickname = nickname
} }
if username != "" { if username := os.Getenv("TS3_NAME"); username != "" {
config.User.Name = username config.User.Name = username
} }
if password != "" { if password := os.Getenv("TS3_PW"); password != "" {
config.User.Password = password config.User.Password = password
} }
if tsIP != "" { if tsIP := os.Getenv("TS3_IP"); tsIP != "" {
config.ServerTS.IP = tsIP config.ServerTS.IP = tsIP
} }
if tsPort <= 65535 && tsPort != 0 { if tsPort, err := strconv.Atoi(os.Getenv("TS3_PORT")); tsPort <= 65535 && tsPort >= 0 && err == nil {
config.ServerTS.PortServer = uint16(tsPort) config.ServerTS.PortServer = uint16(tsPort)
} }
if tsQuery <= 65535 && tsQuery != 0 { if tsQuery, err := strconv.Atoi(os.Getenv("TS3_QUERY")); tsQuery <= 65535 && tsQuery >= 0 && err == nil {
config.ServerTS.PortQuery = uint16(tsQuery) config.ServerTS.PortQuery = uint16(tsQuery)
} }
if webPort <= 65535 && webPort != 0 { if webPort, err := strconv.Atoi(os.Getenv("WEB_PORT")); webPort <= 65535 && webPort >= 0 && err == nil {
config.ServerWeb.Port = uint16(webPort) config.ServerWeb.Port = uint16(webPort)
} }
} }
func (config *Config) overrideWithFlags() {
nickname := flag.String("ts3_nickname", "", "TS3Query nickname")
username := flag.String("ts3_name", "", "TS3Query username")
password := flag.String("ts3_pw", "", "TS3Query user password")
tsIP := flag.String("ts3_ip", "", "TS3 IP address")
tsPort := flag.Uint64("ts3_port", 65536, "TS3 port")
tsQuery := flag.Uint64("ts3_query", 65536, "TS3 query port")
webPort := flag.Uint64("web_port", 65536, "Webserver port")
flag.Parse()
if *nickname != "" {
config.User.Nickname = *nickname
}
if *username != "" {
config.User.Name = *username
}
if *password != "" {
config.User.Password = *password
}
if *tsIP != "" {
config.ServerTS.IP = *tsIP
}
if *tsPort <= 65535 && *tsPort != 0 {
config.ServerTS.PortServer = uint16(*tsPort)
}
if *tsQuery <= 65535 && *tsQuery != 0 {
config.ServerTS.PortQuery = uint16(*tsQuery)
}
if *webPort <= 65535 && *webPort != 0 {
config.ServerWeb.Port = uint16(*webPort)
}
}