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

Little refactor

Browse source
This commit is contained in:
netbenix 2021-11-23 08:57:01 +01:00
parent a23791daa5
commit 63faa60a9c
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Tools/Compression.go → Compressor/Compression.go
View file

@ -1,4 +1,4 @@
package Tools package Compressor
import ( import (
"archive/tar" "archive/tar"

3
SQL/MariaDBConnector.go
View file

@ -18,8 +18,7 @@ type MariaDBConnector struct {
DbPassword string DbPassword string
} }
func GetMariaDBInstance() MariaDBConnector{ func GetMariaDBInstance(config Tools.Config) MariaDBConnector {
config := Tools.GetConfig()
var mariadb MariaDBConnector var mariadb MariaDBConnector
mariadb.Address = config.SQLConfig.SqlAddress mariadb.Address = config.SQLConfig.SqlAddress

2
SQL/SQLInterface.go
View file

@ -28,7 +28,7 @@ func GetSQLInstance() SQLService{
config := Tools.GetConfig() config := Tools.GetConfig()
switch config.SQLConfig.SqlType { switch config.SQLConfig.SqlType {
case "mariadb": {return GetMariaDBInstance()} case "mariadb": {return GetMariaDBInstance(config)}
} }
return nil return nil

5
main.go
View file

@ -3,6 +3,7 @@ package main
import ( import (
"github.com/google/uuid" "github.com/google/uuid"
"os" "os"
"scabiosa/Compressor"
"scabiosa/Logging" "scabiosa/Logging"
"scabiosa/SQL" "scabiosa/SQL"
"scabiosa/StorageTypes" "scabiosa/StorageTypes"
@ -13,13 +14,13 @@ import (
func main(){ func main(){
config := Tools.GetConfig() config := Tools.GetConfig()
SQL.CreateDefaultTables(SQL.GetMariaDBInstance()) SQL.CreateDefaultTables(SQL.GetSQLInstance())
for _, backupItem := range config.FolderToBackup{ for _, backupItem := range config.FolderToBackup{
storage := StorageTypes.CheckStorageType(backupItem.StorageType) storage := StorageTypes.CheckStorageType(backupItem.StorageType)
destPath := checkTmpPath(config, backupItem.CreateLocalBackup) destPath := checkTmpPath(config, backupItem.CreateLocalBackup)
bakFile := Tools.CreateBakFile(backupItem.BackupName + getTimeSuffix(), backupItem.FolderPath, destPath) bakFile := Compressor.CreateBakFile(backupItem.BackupName + getTimeSuffix(), backupItem.FolderPath, destPath)
StorageTypes.UploadFile(storage, destPath + string(os.PathSeparator) + bakFile) StorageTypes.UploadFile(storage, destPath + string(os.PathSeparator) + bakFile)
if !backupItem.CreateLocalBackup { if !backupItem.CreateLocalBackup {