Browse Source

Update package server and client.

Justin 3 years ago
parent
commit
c607e5d3d7
2 changed files with 13 additions and 7 deletions
  1. 6 6
      PackageClient/Program.cs
  2. 7 1
      PackageServer/PackageManager.cs

+ 6 - 6
PackageClient/Program.cs

@@ -43,7 +43,7 @@ namespace PackageClient
             }
             else
             {
-                if (args.Length != 4)
+                if (args.Length != 5)
                 {
                     Console.WriteLine("Running arguments:");
                     Console.WriteLine("1. Project Name: string - The name of the project");
@@ -113,15 +113,15 @@ namespace PackageClient
                     packageManager.StartTransfer(packagerId, taskId, hashCode);
 
                     var fileSize = fileData.Length;
-                    var transferCount = fileSize / 1024;
-                    var lastBlockSize = fileSize % 1024;
+                    var transferCount = fileSize / 1048576;
+                    var lastBlockSize = fileSize % 1048576;
 
                     var totalCount = transferCount + (lastBlockSize > 0 ? 1 : 0);
 
                     for (var i = 0; i < transferCount; i++)
                     {
-                        var transferData = new byte[1024];
-                        Array.Copy(fileData, i * 1024, transferData, 0, transferData.Length);
+                        var transferData = new byte[1048576];
+                        Array.Copy(fileData, i * 1048576, transferData, 0, transferData.Length);
                         packageManager.TransferData(packagerId, taskId, transferData);
 
                         var progress = (int)((float)i / totalCount * 100);
@@ -130,7 +130,7 @@ namespace PackageClient
                     if (lastBlockSize > 0)
                     {
                         var transferData = new byte[lastBlockSize];
-                        Array.Copy(fileData, transferCount * 1024, transferData, 0, transferData.Length);
+                        Array.Copy(fileData, transferCount * 1048576, transferData, 0, transferData.Length);
                         packageManager.TransferData(packagerId, taskId, transferData);
                         Console.WriteLine($"100% transfered.");
                     }

+ 7 - 1
PackageServer/PackageManager.cs

@@ -46,6 +46,12 @@ namespace PackageServer
 
         public void StartTransfer(uint hashCode)
         {
+            //Clean the package folder
+            Directory.Delete(_packageFolder, true);
+            if(!Directory.Exists(_packageFolder))
+            {
+                Directory.CreateDirectory(_packageFolder);
+            }
             _transferHashCode = hashCode;
             _transferFilePath = Path.Combine(_transferFolder, Guid.NewGuid().ToString("N") + ".zip");
             _transferStream = File.Open(_transferFilePath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite);
@@ -101,7 +107,7 @@ namespace PackageServer
                 {
                     throw new InvalidDataException("The file is not exist.");
                 }
-                _runningProcess = Process.Start(new ProcessStartInfo() { FileName = filePath, UseShellExecute = true, WorkingDirectory = _packageFolder });
+                _runningProcess = Process.Start(new ProcessStartInfo() { FileName = filePath, Arguments=Version, UseShellExecute = true, WorkingDirectory = _packageFolder });
                 State = PackageTaskState.Executing;
                 Task.Run(() =>
                 {