persist app title + code refactoring
This commit is contained in:
104
server/configurator/configurator.go
Normal file
104
server/configurator/configurator.go
Normal file
@@ -0,0 +1,104 @@
|
||||
package configurator
|
||||
|
||||
import (
|
||||
"log/slog"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"sync"
|
||||
|
||||
"github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config"
|
||||
"gopkg.in/yaml.v3"
|
||||
)
|
||||
|
||||
// A singleton holding configuration of the frontend component
|
||||
// with optional persistence on a file.
|
||||
type AppConfig struct {
|
||||
Title string `yaml:"title" json:"title"`
|
||||
BaseURL string `yaml:"base_url" json:"base_url"`
|
||||
Language string `yaml:"language" json:"language"`
|
||||
RPCPollingTime int `yaml:"rpc_polling_time" json:"rpc_polling_time"`
|
||||
}
|
||||
|
||||
type Configurator struct {
|
||||
mu sync.RWMutex
|
||||
Config AppConfig
|
||||
}
|
||||
|
||||
var (
|
||||
instance *Configurator
|
||||
instanceOnce sync.Once
|
||||
)
|
||||
|
||||
func Instance() *Configurator {
|
||||
instanceOnce.Do(func() {
|
||||
if instance == nil {
|
||||
instance = &Configurator{}
|
||||
|
||||
// TODO: move out of initialization
|
||||
err := instance.Load()
|
||||
if err != nil {
|
||||
slog.Error("failed initializating configurator", slog.Any("err", err))
|
||||
}
|
||||
}
|
||||
})
|
||||
return instance
|
||||
}
|
||||
|
||||
func (c *Configurator) Load() error {
|
||||
fd, err := getConfigurationFile()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer fd.Close()
|
||||
|
||||
if err := yaml.NewDecoder(fd).Decode(&c.Config); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *Configurator) Persist() error {
|
||||
fd, err := getConfigurationFile()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer fd.Close()
|
||||
|
||||
if err := yaml.NewEncoder(fd).Encode(c.Config); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *Configurator) setAppConfig(ac *AppConfig) {
|
||||
c.mu.RLock()
|
||||
defer c.mu.RUnlock()
|
||||
|
||||
// TODO: better validaitons
|
||||
if ac.BaseURL != "" {
|
||||
c.Config.BaseURL = ac.BaseURL
|
||||
}
|
||||
if ac.Language != "" {
|
||||
c.Config.Language = ac.Language
|
||||
}
|
||||
if ac.Title != "" {
|
||||
c.Config.Title = ac.Title
|
||||
}
|
||||
if ac.RPCPollingTime >= 250 && ac.RPCPollingTime <= 2000 {
|
||||
c.Config.RPCPollingTime = ac.RPCPollingTime
|
||||
}
|
||||
}
|
||||
|
||||
func getConfigurationFile() (*os.File, error) {
|
||||
fd, err := os.OpenFile(
|
||||
filepath.Join(config.Instance().Dir(), "web_config.yml"),
|
||||
os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return fd, nil
|
||||
}
|
||||
103
server/configurator/handlers.go
Normal file
103
server/configurator/handlers.go
Normal file
@@ -0,0 +1,103 @@
|
||||
package configurator
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
|
||||
"github.com/go-chi/chi/v5"
|
||||
)
|
||||
|
||||
// App configurator REST handlers
|
||||
|
||||
func GetConfig(w http.ResponseWriter, r *http.Request) {
|
||||
defer r.Body.Close()
|
||||
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
|
||||
if err := json.NewEncoder(w).Encode(Instance().Config); err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
func SetConfig(w http.ResponseWriter, r *http.Request) {
|
||||
defer r.Body.Close()
|
||||
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
|
||||
var req AppConfig
|
||||
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
Instance().setAppConfig(&req)
|
||||
|
||||
if err := Instance().Persist(); err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
json.NewEncoder(w).Encode("ok")
|
||||
}
|
||||
|
||||
func setAppTitle(w http.ResponseWriter, r *http.Request) {
|
||||
defer r.Body.Close()
|
||||
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
|
||||
var req string
|
||||
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
editField(w, func(c *AppConfig) {
|
||||
if req != "" {
|
||||
c.Title = req
|
||||
}
|
||||
})
|
||||
|
||||
json.NewEncoder(w).Encode("ok")
|
||||
}
|
||||
|
||||
func setBaseURL(w http.ResponseWriter, r *http.Request) {
|
||||
defer r.Body.Close()
|
||||
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
|
||||
var req string
|
||||
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
editField(w, func(c *AppConfig) {
|
||||
if req != "" {
|
||||
c.BaseURL = req
|
||||
}
|
||||
})
|
||||
|
||||
json.NewEncoder(w).Encode("ok")
|
||||
}
|
||||
|
||||
func editField(w http.ResponseWriter, editFunc func(c *AppConfig)) {
|
||||
editFunc(&Instance().Config)
|
||||
|
||||
if err := Instance().Persist(); err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
func ApplyRouter() func(r chi.Router) {
|
||||
return func(r chi.Router) {
|
||||
r.Get("/", GetConfig)
|
||||
r.Post("/", SetConfig)
|
||||
r.Patch("/title", setAppTitle)
|
||||
r.Patch("/baseURL", setBaseURL)
|
||||
}
|
||||
}
|
||||
@@ -22,6 +22,7 @@ import (
|
||||
"github.com/marcopiovanello/yt-dlp-web-ui/v3/server/archive"
|
||||
"github.com/marcopiovanello/yt-dlp-web-ui/v3/server/archiver"
|
||||
"github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config"
|
||||
"github.com/marcopiovanello/yt-dlp-web-ui/v3/server/configurator"
|
||||
"github.com/marcopiovanello/yt-dlp-web-ui/v3/server/dbutil"
|
||||
"github.com/marcopiovanello/yt-dlp-web-ui/v3/server/filebrowser"
|
||||
"github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal"
|
||||
@@ -235,6 +236,9 @@ func newServer(c serverConfig) *http.Server {
|
||||
// Subscriptions
|
||||
r.Route("/subscriptions", subscription.Container(c.db, cronTaskRunner).ApplyRouter())
|
||||
|
||||
// Frontend config store
|
||||
r.Route("/webconfig", configurator.ApplyRouter())
|
||||
|
||||
return &http.Server{Handler: r}
|
||||
}
|
||||
|
||||
|
||||
@@ -48,10 +48,7 @@ func (h *RestHandler) Delete() http.HandlerFunc {
|
||||
return
|
||||
}
|
||||
|
||||
if err := json.NewEncoder(w).Encode("ok"); err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
w.WriteHeader(http.StatusOK)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user