Fix AnalyseAsset task output

using-system · Nov 26, 2018 · 04df78e · 04df78e
1 parent c3641bc
commit 04df78e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/ProcessMyMedia.Samples/Program.cs b/ProcessMyMedia.Samples/Program.cs
@@ -16,7 +16,7 @@ static void Main(string[] args)
 
             IConfigurationRoot configuration = builder.Build();
 
-            new Samples.IngestFromContainer(configuration).Execute();
+            new Samples.AnalyseAsset(configuration).Execute();
         }
     }
 }
diff --git a/ProcessMyMedia.Samples/Samples/Analyzing/AnalyzeAsset.cs b/ProcessMyMedia.Samples/Samples/Analyzing/AnalyzeAsset.cs
@@ -42,9 +42,11 @@ public void Build(IWorkflowBuilder<AnalyzeAssetWorkflowData> builder)
                         .Input(task => task.AssetName, data => data.InputAssetName)
                     .If(data => !string.IsNullOrEmpty(data.OutputAssetName))
                     .Do(then =>
+                        //Get the analysing result
                         then.StartWith<Tasks.DownloadAssetTask>()
                             .Input(task => task.AssetName, data => data.OutputAssetName)
                             .Input(task => task.DirectoryToDownload, data => data.DirectoryToDownload)
+                        //Delete output asset (analysing result)
                         .Then< Tasks.DeleteAssetTask>()
                             .Input(task => task.AssetName, data => data.OutputAssetName));
             }

diff --git a/ProcessMyMedia/Services/AzureMediaServiceV3.cs b/ProcessMyMedia/Services/AzureMediaServiceV3.cs
@@ -281,7 +281,7 @@ public async Task<JobEntity> StartAnalyseAsync(string assetName, AnalyzingParame
 
             try
             {
-                AssetEntity outputAsset = await this.CreateOrUpdateAssetAsync($"{assetName}{Guid.NewGuid()}",
+                AssetEntity outputAsset = await this.CreateOrUpdateAssetAsync(Guid.NewGuid().ToString(),
                     assetDescription: $"Media Analysing for {assetName}");
 
                 TransformOutput[] outputs = new TransformOutput[]
@@ -319,7 +319,7 @@ public async Task<JobEntity> StartAnalyseAsync(string assetName, AnalyzingParame
         /// </summary>
         /// <param name="job">The job associated to the analyse.</param>
         /// <returns></returns>
-        public async Task<AnalyzingResult> EndAnalyseAsync(JobEntity job)
+        public Task<AnalyzingResult> EndAnalyseAsync(JobEntity job)
         {
             var result = new AnalyzingResult();
 
@@ -330,27 +330,15 @@ public async Task<AnalyzingResult> EndAnalyseAsync(JobEntity job)
 
             try
             {
-                string workingDirectory = Path.Combine(Path.GetTempPath(), "Analysing", job.Name);
-
-                if (job.Outputs.Count() > 0)
+                return Task.FromResult(new AnalyzingResult()
                 {
-                    var assetToDownload = job.Outputs.First();
-                    await this.DownloadFilesAsync(assetToDownload.Name, workingDirectory);
-                    result.OutputAssetName = assetToDownload.Name;
-                }
-
-                //TODO:analyse result
-
-                Directory.Delete(workingDirectory, true);
-
-                return result;
+                    OutputAssetName = job.Outputs.First().Name
+                });
             }
             catch (ApiErrorException exc)
             {
                 throw GetApiException(exc);
             }
-
-
         }
 
         /// <summary>