Update cache command to handle directories

microsoft · Apr 13, 2023 · bd0545f · bd0545f
1 parent 65352cd
commit bd0545f
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 1 deletion.
diff --git a/src/WingetCreateCLI/Commands/CacheCommand.cs b/src/WingetCreateCLI/Commands/CacheCommand.cs
@@ -69,6 +69,17 @@ public override Task<bool> Execute()
                         file.Delete();
                     }
 
+                    Console.WriteLine();
+                    var directories = dir.GetDirectories();
+                    Logger.InfoLocalized(nameof(Resources.DirectoriesFound_Message), directories.Length, PackageParser.InstallerDownloadPath);
+                    Console.WriteLine();
+
+                    foreach (DirectoryInfo directory in directories)
+                    {
+                        Logger.WarnLocalized(nameof(Resources.DeletingInstaller_Message), directory.Name + Path.DirectorySeparatorChar);
+                        directory.Delete(true);
+                    }
+
                     Console.WriteLine();
                     Logger.InfoLocalized(nameof(Resources.InstallerCacheCleaned_Message));
                 }
@@ -82,6 +93,15 @@ public override Task<bool> Execute()
                     {
                         Logger.Debug(Path.GetFileName(file));
                     }
+
+                    Console.WriteLine();
+                    string[] directories = Directory.GetDirectories(PackageParser.InstallerDownloadPath);
+                    Logger.InfoLocalized(nameof(Resources.DirectoriesFound_Message), directories.Length, PackageParser.InstallerDownloadPath);
+                    Console.WriteLine();
+                    foreach (string directory in directories)
+                    {
+                        Logger.Debug(Path.GetRelativePath(PackageParser.InstallerDownloadPath, directory) + Path.DirectorySeparatorChar);
+                    }
                 }
                 else if (this.Open)
                 {

diff --git a/src/WingetCreateCLI/Properties/Resources.Designer.cs b/src/WingetCreateCLI/Properties/Resources.Designer.cs
diff --git a/src/WingetCreateCLI/Properties/Resources.resx b/src/WingetCreateCLI/Properties/Resources.resx
@@ -167,6 +167,11 @@
   <data name="Description_KeywordDescription" xml:space="preserve">
     <value>The full package description</value>
   </data>
+  <data name="DirectoriesFound_Message" xml:space="preserve">
+    <value>{0} directories found in {1}</value>
+    <comment>{0} - Will be replaced with the number of installers found in the cache folder
+{1} - Will be replaced with the path to the downloaded installer cache folder</comment>
+  </data>
   <data name="DoneSymbol_String" xml:space="preserve">
     <value>DONE</value>
   </data>