doesnm/quickshare
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(server): init site settings from config

Browse source
This commit is contained in:
hexxa 2021-10-09 17:42:04 +08:00 • committed by Hexxa
parent 8cce087c1f
commit 961bafa66c
6 changed files with 100 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

9
configs/dev.yml
View file

@ -37,3 +37,12 @@ workers:
queueSize: 1024
sleepCyc: 1 # in second
workerCount: 2
site:
clientCfg:
siteName: "Quickshare"
siteDesc: "quick and simple file sharing"
bg:
url: "/static/img/textured_paper.png"
repeat: "repeat"
position: "fixed"
align: "center"

9
configs/docker.yml
View file

@ -37,3 +37,12 @@ workers:
queueSize: 1024
sleepCyc: 1 # in second
workerCount: 2
site:
clientCfg:
siteName: "Quickshare"
siteDesc: "quick and simple file sharing"
bg:
url: "/static/img/textured_paper.png"
repeat: "repeat"
position: "fixed"
align: "center"

9
configs/lan.yml
View file

@ -33,3 +33,12 @@ workers:
queueSize: 1024
sleepCyc: 1 # in second
workerCount: 2
site:
clientCfg:
siteName: "Quickshare"
siteDesc: "quick and simple file sharing"
bg:
url: "/static/img/textured_paper.png"
repeat: "repeat"
position: "fixed"
align: "center"

63
src/db/sitestore/site_store.go
View file

@ -53,36 +53,45 @@ type SiteStore struct {
}
func NewSiteStore(store kvstore.IKVStore) (*SiteStore, error) {
_, ok := store.GetStringIn(InitNs, InitTimeKey)
if !ok {
var err error
for _, nsName := range []string{
InitNs,
SiteNs,
} {
if err = store.AddNamespace(nsName); err != nil {
return nil, err
}
}
}
err := store.SetStringIn(InitNs, InitTimeKey, fmt.Sprintf("%d", time.Now().Unix()))
if err != nil {
return nil, err
}
return &SiteStore{
store: store,
mtx: &sync.RWMutex{},
}, nil
}
func (fi *SiteStore) SetClientCfg(cfg *ClientConfig) error {
fi.mtx.Lock()
defer fi.mtx.Unlock()
func (st *SiteStore) Init(cfg *SiteConfig) error {
_, ok := st.store.GetStringIn(InitNs, InitTimeKey)
if !ok {
var err error
for _, nsName := range []string{
InitNs,
SiteNs,
} {
if err = st.store.AddNamespace(nsName); err != nil {
return err
}
}
// TODO: replace following with setConfig
err = st.SetClientCfg(cfg.ClientCfg)
if err != nil {
return err
}
err = st.store.SetStringIn(InitNs, InitTimeKey, fmt.Sprintf("%d", time.Now().Unix()))
if err != nil {
return err
}
}
return nil
}
func (st *SiteStore) SetClientCfg(cfg *ClientConfig) error {
st.mtx.Lock()
defer st.mtx.Unlock()
siteCfg := &SiteConfig{}
cfgStr, ok := fi.store.GetStringIn(SiteNs, SiteCfgKey)
cfgStr, ok := st.store.GetStringIn(SiteNs, SiteCfgKey)
if ok {
err := json.Unmarshal([]byte(cfgStr), siteCfg)
if err != nil {
@ -95,14 +104,14 @@ func (fi *SiteStore) SetClientCfg(cfg *ClientConfig) error {
if err != nil {
return err
}
return fi.store.SetStringIn(SiteNs, SiteCfgKey, string(cfgBytes))
return st.store.SetStringIn(SiteNs, SiteCfgKey, string(cfgBytes))
}
func (fi *SiteStore) GetCfg() (*SiteConfig, error) {
fi.mtx.RLock()
defer fi.mtx.RUnlock()
func (st *SiteStore) GetCfg() (*SiteConfig, error) {
st.mtx.RLock()
defer st.mtx.RUnlock()
cfgStr, ok := fi.store.GetStringIn(SiteNs, SiteCfgKey)
cfgStr, ok := st.store.GetStringIn(SiteNs, SiteCfgKey)
if !ok {
return nil, ErrNotFound
}

14
src/server/config.go
View file

@ -3,6 +3,7 @@ package server
import (
"encoding/json"
"github.com/ihexxa/quickshare/src/db/sitestore"
"github.com/ihexxa/quickshare/src/db/userstore"
)
@ -58,6 +59,7 @@ type Config struct {
Server *ServerCfg `json:"server" yaml:"server"`
Users *UsersCfg `json:"users" yaml:"users"`
Workers *WorkerPoolCfg `json:"workers" yaml:"workers"`
Site *sitestore.SiteConfig `json:"site" yaml:"site"`
}
func NewConfig() *Config {
@ -106,6 +108,18 @@ func DefaultConfig() (string, error) {
SleepCyc: 1,
WorkerCount: 2,
},
Site: &sitestore.SiteConfig{
ClientCfg: &sitestore.ClientConfig{
SiteName: "Quickshare",
SiteDesc: "quick and simple file sharing",
Bg: &sitestore.BgConfig{
Url: "/static/img/textured_paper.png",
Repeat: "repeat",
Position: "fixed",
Align: "center",
},
},
},
}
cfgBytes, err := json.Marshal(defaultCfg)

16
src/server/server.go
View file

@ -126,6 +126,22 @@ func initDeps(cfg gocfg.ICfg) *depidx.Deps {
panic(fmt.Sprintf("fail to init file info store: %s", err))
}
siteStore, err := sitestore.NewSiteStore(kv)
if err != nil {
panic(fmt.Sprintf("fail to new site config store: %s", err))
}
err = siteStore.Init(&sitestore.SiteConfig{
ClientCfg: &sitestore.ClientConfig{
SiteName: cfg.StringOr("Site.ClientCfg.SiteName", "Quickshare"),
SiteDesc: cfg.StringOr("Site.ClientCfg.SiteDesc", "quick and simple file sharing"),
Bg: &sitestore.BgConfig{
Url: cfg.StringOr("Site.ClientCfg.Bg.Url", "/static/img/textured_paper.png"),
Repeat: cfg.StringOr("Site.ClientCfg.Bg.Repeat", "repeat"),
Position: cfg.StringOr("Site.ClientCfg.Bg.Position", "fixed"),
Align: cfg.StringOr("Site.ClientCfg.Bg.Align", "center"),
},
},
})
if err != nil {
panic(fmt.Sprintf("fail to init site config store: %s", err))
}