From 26ca3c73f8466641237b61aa7a7712d91ec7c6a9 Mon Sep 17 00:00:00 2001
From: "Pohsiang (John) Hsu" <pohhsu@microsoft.com>
Date: Wed, 2 Aug 2023 15:07:17 -0700
Subject: [PATCH] mostly cosmetics changes, fixed one build warning in
 CleanUpAssetAsync

---
 Program.cs                     |  3 +--
 ams/CleanupCommand.cs          | 29 ++++++++++++++---------------
 transform/StorageExtensions.cs |  2 +-
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/Program.cs b/Program.cs
index 6ef0224..44e22b3 100644
--- a/Program.cs
+++ b/Program.cs
@@ -1,5 +1,4 @@
-using AMSMigrate.ams;
-using AMSMigrate.Ams;
+using AMSMigrate.Ams;
 using AMSMigrate.Azure;
 using AMSMigrate.Contracts;
 using AMSMigrate.Local;
diff --git a/ams/CleanupCommand.cs b/ams/CleanupCommand.cs
index 1c6560e..1ec3df4 100644
--- a/ams/CleanupCommand.cs
+++ b/ams/CleanupCommand.cs
@@ -8,7 +8,7 @@
 using Spectre.Console;
 using System.ComponentModel;
 
-namespace AMSMigrate.ams
+namespace AMSMigrate.Ams
 {
     internal class CleanupCommand : BaseMigrator
     {
@@ -166,20 +166,19 @@ private async Task<bool> CleanUpAssetAsync(bool isForcedelete,MediaServicesAccou
                     // The asset container exists, try to check the metadata list first.
               
                 if (isForcedelete||(_tracker.GetMigrationStatusAsync(container, cancellationToken).Result.Status == MigrationStatus.Completed))
-                {
-                  
-                        var locator = await account.GetStreamingLocatorAsync(asset, cancellationToken);
-                        if (locator != null)
-                        {
-                            await locator.DeleteAsync(WaitUntil.Completed);
-                        }
-
-                        if (asset != null)
-                        {
-                            await asset.DeleteAsync(WaitUntil.Completed);
-                        }
-                        await container.DeleteAsync();
-                        _logger.LogDebug("locator: {locator}, Migrated asset: {asset} , container: {container} are deleted.", locator?.Data.Name, asset.Data.Name, container?.Name);
+                {                  
+                    var locator = await account.GetStreamingLocatorAsync(asset, cancellationToken);
+                    if (locator != null)
+                    {
+                        await locator.DeleteAsync(WaitUntil.Completed);
+                    }
+
+                    if (asset != null)
+                    {
+                        await asset.DeleteAsync(WaitUntil.Completed);
+                    }
+                    await container.DeleteAsync();
+                    _logger.LogDebug("locator: {locator}, Migrated asset: {asset} , container: {container} are deleted.", locator?.Data.Name, asset?.Data.Name, container?.Name);
                     return true;
                 }
                 else
diff --git a/transform/StorageExtensions.cs b/transform/StorageExtensions.cs
index b650db9..83d4e46 100644
--- a/transform/StorageExtensions.cs
+++ b/transform/StorageExtensions.cs
@@ -184,7 +184,7 @@ public static async Task<AssetDetails> GetDetailsAsync(
 
             if (asset.Data.StorageEncryptionFormat != MediaAssetStorageEncryptionFormat.None)
             {
-                // The asset is encypted with its own key and list of IVs.
+                // The asset is encrypted with its own key and list of IVs.
                 decryptInfo = await asset.GetEncryptionKeyAsync(cancellationToken);
             }