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

added urlProfix to some responses that were missing it

Browse source
This commit is contained in:
BroodjeAap 2023-02-10 16:07:43 +00:00
parent c20afe3425
commit 70cfa5418b
1 changed files with 70 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
web/web.go
View file

@ -908,11 +908,17 @@ func (web *Web) backupView(c *gin.Context) {
// backupCreate (/backup/create) creates a new backup // backupCreate (/backup/create) creates a new backup
func (web *Web) backupCreate(c *gin.Context) { func (web *Web) backupCreate(c *gin.Context) {
if !viper.IsSet("database.backup") { if !viper.IsSet("database.backup") {
c.HTML(http.StatusBadRequest, "backupView", gin.H{"Error": "database.backup not set"}) c.HTML(http.StatusBadRequest, "backupView", gin.H{
"Error": "database.backup not set",
"urlPrefix": web.urlPrefix,
})
return return
} }
if !viper.IsSet("database.backup.path") { if !viper.IsSet("database.backup.path") {
c.HTML(http.StatusBadRequest, "backupView", gin.H{"Error": "database.backup.path not set"}) c.HTML(http.StatusBadRequest, "backupView", gin.H{
"Error": "database.backup.path not set",
"urlPrefix": web.urlPrefix,
})
return return
} }
backupDir := filepath.Dir(viper.GetString("database.backup.path")) backupDir := filepath.Dir(viper.GetString("database.backup.path"))
@ -922,7 +928,10 @@ func (web *Web) backupCreate(c *gin.Context) {
backupPath := filepath.Join(backupDir, backupName) backupPath := filepath.Join(backupDir, backupName)
err := web.createBackup(backupPath) err := web.createBackup(backupPath)
if err != nil { if err != nil {
c.HTML(http.StatusBadRequest, "backupView", gin.H{"Error": err}) c.HTML(http.StatusBadRequest, "backupView", gin.H{
"Error": err,
"urlPrefix": web.urlPrefix,
})
return return
} }
c.Redirect(http.StatusSeeOther, web.urlPrefix+"backup/view") c.Redirect(http.StatusSeeOther, web.urlPrefix+"backup/view")
@ -1251,15 +1260,23 @@ func (web *Web) backupDelete(c *gin.Context) {
} }
if !viper.IsSet("database.backup") { if !viper.IsSet("database.backup") {
c.HTML(http.StatusOK, "backupView", gin.H{"Error": "database.backup not set"}) c.HTML(http.StatusOK, "backupView", gin.H{
"Error": "database.backup not set",
"urlPrefix": web.urlPrefix,
})
return return
} }
if !viper.IsSet("database.backup.schedule") { if !viper.IsSet("database.backup.schedule") {
c.HTML(http.StatusOK, "backupView", gin.H{"Error": "database.backup.schedule not set"}) c.HTML(http.StatusOK, "backupView", gin.H{
"Error": "database.backup.schedule not set",
"urlPrefix": web.urlPrefix,
})
return return
} }
if !viper.IsSet("database.backup.path") { if !viper.IsSet("database.backup.path") {
c.HTML(http.StatusOK, "backupView", gin.H{"Error": "database.backup.path not set"}) c.HTML(http.StatusOK, "backupView", gin.H{
"Error": "database.backup.path not set",
"urlPrefix": web.urlPrefix})
return return
} }
@ -1267,17 +1284,25 @@ func (web *Web) backupDelete(c *gin.Context) {
backupDir, err := filepath.Abs(filepath.Dir(backupPath)) backupDir, err := filepath.Abs(filepath.Dir(backupPath))
if err != nil { if err != nil {
c.HTML(http.StatusOK, "backupView", gin.H{"Error": err}) c.HTML(http.StatusOK, "backupView", gin.H{
"Error": err,
"urlPrefix": web.urlPrefix,
})
return return
} }
filesInBackupDir, err := ioutil.ReadDir(backupDir) filesInBackupDir, err := ioutil.ReadDir(backupDir)
if err != nil { if err != nil {
c.HTML(http.StatusOK, "backupView", gin.H{"Error": err}) c.HTML(http.StatusOK, "backupView", gin.H{
"Error": err,
"urlPrefix": web.urlPrefix,
})
return return
} }
if importID >= len(filesInBackupDir) { if importID >= len(filesInBackupDir) {
c.HTML(http.StatusOK, "backupView", gin.H{"Error": err}) c.HTML(http.StatusOK, "backupView", gin.H{"Error": "Wut you doin?",
"urlPrefix": web.urlPrefix,
})
return return
} }
@ -1286,7 +1311,10 @@ func (web *Web) backupDelete(c *gin.Context) {
err = os.Remove(backupFullPath) err = os.Remove(backupFullPath)
if err != nil { if err != nil {
c.HTML(http.StatusOK, "backupView", gin.H{"Error": err}) c.HTML(http.StatusOK, "backupView", gin.H{
"Error": err,
"urlPrefix": web.urlPrefix,
})
return return
} }
c.Redirect(http.StatusSeeOther, web.urlPrefix+"backup/view") c.Redirect(http.StatusSeeOther, web.urlPrefix+"backup/view")
@ -1305,15 +1333,24 @@ func (web *Web) backupDownload(c *gin.Context) {
} }
if !viper.IsSet("database.backup") { if !viper.IsSet("database.backup") {
c.HTML(http.StatusOK, "backupView", gin.H{"Error": "database.backup not set"}) c.HTML(http.StatusOK, "backupView", gin.H{
"Error": "database.backup not set",
"urlPrefix": web.urlPrefix,
})
return return
} }
if !viper.IsSet("database.backup.schedule") { if !viper.IsSet("database.backup.schedule") {
c.HTML(http.StatusOK, "backupView", gin.H{"Error": "database.backup.schedule not set"}) c.HTML(http.StatusOK, "backupView", gin.H{
"Error": "database.backup.schedule not set",
"urlPrefix": web.urlPrefix,
})
return return
} }
if !viper.IsSet("database.backup.path") { if !viper.IsSet("database.backup.path") {
c.HTML(http.StatusOK, "backupView", gin.H{"Error": "database.backup.path not set"}) c.HTML(http.StatusOK, "backupView", gin.H{
"Error": "database.backup.path not set",
"urlPrefix": web.urlPrefix,
})
return return
} }
@ -1321,17 +1358,26 @@ func (web *Web) backupDownload(c *gin.Context) {
backupDir, err := filepath.Abs(filepath.Dir(backupPath)) backupDir, err := filepath.Abs(filepath.Dir(backupPath))
if err != nil { if err != nil {
c.HTML(http.StatusOK, "backupView", gin.H{"Error": err}) c.HTML(http.StatusOK, "backupView", gin.H{
"Error": err,
"urlPrefix": web.urlPrefix,
})
return return
} }
filesInBackupDir, err := ioutil.ReadDir(backupDir) filesInBackupDir, err := ioutil.ReadDir(backupDir)
if err != nil { if err != nil {
c.HTML(http.StatusOK, "backupView", gin.H{"Error": err}) c.HTML(http.StatusOK, "backupView", gin.H{
"Error": err,
"urlPrefix": web.urlPrefix,
})
return return
} }
if importID >= len(filesInBackupDir) { if importID >= len(filesInBackupDir) {
c.HTML(http.StatusOK, "backupView", gin.H{"Error": err}) c.HTML(http.StatusOK, "backupView", gin.H{
"Error": err,
"urlPrefix": web.urlPrefix,
})
return return
} }
@ -1340,14 +1386,20 @@ func (web *Web) backupDownload(c *gin.Context) {
backupFile, err := os.Open(backupFullPath) backupFile, err := os.Open(backupFullPath)
if err != nil { if err != nil {
c.HTML(http.StatusOK, "backupView", gin.H{"Error": err}) c.HTML(http.StatusOK, "backupView", gin.H{
"Error": err,
"urlPrefix": web.urlPrefix,
})
return return
} }
defer backupFile.Close() defer backupFile.Close()
rawBytes, err := io.ReadAll(backupFile) rawBytes, err := io.ReadAll(backupFile)
if err != nil { if err != nil {
c.HTML(http.StatusOK, "backupView", gin.H{"Error": err}) c.HTML(http.StatusOK, "backupView", gin.H{
"Error": err,
"urlPrefix": web.urlPrefix,
})
return return
} }