Browse Source

Merge branch 'hotfix/DatabaseBackupFileAuth' into develop

chpark 7 months ago
parent
commit
534e040127
2 changed files with 13 additions and 4 deletions
  1. 11 2
      DataManager/Forms/AllInOneDashBoard.cs
  2. 2 2
      DataManager/Properties/AssemblyInfo.cs

+ 11 - 2
DataManager/Forms/AllInOneDashBoard.cs

@@ -37,6 +37,7 @@ namespace DataManager
         private DateTime _StartTime;
 
         private Log_Manager _LogManager = new Log_Manager();
+        private const string PUBLIC_DOCUMENTS_DIRECTORY = "C:\\Users\\Public\\Documents";
 
         public AllInOneDashBoard(DataTable siteData, DataTable dbData, string serverName, string id, string password, int threadCount)
         {
@@ -448,12 +449,20 @@ namespace DataManager
         private DatabaseInfo RestoreDatabase(DatabaseInfo databaseInfo, string dbName, string backupFilePath)
         {
             string dataPath = Path.GetDirectoryName(databaseInfo.Current.DataDBPath);
-            Tuple<string, string> originDatabase = GetOriginalDatabaseNameFromBackupFile(backupFilePath);
+
+            // DB 옮기기
+            string tempBackupFilePath = $"{PUBLIC_DOCUMENTS_DIRECTORY}\\{Path.GetFileName(backupFilePath)}";
+            File.Copy(backupFilePath, tempBackupFilePath, true);
+
+            Tuple<string, string> originDatabase = GetOriginalDatabaseNameFromBackupFile(tempBackupFilePath);
             string suffix = $"_{DateTime.Now.ToString("yyyyMMddHHmmssfff")}";
             string tempDbName = $"{dbName}{suffix}";
-            DatabaseInfo tempDbDatabaseInfo = RestoreDatabase(backupFilePath, _DbThread.ServerName, originDatabase.Item1, originDatabase.Item2, tempDbName, dataPath);
+            DatabaseInfo tempDbDatabaseInfo = RestoreDatabase(tempBackupFilePath, _DbThread.ServerName, originDatabase.Item1, originDatabase.Item2, tempDbName, dataPath);
             tempDbDatabaseInfo.SetTargetDbInfo(suffix);
 
+            // DB 옮긴 후 파일 삭제
+            File.Delete(tempBackupFilePath);
+
             return tempDbDatabaseInfo;
         }
 

+ 2 - 2
DataManager/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를
 // 기본값으로 할 수 있습니다.
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.4")]
-[assembly: AssemblyFileVersion("1.1.4")]
+[assembly: AssemblyVersion("1.1.5")]
+[assembly: AssemblyFileVersion("1.1.5")]