admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-11-29 18:35:07 +00:00
parent 762ebc676b
commit 02c8ed066a
1 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
server/AyaNova/util/FileUtil.cs
View File

@@ -151,21 +151,21 @@ namespace AyaNova.Util
/// <returns></returns> /// <returns></returns>
internal static string GetFullPathForBackupFile(string fileName) internal static string GetFullPathForBackupFile(string fileName)
{ {
return Path.Combine(BackupFilesFolder, fileName); return Path.Combine(ServerBootConfig.AYANOVA_FOLDER_BACKUP_FILES, fileName);
} }
/// <summary> // /// <summary>
/// Get backup folder // /// Get backup folder
/// </summary> // /// </summary>
/// <returns></returns> // /// <returns></returns>
internal static string BackupFilesFolder // internal static string BackupFilesFolder
{ // {
get // get
{ // {
return ServerBootConfig.AYANOVA_FOLDER_BACKUP_FILES; // return ServerBootConfig.AYANOVA_FOLDER_BACKUP_FILES;
} // }
} // }
public class BackupFileInfo public class BackupFileInfo
@@ -197,7 +197,7 @@ namespace AyaNova.Util
BackupStatus statusReport = new BackupStatus(); BackupStatus statusReport = new BackupStatus();
try 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) catch (Exception ex)
{ {
@@ -206,7 +206,7 @@ namespace AyaNova.Util
log.LogError(ex, "FileUtil::BackupStatusReport error getting available space"); 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)) foreach (string file in backupFiles.OrderByDescending(z => z))
{ {
@@ -246,8 +246,7 @@ namespace AyaNova.Util
internal static DateTime MostRecentAutomatedBackupFileDate() internal static DateTime MostRecentAutomatedBackupFileDate()
{ {
DateTime LastBackup = DateTime.MinValue; DateTime LastBackup = DateTime.MinValue;
var BackupPath = BackupFilesFolder; foreach (string file in Directory.EnumerateFiles(ServerBootConfig.AYANOVA_FOLDER_BACKUP_FILES, "db-*.backup"))
foreach (string file in Directory.EnumerateFiles(BackupFilesFolder, "db-*.backup"))
{ {
var ThisFileTime = File.GetCreationTimeUtc(file); var ThisFileTime = File.GetCreationTimeUtc(file);
if (ThisFileTime > LastBackup) if (ThisFileTime > LastBackup)
@@ -299,7 +298,7 @@ namespace AyaNova.Util
name = Path.GetFileName(name);//ensure no directory shenanigans, only a file name is allowed name = Path.GetFileName(name);//ensure no directory shenanigans, only a file name is allowed
//remove the file completely //remove the file completely
var DeleteFilePath = Path.Combine(BackupFilesFolder, name); var DeleteFilePath = Path.Combine(ServerBootConfig.AYANOVA_FOLDER_BACKUP_FILES, name);
if (File.Exists(DeleteFilePath)) if (File.Exists(DeleteFilePath))
{ {
//delete the temp file, it's already stored //delete the temp file, it's already stored
@@ -319,7 +318,7 @@ namespace AyaNova.Util
if (keepCount < 1) keepCount = 1; if (keepCount < 1) keepCount = 1;
//Database backups //Database backups
var BackupFileList = Directory.EnumerateFiles(BackupFilesFolder, "db-*.backup"); var BackupFileList = Directory.EnumerateFiles(ServerBootConfig.AYANOVA_FOLDER_BACKUP_FILES, "db-*.backup");
if (BackupFileList.Count() > keepCount) if (BackupFileList.Count() > keepCount)
{ {
//sort, skip newest x (keepcount) delete the rest //sort, skip newest x (keepcount) delete the rest
@@ -332,7 +331,7 @@ namespace AyaNova.Util
} }
//Attachment backups //Attachment backups
BackupFileList = Directory.EnumerateFiles(BackupFilesFolder, "at-*.zip"); BackupFileList = Directory.EnumerateFiles(ServerBootConfig.AYANOVA_FOLDER_BACKUP_FILES, "at-*.zip");
if (BackupFileList.Count() > keepCount) if (BackupFileList.Count() > keepCount)
{ {
//sort, skip newest x (keepcount) delete the rest //sort, skip newest x (keepcount) delete the rest
@@ -348,8 +347,10 @@ namespace AyaNova.Util
internal static long BackupFilesDriveAvailableSpace() internal static long BackupFilesDriveAvailableSpace()
{ {
Console.WriteLine("b fileutil:backupfilesdriveavailablespace, backupfilesfolder:", ServerBootConfig.AYANOVA_FOLDER_BACKUP_FILES);
return new System.IO.DriveInfo(Path.GetPathRoot(BackupFilesFolder)).AvailableFreeSpace; 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 #region Attachment file handling
/// <summary> // /// <summary>
/// Get user folder // /// Get user folder
/// </summary> // /// </summary>
/// <returns></returns> // /// <returns></returns>
internal static string AttachmentFilesFolder // internal static string AttachmentFilesFolder
{ // {
get // get
{ // {
return ServerBootConfig.AYANOVA_FOLDER_USER_FILES; // return ServerBootConfig.AYANOVA_FOLDER_USER_FILES;
} // }
} // }
@@ -416,7 +417,7 @@ namespace AyaNova.Util
{ {
get get
{ {
return Path.Combine(AttachmentFilesFolder, NewRandomFileName); return Path.Combine(ServerBootConfig.AYANOVA_FOLDER_USER_FILES, NewRandomFileName);
} }
} }
@@ -485,7 +486,7 @@ namespace AyaNova.Util
/// <returns>Path without the file</returns> /// <returns>Path without the file</returns>
internal static string GetPermanentAttachmentPath(string hash) 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());
} }
/// <summary> /// <summary>
@@ -495,7 +496,7 @@ namespace AyaNova.Util
/// <returns></returns> /// <returns></returns>
internal static string GetPermanentAttachmentFilePath(string hash) 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
/// </summary> /// </summary>
internal static void EraseEntireContentsOfAttachmentFilesFolder() 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()) foreach (FileInfo file in di.EnumerateFiles())
{ {
file.Delete(); 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 var AttachmentsBackupFile = $"{demandFileNamePrepend}at-{FileUtil.GetSafeDateFileName()}.zip";//presentation issue so don't use UTC for this one
AttachmentsBackupFile = GetFullPathForBackupFile(AttachmentsBackupFile); AttachmentsBackupFile = GetFullPathForBackupFile(AttachmentsBackupFile);
System.IO.Compression.ZipFile.CreateFromDirectory(AttachmentFilesFolder, AttachmentsBackupFile); System.IO.Compression.ZipFile.CreateFromDirectory(ServerBootConfig.AYANOVA_FOLDER_USER_FILES, AttachmentsBackupFile);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -586,12 +587,12 @@ namespace AyaNova.Util
internal static long AttachmentFilesDriveAvailableSpace() 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<string> GetAllAttachmentFilePaths() internal static IEnumerable<string> GetAllAttachmentFilePaths()
{ {
return Directory.EnumerateFiles(AttachmentFilesFolder, "*", SearchOption.AllDirectories); return Directory.EnumerateFiles(ServerBootConfig.AYANOVA_FOLDER_USER_FILES, "*", SearchOption.AllDirectories);
} }
@@ -709,7 +710,7 @@ namespace AyaNova.Util
/// <returns></returns> /// <returns></returns>
internal static FolderSizeInfo GetAttachmentFolderSizeInfo() internal static FolderSizeInfo GetAttachmentFolderSizeInfo()
{ {
return GetDirectorySize(new DirectoryInfo(AttachmentFilesFolder)); return GetDirectorySize(new DirectoryInfo(ServerBootConfig.AYANOVA_FOLDER_USER_FILES));
} }
/// <summary> /// <summary>
@@ -718,7 +719,7 @@ namespace AyaNova.Util
/// <returns></returns> /// <returns></returns>
internal static FolderSizeInfo GetBackupFolderSizeInfo() internal static FolderSizeInfo GetBackupFolderSizeInfo()
{ {
return GetDirectorySize(new DirectoryInfo(BackupFilesFolder)); return GetDirectorySize(new DirectoryInfo(ServerBootConfig.AYANOVA_FOLDER_BACKUP_FILES));
} }