Readded delete function

.gitea/workflows/build dev.yaml

@@ -33,15 +33,15 @@ jobs:
 
       - name: Build single file executables
         run: |
-          cd sh.actions/sh.actions.package-cleanup
+          cd sh.actions.package-cleanup
 
           # Build for Linux x64
-          dotnet publish -c Release -r linux-x64 -p:Version=$(cat ../../version.txt) -o publish/linux-x64
+          dotnet publish -c Release -r linux-x64 -p:Version=$(cat ../version.txt) -o publish/linux-x64
 
       - name: Upload to Gitea Generic Package Registry
         run: |
-          cd sh.actions/sh.actions.package-cleanup
+          cd sh.actions.package-cleanup
           curl -X PUT \
             -H "Authorization: token ${{ secrets.CI_ACCESS_TOKEN }}" \
             -T publish/linux-x64/sh.actions.package-cleanup \
-            "https://git.sh-edraft.de/api/packages/sh-edraft.de/generic/package-cleanup/$(cat ../../version.txt)/package-cleanup-linux-x64"
+            "https://git.sh-edraft.de/api/packages/sh-edraft.de/generic/package-cleanup/$(cat ../version.txt)/package-cleanup-linux-x64"

.gitignore

@@ -3,6 +3,7 @@
 
 bin/
 obj/
+publish/
 
 # Environment Variables - DO NOT COMMIT
 .env

package-cleanup/action.yaml

@@ -18,6 +18,10 @@ inputs:
   api_token:
     description: "API token for authentication"
     required: true
+  dry_run:
+    description: "Execute without deleting packages"
+    required: false
+    default: "false"
 
 runs:
   using: "composite"
@@ -25,12 +29,19 @@ runs:
     - name: Download and test package-cleanup tool
       shell: bash
       run: |
-        curl -OJ https://git.sh-edraft.de/api/packages/sh-edraft.de/generic/package-cleanup/package-cleanup-linux-x64
+        latest_path=$(curl -sI https://git.sh-edraft.de/sh-edraft.de/-/packages/generic/package-cleanup/ \
+          | awk -F ' ' '/Location:/ {print $2}' \
+          | tr -d '\r')
+
+        version=$(basename "$latest_path")
+        echo "Downloading package-cleanup version $version..."
+        curl -OJ https://git.sh-edraft.de/api/packages/sh-edraft.de/generic/package-cleanup/$version/package-cleanup-linux-x64
 
         # Make executable
         chmod +x package-cleanup-linux-x64
 
     - name: Run package-cleanup
+      id: cleanup
       shell: bash
       env:
         URL: ${{ inputs.url }}
@@ -38,5 +49,8 @@ runs:
         TYPES: ${{ inputs.types }}
         NAMES: ${{ inputs.names }}
         API_TOKEN: ${{ inputs.api_token }}
+        DRY_RUN: ${{ inputs.dry_run }}
+        GITHUB_OUTPUT: ${{ env.GITHUB_OUTPUT }}
       run: |
         ./package-cleanup-linux-x64
+

sh.actions.package-cleanup/ConfigurationExtension.cs

@@ -15,7 +15,7 @@ public static class ConfigurationExtension
     public static IConfigurationBuilder EnsureGiteaConfig(this IConfigurationBuilder builder)
     {
         var configuration = builder.Build();
-        var requiredKeys = new[] { "URL", "OWNER", "TYPES", "NAME", "API_TOKEN" };
+        var requiredKeys = new[] { "URL", "OWNER", "TYPES", "NAMES", "API_TOKEN" };
 
         foreach (var key in requiredKeys)
         {

sh.actions.package-cleanup/Program.cs

@@ -3,6 +3,13 @@ using sh.actions.package_cleanup.Service;
 
 var builder = Host.CreateApplicationBuilder(args);
 
+// Check for --dry-run argument
+var isDryRun = args.Contains("--dry-run");
+if (isDryRun)
+{
+    Environment.SetEnvironmentVariable("DRY_RUN", "true");
+}
+
 builder.Configuration
     .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
     .AddJsonFile("appsettings.local.json", optional: true, reloadOnChange: true)
@@ -15,5 +22,9 @@ builder.Services
     .AddHostedService<Worker>()
     .AddHttpClient<IGiteaPackageService, GiteaPackageService>();
 
+builder.Logging.ClearProviders();
+builder.Logging.AddConsole();
+builder.Logging.SetMinimumLevel(LogLevel.Debug);
+
 var host = builder.Build();
 await host.RunAsync();

sh.actions.package-cleanup/Service/GiteaPackageService.cs

@@ -22,24 +22,75 @@ public class GiteaPackageService(
         }
     }
 
-    public async Task<IEnumerable<GiteaPackage>> GetPackagesByOwnerAsync(CancellationToken cancellationToken = default)
+    public async Task<IEnumerable<GiteaPackage>> GetPackagesByNameAsync(string name, CancellationToken cancellationToken = default)
     {
         try
         {
             var baseUrl = GetBaseUrl();
-            var allPackages = new List<GiteaPackage>();
+            var packages = new List<GiteaPackage>();
             
             // Parse comma-separated types
-            var types = (configuration["TYPE"] ?? "")
+            var types = (configuration["TYPES"] ?? "")
                 .Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
 
             if (types.Length == 0)
             {
                 logger.LogWarning("No package types configured");
-                return allPackages;
+                return packages;
             }
 
-            // Parse comma-separated names
+            foreach (var type in types)
+            {
+                var page = 1;
+
+                while (true)
+                {
+                    var url = $"{baseUrl}/{type}/{name}?page={page}";
+                    logger.LogInformation("Fetching packages from Gitea: {Url}", url);
+
+                    var request = new HttpRequestMessage(HttpMethod.Get, url);
+                    AddAuthorizationHeader(request);
+
+                    var response = await httpClient.SendAsync(request, cancellationToken);
+                    response.EnsureSuccessStatusCode();
+
+                    var fetchedPackages =
+                        await response.Content.ReadFromJsonAsync<List<GiteaPackage>>(cancellationToken: cancellationToken)
+                        ?? [];
+
+                    if (fetchedPackages.Count == 0)
+                    {
+                        break;
+                    }
+
+                    packages.AddRange(fetchedPackages);
+                    logger.LogInformation("Fetched {Count} packages from page {Page}", fetchedPackages.Count, page);
+
+                    page++;
+                }
+            }
+
+            logger.LogInformation("Successfully fetched {Count} packages for name '{Name}'", packages.Count, name);
+            return packages;
+        }
+        catch (HttpRequestException ex)
+        {
+            logger.LogError(ex, "Error fetching packages from Gitea for name '{Name}'", name);
+            throw;
+        }
+        catch (Exception ex)
+        {
+            logger.LogError(ex, "Unexpected error fetching packages for name '{Name}'", name);
+            throw;
+        }
+    }
+
+    public async Task<IEnumerable<GiteaPackage>> GetPackagesByOwnerAsync(CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            var allPackages = new List<GiteaPackage>();
+            
             var names = (configuration["NAMES"] ?? "")
                 .Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
 
@@ -49,38 +100,10 @@ public class GiteaPackageService(
                 return allPackages;
             }
 
-            foreach (var type in types)
+            foreach (var name in names)
             {
-                foreach (var name in names)
+                var packages = await GetPackagesByNameAsync(name, cancellationToken);
-                {
+                allPackages.AddRange(packages);
-                    var page = 1;
-
-                    while (true)
-                    {
-                        var url = $"{baseUrl}/{type}/{name}?page={page}";
-                        logger.LogInformation("Fetching packages from Gitea: {Url}", url);
-
-                        var request = new HttpRequestMessage(HttpMethod.Get, url);
-                        AddAuthorizationHeader(request);
-
-                        var response = await httpClient.SendAsync(request, cancellationToken);
-                        response.EnsureSuccessStatusCode();
-
-                        var packages =
-                            await response.Content.ReadFromJsonAsync<List<GiteaPackage>>(cancellationToken: cancellationToken)
-                            ?? [];
-
-                        if (packages.Count == 0)
-                        {
-                            break;
-                        }
-
-                        allPackages.AddRange(packages);
-                        logger.LogInformation("Fetched {Count} packages from page {Page}", packages.Count, page);
-
-                        page++;
-                    }
-                }
             }
 
             logger.LogInformation("Successfully fetched {Count} packages in total", allPackages.Count);

sh.actions.package-cleanup/Service/IGiteaPackageService.cs

@@ -4,6 +4,7 @@ using sh.actions.package_cleanup.Models;
 
 public interface IGiteaPackageService
 {
+    Task<IEnumerable<GiteaPackage>> GetPackagesByNameAsync(string name, CancellationToken cancellationToken = default);
     Task<IEnumerable<GiteaPackage>> GetPackagesByOwnerAsync(CancellationToken cancellationToken = default);
     Task DeletePackage(GiteaPackage package, CancellationToken cancellationToken = default);
 }

sh.actions.package-cleanup/Service/PackageService.cs

@@ -6,8 +6,7 @@ public class PackageService(IGiteaPackageService packageService) : IPackageServi
 {
     public async Task<List<GiteaPackage>> GetFilteredPackages()
     {
-        var packages = (await packageService.GetPackagesByOwnerAsync()).ToList();
+        return (await packageService.GetPackagesByOwnerAsync()).ToList();
-        return packages;
     }
 
     public List<GiteaPackage> FilterPackagesToDelete(List<GiteaPackage> packages)

sh.actions.package-cleanup/Worker.cs

@@ -17,7 +17,6 @@ public class Worker(
         if (dryRun)
         {
             logger.LogInformation("Dry run enabled, not deleting {Count} packages", packages.Count);
-            return;
         }
 
         foreach (var giteaPackage in packages)
@@ -38,15 +37,42 @@ public class Worker(
     {
         try
         {
-            var packages = await packageService.GetFilteredPackages();
+            var dryRun = configuration["DRY_RUN"]?.ToLower() == "true";
-            logger.LogInformation("Found {Count} packages", packages.Count);
+            if (dryRun)
+            {
+                logger.LogInformation("DRY RUN MODE ENABLED - No packages will be deleted");
+            }
 
-            var packagesToDelete = packageService.FilterPackagesToDelete(packages);
+            // Parse comma-separated names
-            logger.LogInformation("Found {Count} packages to delete", packagesToDelete.Count);
+            var names = (configuration["NAMES"] ?? "")
+                .Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
 
-            await DeletePackages(packagesToDelete, cancellationToken);
+            if (names.Length == 0)
+            {
+                logger.LogWarning("No package names configured");
+                appLifetime.StopApplication();
+                return;
+            }
 
-            logger.LogInformation("Cleanup finished successfully");
+            // Process each name separately: collect -> filter -> delete
+            foreach (var name in names)
+            {
+                logger.LogInformation("Processing packages for name '{Name}'", name);
+
+                var packages = (await giteaPackageService.GetPackagesByNameAsync(name, cancellationToken)).ToList();
+                logger.LogInformation("Found {Count} packages for name '{Name}'", packages.Count, name);
+
+                var packagesToDelete = packageService.FilterPackagesToDelete(packages);
+                logger.LogInformation("Found {Count} packages to delete for name '{Name}'", packagesToDelete.Count,
+                    name);
+
+                await DeletePackages(packagesToDelete, cancellationToken);
+                logger.LogInformation("Deleted {Count} packages for name '{Name}'", packagesToDelete.Count, name);
+
+                logger.LogInformation("Cleanup finished for name '{Name}'", name);
+            }
+
+            logger.LogInformation("All package names processed successfully");
         }
         catch (Exception ex)
         {

sh.actions.package-cleanup/sh.actions.package-cleanup.csproj

@@ -6,10 +6,41 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <UserSecretsId>dotnet-sh.actions.package_cleanup-2b7a013f-ec22-4325-9832-0c9ca9b8ced9</UserSecretsId>
         <RootNamespace>sh.actions.package_cleanup</RootNamespace>
+        <PublishSingleFile>true</PublishSingleFile>
+        <SelfContained>true</SelfContained>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.3" />
         <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.3" />
     </ItemGroup>
+
+    <ItemGroup>
+      <_ContentIncludedByDefault Remove="publish\linux-x64\appsettings.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\appsettings.local.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\appsettings.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\appsettings.local.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.local.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.local.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.local.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.local.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.local.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\appsettings.local.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\sh.actions.package-cleanup.deps.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\sh.actions.package-cleanup.runtimeconfig.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\sh.actions.package-cleanup.deps.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\sh.actions.package-cleanup.runtimeconfig.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\sh.actions.package-cleanup.deps.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\publish\linux-x64\sh.actions.package-cleanup.runtimeconfig.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\sh.actions.package-cleanup.deps.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\publish\linux-x64\sh.actions.package-cleanup.runtimeconfig.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\sh.actions.package-cleanup.deps.json" />
+      <_ContentIncludedByDefault Remove="publish\linux-x64\sh.actions.package-cleanup.runtimeconfig.json" />
+    </ItemGroup>
 </Project>

sh.actions.sln.DotSettings.user

@@ -1,7 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHttpResponseMessage_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Ff7cd24f648c14c59ab25c6dcf9108aef198e00_003Fd7_003F31923dff_003FHttpResponseMessage_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AServiceProvider_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FSourcesCache_003Fd7e2ce30531b7a2d56142411c5e51c3d516aafcb44e7628167b959660a65c_003FServiceProvider_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=fc220b10_002D634c_002D48e4_002Da543_002Df5162d99c787/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="All tests from Solution" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;
-  &lt;Solution /&gt;
-&lt;/SessionState&gt;</s:String>
-	</wpf:ResourceDictionary>