Skip to content

PostgreSQL backup tool with Point-In-Time-Recovery and restore verification

FIX (directories): Do not remove temp firectory on temp files clean

Rostislav Dugin59692cd41b4a
diff --git a/backend/internal/features/restores/usecases/postgresql/restore_backup_uc.go b/backend/internal/features/restores/usecases/postgresql/restore_backup_uc.go
index 4f935564..d745062c 100644
--- a/backend/internal/features/restores/usecases/postgresql/restore_backup_uc.go
+++ b/backend/internal/features/restores/usecases/postgresql/restore_backup_uc.go
@@ -20,6 +20,7 @@ import (
pgtypes "postgresus-backend/internal/features/databases/databases/postgresql"
"postgresus-backend/internal/features/restores/models"
"postgresus-backend/internal/features/storages"
+ files_utils "postgresus-backend/internal/util/files"
"postgresus-backend/internal/util/tools"
"github.com/google/uuid"
@@ -172,6 +173,13 @@ func (uc *RestorePostgresqlBackupUsecase) downloadBackupToTempFile(
backup *backups.Backup,
storage *storages.Storage,
) (string, func(), error) {
+ err := files_utils.EnsureDirectories([]string{
+ config.GetEnv().TempFolder,
+ })
+ if err != nil {
+ return "", nil, fmt.Errorf("failed to ensure directories: %w", err)
+ }
+
// Create temporary directory for backup data
tempDir, err := os.MkdirTemp(config.GetEnv().TempFolder, "restore_"+uuid.New().String())
if err != nil {
diff --git a/backend/internal/features/storages/models/local/model.go b/backend/internal/features/storages/models/local/model.go
index 7c87d8cc..c26659c8 100644
--- a/backend/internal/features/storages/models/local/model.go
+++ b/backend/internal/features/storages/models/local/model.go
@@ -7,6 +7,7 @@ import (
"os"
"path/filepath"
"postgresus-backend/internal/config"
+ files_utils "postgresus-backend/internal/util/files"
"github.com/google/uuid"
)
@@ -25,6 +26,13 @@ func (l *LocalStorage) TableName() string {
func (l *LocalStorage) SaveFile(logger *slog.Logger, fileID uuid.UUID, file io.Reader) error {
logger.Info("Starting to save file to local storage", "fileId", fileID.String())
+ err := files_utils.EnsureDirectories([]string{
+ config.GetEnv().TempFolder,
+ })
+ if err != nil {
+ return fmt.Errorf("failed to ensure directories: %w", err)
+ }
+
tempFilePath := filepath.Join(config.GetEnv().TempFolder, fileID.String())
logger.Debug("Creating temp file", "fileId", fileID.String(), "tempPath", tempFilePath)
diff --git a/backend/internal/util/files/cleaner.go b/backend/internal/util/files/cleaner.go
index 941ee010..88e6e5bc 100644
--- a/backend/internal/util/files/cleaner.go
+++ b/backend/internal/util/files/cleaner.go
@@ -1,7 +1,27 @@
package files_utils
-import "os"
+import (
+ "fmt"
+ "os"
+ "path/filepath"
+)
func CleanFolder(folder string) error {
- return os.RemoveAll(folder)
+ if _, err := os.Stat(folder); os.IsNotExist(err) {
+ return nil
+ }
+
+ entries, err := os.ReadDir(folder)
+ if err != nil {
+ return fmt.Errorf("failed to read directory %s: %w", folder, err)
+ }
+
+ for _, entry := range entries {
+ itemPath := filepath.Join(folder, entry.Name())
+ if err := os.RemoveAll(itemPath); err != nil {
+ return fmt.Errorf("failed to remove %s: %w", itemPath, err)
+ }
+ }
+
+ return nil
}
diff --git a/backend/internal/util/files/creator.go b/backend/internal/util/files/creator.go
index 63cc6560..77b65fa1 100644
--- a/backend/internal/util/files/creator.go
+++ b/backend/internal/util/files/creator.go
@@ -6,13 +6,15 @@ import (
)
func EnsureDirectories(directories []string) error {
- // Standard permissions for directories: owner
- // can read/write/execute, others can read/execute
const directoryPermissions = 0755
for _, directory := range directories {
- if err := os.MkdirAll(directory, directoryPermissions); err != nil {
- return fmt.Errorf("failed to create directory %s: %w", directory, err)
+ if _, err := os.Stat(directory); os.IsNotExist(err) {
+ if err := os.MkdirAll(directory, directoryPermissions); err != nil {
+ return fmt.Errorf("failed to create directory %s: %w", directory, err)
+ }
+ } else if err != nil {
+ return fmt.Errorf("failed to check directory %s: %w", directory, err)
}
}
diff --git a/frontend/src/widgets/main/MainScreenComponent.tsx b/frontend/src/widgets/main/MainScreenComponent.tsx
index e1f7bf82..563fb146 100644
--- a/frontend/src/widgets/main/MainScreenComponent.tsx
+++ b/frontend/src/widgets/main/MainScreenComponent.tsx
@@ -153,7 +153,7 @@ export const MainScreenComponent = () => {
{selectedTab === 'storages' && <StoragesComponent contentHeight={contentHeight} />}
{selectedTab === 'databases' && <DatabasesComponent contentHeight={contentHeight} />}
- <div className="absolute bottom-1 left-1 mb-[0px] text-sm text-gray-400">
+ <div className="absolute bottom-1 left-2 mb-[0px] text-sm text-gray-400">
v{APP_VERSION}
</div>
</div>