liliesh/scabiosa
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

style(Naming): Renamed Command funcs correctly

Browse source
This commit is contained in:
netbenix 2022-02-05 15:40:12 +01:00
parent 0c039d08f9
commit 9d51a9e5e6
3 changed files with 44 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Commands/GenerateDefaultConfigs.go
View file

@ -8,7 +8,7 @@ import (
"scabiosa/Tools" "scabiosa/Tools"
) )
func GenerateNewConfigs() *cli.Command { func GenerateNewConfigsCommand() *cli.Command {
logger := Logging.Logger("generate-configs") logger := Logging.Logger("generate-configs")
return &cli.Command{ return &cli.Command{

79
Commands/StartBackupProc.go
View file

@ -12,7 +12,7 @@ import (
"time" "time"
) )
func StartBackupProc() *cli.Command { func StartBackupProcCommand() *cli.Command {
logger := Logging.Logger("backup") logger := Logging.Logger("backup")
return &cli.Command{ return &cli.Command{
@ -21,43 +21,7 @@ func StartBackupProc() *cli.Command {
Description: "Compresses and uploads/stores the backups", Description: "Compresses and uploads/stores the backups",
HelpName: "backup", HelpName: "backup",
Action: func(c *cli.Context) error { Action: func(c *cli.Context) error {
Tools.CheckIfConfigExists() StartBackupProc()
config := Tools.GetConfig()
SQL.CreateDefaultTables(SQL.GetSQLInstance())
for _, backupItem := range config.FolderToBackup {
var storage StorageTypes.Storage
var destPath string
if backupItem.RemoteStorageType != "none" {
storage = StorageTypes.CheckStorageType(backupItem.RemoteStorageType)
destPath = checkTmpPath(backupItem.CreateLocalBackup, backupItem.LocalTargetPath)
} else {
destPath = backupItem.LocalTargetPath
}
bakFile := Compressor.CreateBakFile(backupItem.BackupName+getTimeSuffix(), backupItem.FolderPath, destPath, backupItem.BackupName)
if backupItem.RemoteStorageType != "none" {
StorageTypes.UploadFile(storage, bakFile, backupItem.BackupName, backupItem.RemoteTargetPath)
}
if !backupItem.CreateLocalBackup && backupItem.RemoteStorageType != "none" {
backupItem.LocalTargetPath = "NONE"
_ = os.Remove(bakFile)
SQL.NewLogEntry(SQL.GetSQLInstance(), uuid.New(), SQL.LogInfo, backupItem.BackupName, SQL.SQLStage_DeleteTmp, SQL.REMOTE_NONE, "Deleted tmp file", time.Now())
}
if backupItem.RemoteStorageType == "none" {
backupItem.CreateLocalBackup = true
backupItem.RemoteTargetPath = "NONE"
}
SQL.NewBackupEntry(SQL.GetSQLInstance(), backupItem.BackupName, time.Now(), backupItem.CreateLocalBackup, backupItem.FolderPath, StorageTypes.CheckRemoteStorageType(backupItem.RemoteStorageType), backupItem.RemoteTargetPath, backupItem.LocalTargetPath)
}
return nil return nil
}, },
OnUsageError: func(cc *cli.Context, err error, isSubcommand bool) error { OnUsageError: func(cc *cli.Context, err error, isSubcommand bool) error {
@ -69,6 +33,45 @@ func StartBackupProc() *cli.Command {
} }
} }
func StartBackupProc() {
Tools.CheckIfConfigExists()
config := Tools.GetConfig()
SQL.CreateDefaultTables(SQL.GetSQLInstance())
for _, backupItem := range config.FolderToBackup {
var storage StorageTypes.Storage
var destPath string
if backupItem.RemoteStorageType != "none" {
storage = StorageTypes.CheckStorageType(backupItem.RemoteStorageType)
destPath = checkTmpPath(backupItem.CreateLocalBackup, backupItem.LocalTargetPath)
} else {
destPath = backupItem.LocalTargetPath
}
bakFile := Compressor.CreateBakFile(backupItem.BackupName+getTimeSuffix(), backupItem.FolderPath, destPath, backupItem.BackupName)
if backupItem.RemoteStorageType != "none" {
StorageTypes.UploadFile(storage, bakFile, backupItem.BackupName, backupItem.RemoteTargetPath)
}
if !backupItem.CreateLocalBackup && backupItem.RemoteStorageType != "none" {
backupItem.LocalTargetPath = "NONE"
_ = os.Remove(bakFile)
SQL.NewLogEntry(SQL.GetSQLInstance(), uuid.New(), SQL.LogInfo, backupItem.BackupName, SQL.SQLStage_DeleteTmp, SQL.REMOTE_NONE, "Deleted tmp file", time.Now())
}
if backupItem.RemoteStorageType == "none" {
backupItem.CreateLocalBackup = true
backupItem.RemoteTargetPath = "NONE"
}
SQL.NewBackupEntry(SQL.GetSQLInstance(), backupItem.BackupName, time.Now(), backupItem.CreateLocalBackup, backupItem.FolderPath, StorageTypes.CheckRemoteStorageType(backupItem.RemoteStorageType), backupItem.RemoteTargetPath, backupItem.LocalTargetPath)
}
}
func getTimeSuffix() string { func getTimeSuffix() string {
currTime := time.Now() currTime := time.Now()

4
main.go
View file

@ -21,8 +21,8 @@ func main() {
}, },
Copyright: "(c) 2021-2022 netbenix", Copyright: "(c) 2021-2022 netbenix",
Commands: []*cli.Command{ Commands: []*cli.Command{
Commands.StartBackupProc(), Commands.StartBackupProcCommand(),
Commands.GenerateNewConfigs(), Commands.GenerateNewConfigsCommand(),
}, },
} }