Download latest initialize environment script before editing it

Nfactor26 · Nfactor26 · commit 7f530ffe00d7 · 2022-12-04T15:14:18.000+05:30
diff --git a/src/Pixel.Automation.Designer.ViewModels/AutomationBuilder/AutomationEditorViewModel.cs b/src/Pixel.Automation.Designer.ViewModels/AutomationBuilder/AutomationEditorViewModel.cs
@@ -161,6 +161,7 @@ public async Task EditScriptAsync()
         {
             try
             {
+                await this.projectManager.DownloadFileByNameAsync(Constants.InitializeEnvironmentScript);
                 var entityManager = this.EntityManager;
                 var fileSystem = entityManager.GetCurrentFileSystem();
                 var scriptFile = Path.Combine(fileSystem.ScriptsDirectory, Constants.InitializeEnvironmentScript);             
diff --git a/src/Pixel.Automation.Designer.ViewModels/AutomationBuilder/AutomationProjectManager.cs b/src/Pixel.Automation.Designer.ViewModels/AutomationBuilder/AutomationProjectManager.cs
@@ -25,6 +25,23 @@ public class AutomationProjectManager : ProjectManager, IAutomationProjectManage
         private AutomationProject activeProject;
         private VersionInfo loadedVersion;     
 
+        /// <summary>
+        /// constructor
+        /// </summary>
+        /// <param name="serializer"></param>
+        /// <param name="entityManager"></param>
+        /// <param name="projectFileSystem"></param>
+        /// <param name="typeProvider"></param>
+        /// <param name="argumentTypeProvider"></param>
+        /// <param name="codeEditorFactory"></param>
+        /// <param name="scriptEditorFactory"></param>
+        /// <param name="scriptEngineFactory"></param>
+        /// <param name="codeGenerator"></param>
+        /// <param name="applicationDataManager"></param>
+        /// <param name="referenceManagerFactory"></param>
+        /// <param name="projectDataManager"></param>
+        /// <param name="prefabDataManager"></param>
+        /// <param name="projectAssetDataManager"></param>
         public AutomationProjectManager(ISerializer serializer, IEntityManager entityManager, IProjectFileSystem projectFileSystem, ITypeProvider typeProvider, IArgumentTypeProvider argumentTypeProvider,
             ICodeEditorFactory codeEditorFactory, IScriptEditorFactory scriptEditorFactory, IScriptEngineFactory scriptEngineFactory, ICodeGenerator codeGenerator, IApplicationDataManager applicationDataManager,
             IReferenceManagerFactory referenceManagerFactory, IProjectDataManager projectDataManager, IPrefabDataManager prefabDataManager, IProjectAssetsDataManager projectAssetDataManager) 
@@ -37,7 +54,7 @@ public AutomationProjectManager(ISerializer serializer, IEntityManager entityMan
             this.prefabDataManager = Guard.Argument(prefabDataManager, nameof(prefabDataManager)).NotNull().Value;
         }
 
-        #region Load Project
+        #region methods
 
         public async  Task<Entity> Load(AutomationProject activeProject, VersionInfo versionToLoad)
         {
@@ -141,9 +158,7 @@ private Entity DeserializeProject()
         {                     
             var entity = this.Load<Entity>(this.projectFileSystem.ProcessFile);         
             return entity;
-        }       
-
-        #endregion Load Project
+        }
 
         /// <summary>
         /// Save and load project again. Update services to use new data model . One time registration of services is skipped unlike load.
@@ -154,35 +169,43 @@ private Entity DeserializeProject()
         /// <param name="entityManager"></param>
         /// <returns></returns>
         public override async Task Reload()
-        {        
+        {
 
             logger.Information($"{this.GetProjectName()} will be re-loaded");
             var reference = this.fileSystem.LoadFile<ProjectReferences>(this.fileSystem.ReferencesFile);
             this.referenceManager.SetProjectReferences(reference);
             var dataModel = CompileAndCreateDataModel(Constants.AutomationProcessDataModelName);
             ConfigureScriptEngine(this.referenceManager, dataModel);
-            ConfigureScriptEditor(this.referenceManager, dataModel);          
+            ConfigureScriptEditor(this.referenceManager, dataModel);
             this.entityManager.Arguments = dataModel;
             SetupInitializationScriptProject(dataModel);
-            await ExecuteInitializationScript();        
+            await ExecuteInitializationScript();
             ConfigureArgumentTypeProvider(this.entityManager.Arguments.GetType().Assembly);
             this.RootEntity.ResetHierarchy();
-            serializer.Serialize(this.projectFileSystem.ProcessFile, this.RootEntity, typeProvider.GetKnownTypes());            
-                   
+            serializer.Serialize(this.projectFileSystem.ProcessFile, this.RootEntity, typeProvider.GetKnownTypes());
+
             var rootEntity = DeserializeProject();
             //we don't want any launched applications to be lost. Copy over ApplicationDetails from each ApplicationEntity in to newly loaded root entity.
-            foreach(var applicationEntity in this.entityManager.RootEntity.GetComponentsOfType<ApplicationEntity>(SearchScope.Descendants))
+            foreach (var applicationEntity in this.entityManager.RootEntity.GetComponentsOfType<ApplicationEntity>(SearchScope.Descendants))
             {
                 var newApplicationEntity = rootEntity.GetComponentById(applicationEntity.Id, SearchScope.Descendants) as IApplicationEntity;
                 newApplicationEntity.SetTargetApplicationDetails(applicationEntity.GetTargetApplicationDetails());
-            }         
+            }
             this.RootEntity = rootEntity;
             RestoreParentChildRelation(this.RootEntity);
             await Task.CompletedTask;
             logger.Information($"Reload completed for project {this.GetProjectName()}");
 
         }
 
+        ///<inheritdoc/>
+        public async Task DownloadFileByNameAsync(string fileName)
+        {
+            await this.projectDataManager.DownloadProjectDataFileByNameAsync(this.activeProject, this.loadedVersion as ProjectVersion, fileName);
+        }
+
+        #endregion methods
+
         #region overridden methods
 
         ///<inheritdoc/>
diff --git a/src/Pixel.Automation.Editor.Core/Interfaces/IProjectManager.cs b/src/Pixel.Automation.Editor.Core/Interfaces/IProjectManager.cs
@@ -64,7 +64,9 @@ public interface IProjectManager
 
     public interface IAutomationProjectManager: IProjectManager
     {
-        Task<Entity> Load(AutomationProject activeProject, VersionInfo versionToLoad);       
+        Task<Entity> Load(AutomationProject activeProject, VersionInfo versionToLoad);
+
+        Task DownloadFileByNameAsync(string fileName);
     }
     
 
diff --git a/src/Pixel.Persistence.Respository/FilesRepository.cs b/src/Pixel.Persistence.Respository/FilesRepository.cs
@@ -112,7 +112,8 @@ public async Task<ProjectDataFile> GetFileAsync(string projectId, string project
                     ProjectId = projectId,
                     ProjectVersion = projectVersion,
                     FileName = fileInfo.Filename,
-                    FilePath = fileInfo.Metadata[this.filePathField].AsString
+                    FilePath = fileInfo.Metadata[this.filePathField].AsString,
+                    Bytes = fileData
                 };
             }          
         }
diff --git a/src/Pixel.Persistence.Services.Api/Controllers/FilesController.cs b/src/Pixel.Persistence.Services.Api/Controllers/FilesController.cs
@@ -68,7 +68,7 @@ public async Task<ActionResult> GetFileByName(string projectId, string projectve
                 var file = await filesRepository.GetFileAsync(projectId, projectversion, fileName);
                 if(file != null)
                 {
-                    return File(file.Bytes, file.Type, file.FileName);
+                    return Ok(file);
                 }
                 return NotFound();
 
diff --git a/src/Pixel.Persistence.Services.Client/DataManagers/ProjectDataManager.cs b/src/Pixel.Persistence.Services.Client/DataManagers/ProjectDataManager.cs
@@ -11,6 +11,7 @@
 using System.IO.Compression;
 using System.Linq;
 using System.Threading.Tasks;
+using static System.Net.Mime.MediaTypeNames;
 
 namespace Pixel.Persistence.Services.Client;
 
@@ -104,6 +105,28 @@ public async Task DownloadProjectDataFilesAsync(AutomationProject automationProj
         }
     }
 
+    /// <inheritdoc/>  
+    public async Task DownloadProjectDataFileByNameAsync(AutomationProject automationProject, ProjectVersion projectVersion, string fileName)
+    {
+        Guard.Argument(automationProject, nameof(automationProject)).NotNull();
+        Guard.Argument(projectVersion, nameof(projectVersion)).NotNull();
+        Guard.Argument(fileName, nameof(fileName)).NotNull().NotEmpty();      
+
+        if (IsOnlineMode)
+        {
+            var file = await this.filesClient.DownProjectDataFile(automationProject.ProjectId, projectVersion.ToString(), fileName);
+            using (MemoryStream ms = new MemoryStream(file.Bytes))
+            {
+                using (FileStream fs = new FileStream(file.FilePath, FileMode.CreateNew))
+                {
+                    ms.Seek(0, SeekOrigin.Begin);
+                    ms.CopyTo(fs);
+                }
+            }
+            logger.Information("File {0} was downloaded.", file.FilePath);
+        }
+    }
+
     /// <inheritdoc/> 
     public async Task DownloadDataModelFilesAsync(AutomationProject automationProject, ProjectVersion projectVersion)
     {
diff --git a/src/Pixel.Persistence.Services.Client/FilesRepositoryClient.cs b/src/Pixel.Persistence.Services.Client/FilesRepositoryClient.cs
@@ -94,17 +94,15 @@ public async Task<byte[]> DownloadProjectDataFilesOfType(string projectId, strin
     }
 
     /// <inheritdoc/>  
-    public async Task<byte[]> DownProjectDataFile(string projectId, string projectVersion, string fileName)
+    public async Task<ProjectDataFile> DownProjectDataFile(string projectId, string projectVersion, string fileName)
     {
         Guard.Argument(projectId, nameof(projectId)).NotNull().NotEmpty();
         Guard.Argument(projectVersion, nameof(projectVersion)).NotNull().NotEmpty();
         Guard.Argument(fileName, nameof(fileName)).NotNull().NotEmpty();
 
         RestRequest restRequest = new RestRequest($"{baseUrl}/{projectId}/{projectVersion}/name/{fileName}");
         var client = this.clientFactory.GetOrCreateClient();
-        var result = await client.ExecuteGetAsync(restRequest);
-        result.EnsureSuccess();
-        return result.RawBytes;
+        return await client.GetAsync<ProjectDataFile>(restRequest);     
     }
 
     /// <inheritdoc/>  
diff --git a/src/Pixel.Persistence.Services.Client/Interfaces/IFilesRepositoryClient.cs b/src/Pixel.Persistence.Services.Client/Interfaces/IFilesRepositoryClient.cs
@@ -31,7 +31,7 @@ public interface IFilesRepositoryClient
     /// <param name="projectVersion"></param>
     /// <param name="fileName"></param>
     /// <returns></returns>
-    Task<byte[]> DownProjectDataFile(string projectId, string projectVersion, string fileName);
+    Task<ProjectDataFile> DownProjectDataFile(string projectId, string projectVersion, string fileName);
 
     /// <summary>
     /// Download data files matching any of the specified tags for a given version of project
diff --git a/src/Pixel.Persistence.Services.Client/Interfaces/IProjectDataManager.cs b/src/Pixel.Persistence.Services.Client/Interfaces/IProjectDataManager.cs
@@ -64,6 +64,11 @@ public interface IProjectDataManager
     /// <returns></returns>
     Task DownloadProjectsAsync();
 
+    /// <summary>
+    /// Download a file with specified nme for the version of AutomtionProject being managed
+    /// </summary>
+    /// <returns></returns>
+    Task DownloadProjectDataFileByNameAsync(AutomationProject automationProject, ProjectVersion projectVersion, string fileName);
 
     /// <summary>
     /// Download all the data files belonging to the version of AutomationProject being managed

Original file line number	Diff line number	Diff line change
`@@ -161,6 +161,7 @@ public async Task EditScriptAsync()`
`161`	`161`	`{`
`162`	`162`	`try`
`163`	`163`	`{`
	`164`	`+ await this.projectManager.DownloadFileByNameAsync(Constants.InitializeEnvironmentScript);`
`164`	`165`	`var entityManager = this.EntityManager;`
`165`	`166`	`var fileSystem = entityManager.GetCurrentFileSystem();`
`166`	`167`	`var scriptFile = Path.Combine(fileSystem.ScriptsDirectory, Constants.InitializeEnvironmentScript);`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,9 @@ public interface IProjectManager`
`64`	`64`
`65`	`65`	`public interface IAutomationProjectManager: IProjectManager`
`66`	`66`	`{`
`67`		`- Task<Entity> Load(AutomationProject activeProject, VersionInfo versionToLoad);`
	`67`	`+ Task<Entity> Load(AutomationProject activeProject, VersionInfo versionToLoad);`
	`68`	`+`
	`69`	`+ Task DownloadFileByNameAsync(string fileName);`
`68`	`70`	`}`
`69`	`71`
`70`	`72`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,8 @@ public async Task<ProjectDataFile> GetFileAsync(string projectId, string project`
`112`	`112`	`ProjectId = projectId,`
`113`	`113`	`ProjectVersion = projectVersion,`
`114`	`114`	`FileName = fileInfo.Filename,`
`115`		`- FilePath = fileInfo.Metadata[this.filePathField].AsString`
	`115`	`+ FilePath = fileInfo.Metadata[this.filePathField].AsString,`
	`116`	`+ Bytes = fileData`
`116`	`117`	`};`
`117`	`118`	`}`
`118`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public async Task<ActionResult> GetFileByName(string projectId, string projectve`
`68`	`68`	`var file = await filesRepository.GetFileAsync(projectId, projectversion, fileName);`
`69`	`69`	`if(file != null)`
`70`	`70`	`{`
`71`		`- return File(file.Bytes, file.Type, file.FileName);`
	`71`	`+ return Ok(file);`
`72`	`72`	`}`
`73`	`73`	`return NotFound();`
`74`	`74`
Original file line number	Diff line number	Diff line change
`@@ -94,17 +94,15 @@ public async Task<byte[]> DownloadProjectDataFilesOfType(string projectId, strin`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`/// <inheritdoc/>`
`97`		`- public async Task<byte[]> DownProjectDataFile(string projectId, string projectVersion, string fileName)`
	`97`	`+ public async Task<ProjectDataFile> DownProjectDataFile(string projectId, string projectVersion, string fileName)`
`98`	`98`	`{`
`99`	`99`	`Guard.Argument(projectId, nameof(projectId)).NotNull().NotEmpty();`
`100`	`100`	`Guard.Argument(projectVersion, nameof(projectVersion)).NotNull().NotEmpty();`
`101`	`101`	`Guard.Argument(fileName, nameof(fileName)).NotNull().NotEmpty();`
`102`	`102`
`103`	`103`	`RestRequest restRequest = new RestRequest($"{baseUrl}/{projectId}/{projectVersion}/name/{fileName}");`
`104`	`104`	`var client = this.clientFactory.GetOrCreateClient();`
`105`		`- var result = await client.ExecuteGetAsync(restRequest);`
`106`		`- result.EnsureSuccess();`
`107`		`- return result.RawBytes;`
	`105`	`+ return await client.GetAsync<ProjectDataFile>(restRequest);`
`108`	`106`	`}`
`109`	`107`
`110`	`108`	`/// <inheritdoc/>`