From 02c8ed066a8524523a813d14538350d21d65c948 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 29 Nov 2021 18:35:07 +0000 Subject: [PATCH] --- server/AyaNova/util/FileUtil.cs | 83 +++++++++++++++++---------------- 1 file changed, 42 insertions(+), 41 deletions(-) diff --git a/server/AyaNova/util/FileUtil.cs b/server/AyaNova/util/FileUtil.cs index edf63f7a..f87f28a5 100644 --- a/server/AyaNova/util/FileUtil.cs +++ b/server/AyaNova/util/FileUtil.cs @@ -151,21 +151,21 @@ namespace AyaNova.Util /// internal static string GetFullPathForBackupFile(string fileName) { - return Path.Combine(BackupFilesFolder, fileName); + return Path.Combine(ServerBootConfig.AYANOVA_FOLDER_BACKUP_FILES, fileName); } - /// - /// Get backup folder - /// - /// - internal static string BackupFilesFolder - { - get - { - return ServerBootConfig.AYANOVA_FOLDER_BACKUP_FILES; - } - } + // /// + // /// Get backup folder + // /// + // /// + // internal static string BackupFilesFolder + // { + // get + // { + // return ServerBootConfig.AYANOVA_FOLDER_BACKUP_FILES; + // } + // } public class BackupFileInfo @@ -197,7 +197,7 @@ namespace AyaNova.Util BackupStatus statusReport = new BackupStatus(); try { - statusReport.AvailableFreeSpace = GetBytesReadable(new System.IO.DriveInfo(Path.GetPathRoot(BackupFilesFolder)).AvailableFreeSpace); + statusReport.AvailableFreeSpace = GetBytesReadable(new System.IO.DriveInfo(Path.GetPathRoot(ServerBootConfig.AYANOVA_FOLDER_BACKUP_FILES)).AvailableFreeSpace); } catch (Exception ex) { @@ -206,7 +206,7 @@ namespace AyaNova.Util log.LogError(ex, "FileUtil::BackupStatusReport error getting available space"); } - var backupFiles = Directory.EnumerateFiles(BackupFilesFolder, "*"); + var backupFiles = Directory.EnumerateFiles(ServerBootConfig.AYANOVA_FOLDER_BACKUP_FILES, "*"); foreach (string file in backupFiles.OrderByDescending(z => z)) { @@ -246,8 +246,7 @@ namespace AyaNova.Util internal static DateTime MostRecentAutomatedBackupFileDate() { DateTime LastBackup = DateTime.MinValue; - var BackupPath = BackupFilesFolder; - foreach (string file in Directory.EnumerateFiles(BackupFilesFolder, "db-*.backup")) + foreach (string file in Directory.EnumerateFiles(ServerBootConfig.AYANOVA_FOLDER_BACKUP_FILES, "db-*.backup")) { var ThisFileTime = File.GetCreationTimeUtc(file); if (ThisFileTime > LastBackup) @@ -299,7 +298,7 @@ namespace AyaNova.Util name = Path.GetFileName(name);//ensure no directory shenanigans, only a file name is allowed //remove the file completely - var DeleteFilePath = Path.Combine(BackupFilesFolder, name); + var DeleteFilePath = Path.Combine(ServerBootConfig.AYANOVA_FOLDER_BACKUP_FILES, name); if (File.Exists(DeleteFilePath)) { //delete the temp file, it's already stored @@ -319,7 +318,7 @@ namespace AyaNova.Util if (keepCount < 1) keepCount = 1; //Database backups - var BackupFileList = Directory.EnumerateFiles(BackupFilesFolder, "db-*.backup"); + var BackupFileList = Directory.EnumerateFiles(ServerBootConfig.AYANOVA_FOLDER_BACKUP_FILES, "db-*.backup"); if (BackupFileList.Count() > keepCount) { //sort, skip newest x (keepcount) delete the rest @@ -332,7 +331,7 @@ namespace AyaNova.Util } //Attachment backups - BackupFileList = Directory.EnumerateFiles(BackupFilesFolder, "at-*.zip"); + BackupFileList = Directory.EnumerateFiles(ServerBootConfig.AYANOVA_FOLDER_BACKUP_FILES, "at-*.zip"); if (BackupFileList.Count() > keepCount) { //sort, skip newest x (keepcount) delete the rest @@ -348,8 +347,10 @@ namespace AyaNova.Util internal static long BackupFilesDriveAvailableSpace() { - - return new System.IO.DriveInfo(Path.GetPathRoot(BackupFilesFolder)).AvailableFreeSpace; + Console.WriteLine("b fileutil:backupfilesdriveavailablespace, backupfilesfolder:", ServerBootConfig.AYANOVA_FOLDER_BACKUP_FILES); + Console.WriteLine("fileutil:backupfilesdriveavailablespace, backupfilesfolder FULLPATH:", Path.GetFullPath(ServerBootConfig.AYANOVA_FOLDER_BACKUP_FILES)); + Console.WriteLine("fileutil:backupfilesdriveavailablespace, backupfilesfolder PATHROOT:", Path.GetPathRoot(ServerBootConfig.AYANOVA_FOLDER_BACKUP_FILES)); + return new System.IO.DriveInfo(Path.GetPathRoot(ServerBootConfig.AYANOVA_FOLDER_BACKUP_FILES)).AvailableFreeSpace; } @@ -393,17 +394,17 @@ namespace AyaNova.Util #region Attachment file handling - /// - /// Get user folder - /// - /// - internal static string AttachmentFilesFolder - { - get - { - return ServerBootConfig.AYANOVA_FOLDER_USER_FILES; - } - } + // /// + // /// Get user folder + // /// + // /// + // internal static string AttachmentFilesFolder + // { + // get + // { + // return ServerBootConfig.AYANOVA_FOLDER_USER_FILES; + // } + // } @@ -416,7 +417,7 @@ namespace AyaNova.Util { get { - return Path.Combine(AttachmentFilesFolder, NewRandomFileName); + return Path.Combine(ServerBootConfig.AYANOVA_FOLDER_USER_FILES, NewRandomFileName); } } @@ -485,7 +486,7 @@ namespace AyaNova.Util /// Path without the file internal static string GetPermanentAttachmentPath(string hash) { - return Path.Combine(AttachmentFilesFolder, hash[0].ToString(), hash[1].ToString(), hash[2].ToString()); + return Path.Combine(ServerBootConfig.AYANOVA_FOLDER_USER_FILES, hash[0].ToString(), hash[1].ToString(), hash[2].ToString()); } /// @@ -495,7 +496,7 @@ namespace AyaNova.Util /// internal static string GetPermanentAttachmentFilePath(string hash) { - return Path.Combine(AttachmentFilesFolder, hash[0].ToString(), hash[1].ToString(), hash[2].ToString(), hash); + return Path.Combine(ServerBootConfig.AYANOVA_FOLDER_USER_FILES, hash[0].ToString(), hash[1].ToString(), hash[2].ToString(), hash); } @@ -553,7 +554,7 @@ namespace AyaNova.Util /// internal static void EraseEntireContentsOfAttachmentFilesFolder() { - System.IO.DirectoryInfo di = new DirectoryInfo(AttachmentFilesFolder); + System.IO.DirectoryInfo di = new DirectoryInfo(ServerBootConfig.AYANOVA_FOLDER_USER_FILES); foreach (FileInfo file in di.EnumerateFiles()) { file.Delete(); @@ -572,7 +573,7 @@ namespace AyaNova.Util var AttachmentsBackupFile = $"{demandFileNamePrepend}at-{FileUtil.GetSafeDateFileName()}.zip";//presentation issue so don't use UTC for this one AttachmentsBackupFile = GetFullPathForBackupFile(AttachmentsBackupFile); - System.IO.Compression.ZipFile.CreateFromDirectory(AttachmentFilesFolder, AttachmentsBackupFile); + System.IO.Compression.ZipFile.CreateFromDirectory(ServerBootConfig.AYANOVA_FOLDER_USER_FILES, AttachmentsBackupFile); } catch (Exception ex) { @@ -586,12 +587,12 @@ namespace AyaNova.Util internal static long AttachmentFilesDriveAvailableSpace() { - return new System.IO.DriveInfo(Path.GetPathRoot(AttachmentFilesFolder)).AvailableFreeSpace; + return new System.IO.DriveInfo(Path.GetPathRoot(ServerBootConfig.AYANOVA_FOLDER_USER_FILES)).AvailableFreeSpace; } internal static IEnumerable GetAllAttachmentFilePaths() { - return Directory.EnumerateFiles(AttachmentFilesFolder, "*", SearchOption.AllDirectories); + return Directory.EnumerateFiles(ServerBootConfig.AYANOVA_FOLDER_USER_FILES, "*", SearchOption.AllDirectories); } @@ -709,7 +710,7 @@ namespace AyaNova.Util /// internal static FolderSizeInfo GetAttachmentFolderSizeInfo() { - return GetDirectorySize(new DirectoryInfo(AttachmentFilesFolder)); + return GetDirectorySize(new DirectoryInfo(ServerBootConfig.AYANOVA_FOLDER_USER_FILES)); } /// @@ -718,7 +719,7 @@ namespace AyaNova.Util /// internal static FolderSizeInfo GetBackupFolderSizeInfo() { - return GetDirectorySize(new DirectoryInfo(BackupFilesFolder)); + return GetDirectorySize(new DirectoryInfo(ServerBootConfig.AYANOVA_FOLDER_BACKUP_FILES)); }