broodjeaap/go-watch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better handling of backup/test

Browse source
This commit is contained in:
BroodjeAap 2023-02-10 20:20:41 +00:00
parent 70cfa5418b
commit be40ee9c71
1 changed files with 10 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
web/web.go
View file

@ -1046,27 +1046,6 @@ func (web *Web) backupTest(c *gin.Context) {
c.Redirect(http.StatusSeeOther, web.urlPrefix+"backup/view") c.Redirect(http.StatusSeeOther, web.urlPrefix+"backup/view")
return return
} }
if !viper.IsSet("database.backup") {
c.HTML(http.StatusOK, "backupTest", gin.H{
"Error": "database.backup not set",
"urlPrefix": web.urlPrefix,
})
return
}
if !viper.IsSet("database.backup.schedule") {
c.HTML(http.StatusOK, "backupTest", gin.H{
"Error": "database.backup.schedule not set",
"urlPrefix": web.urlPrefix,
})
return
}
if !viper.IsSet("database.backup.path") {
c.HTML(http.StatusOK, "backupTest", gin.H{
"Error": "database.backup.path not set",
"urlPrefix": web.urlPrefix,
})
return
}
backupFullPath := "" backupFullPath := ""
var backup Backup var backup Backup
@ -1094,6 +1073,16 @@ func (web *Web) backupTest(c *gin.Context) {
func (web *Web) backupFromFile(importID int, backup *Backup) (string, error) { func (web *Web) backupFromFile(importID int, backup *Backup) (string, error) {
backupPath := viper.GetString("database.backup.path") backupPath := viper.GetString("database.backup.path")
if !viper.IsSet("database.backup") {
return "", errors.New("database.backup not set")
}
if !viper.IsSet("database.backup.schedule") {
return "", errors.New("database.backup.schedule not set")
}
if !viper.IsSet("database.backup.path") {
return "", errors.New("database.backup.path not set")
}
backupDir, err := filepath.Abs(filepath.Dir(backupPath)) backupDir, err := filepath.Abs(filepath.Dir(backupPath))
if err != nil { if err != nil {
return "", err return "", err