From 63faa60a9c0615ae7e12f1e627d9a875adaa6f11 Mon Sep 17 00:00:00 2001 From: netbenix Date: Tue, 23 Nov 2021 08:57:01 +0100 Subject: [PATCH] Little refactor --- {Tools => Compressor}/Compression.go | 2 +- SQL/MariaDBConnector.go | 3 +-- SQL/SQLInterface.go | 2 +- main.go | 5 +++-- 4 files changed, 6 insertions(+), 6 deletions(-) rename {Tools => Compressor}/Compression.go (99%) diff --git a/Tools/Compression.go b/Compressor/Compression.go similarity index 99% rename from Tools/Compression.go rename to Compressor/Compression.go index 0a9cd27..fd8f25b 100644 --- a/Tools/Compression.go +++ b/Compressor/Compression.go @@ -1,4 +1,4 @@ -package Tools +package Compressor import ( "archive/tar" diff --git a/SQL/MariaDBConnector.go b/SQL/MariaDBConnector.go index 905a4aa..bd4b0c4 100644 --- a/SQL/MariaDBConnector.go +++ b/SQL/MariaDBConnector.go @@ -18,8 +18,7 @@ type MariaDBConnector struct { DbPassword string } -func GetMariaDBInstance() MariaDBConnector{ - config := Tools.GetConfig() +func GetMariaDBInstance(config Tools.Config) MariaDBConnector { var mariadb MariaDBConnector mariadb.Address = config.SQLConfig.SqlAddress diff --git a/SQL/SQLInterface.go b/SQL/SQLInterface.go index a53d111..b597a51 100644 --- a/SQL/SQLInterface.go +++ b/SQL/SQLInterface.go @@ -28,7 +28,7 @@ func GetSQLInstance() SQLService{ config := Tools.GetConfig() switch config.SQLConfig.SqlType { - case "mariadb": {return GetMariaDBInstance()} + case "mariadb": {return GetMariaDBInstance(config)} } return nil diff --git a/main.go b/main.go index a675089..28e50f9 100644 --- a/main.go +++ b/main.go @@ -3,6 +3,7 @@ package main import ( "github.com/google/uuid" "os" + "scabiosa/Compressor" "scabiosa/Logging" "scabiosa/SQL" "scabiosa/StorageTypes" @@ -13,13 +14,13 @@ import ( func main(){ config := Tools.GetConfig() - SQL.CreateDefaultTables(SQL.GetMariaDBInstance()) + SQL.CreateDefaultTables(SQL.GetSQLInstance()) for _, backupItem := range config.FolderToBackup{ storage := StorageTypes.CheckStorageType(backupItem.StorageType) 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) if !backupItem.CreateLocalBackup {