waffle.lord/EftPatchHelper
waffle.lord/EftPatchHelper
0
0
Fork 0
Code Issues Pull Requests Projects Releases 24 Wiki Activity

fix bucket clear check

Browse Source
This commit is contained in:
IsWaffle 2024-05-18 17:01:10 -04:00
parent d4776b578a
commit 3051fa69a8
5 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
EftPatchHelper/EftPatchHelper/EftPatchHelper.csproj
View File

@ -5,8 +5,8 @@
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<AssemblyVersion>1.6.0</AssemblyVersion> <AssemblyVersion>1.6.1</AssemblyVersion>
<FileVersion>1.6.0</FileVersion> <FileVersion>1.6.1</FileVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

8
EftPatchHelper/EftPatchHelper/Helpers/R2Helper.cs
View File

@ -49,12 +49,18 @@ public class R2Helper
return false; return false;
} }
if (listBucketResponse.S3Objects.Count == 0)
{
AnsiConsole.MarkupLine("[green]bucket is empty[/]");
return true;
}
AnsiConsole.MarkupLine("[blue]Removing old content[/]"); AnsiConsole.MarkupLine("[blue]Removing old content[/]");
foreach (var s3Object in listBucketResponse.S3Objects) foreach (var s3Object in listBucketResponse.S3Objects)
{ {
var deleteResponse = await _client.DeleteObjectAsync(BucketName, s3Object.Key); var deleteResponse = await _client.DeleteObjectAsync(BucketName, s3Object.Key);
if (deleteResponse.HttpStatusCode != HttpStatusCode.OK) if ((int)deleteResponse.HttpStatusCode < 200 || (int)deleteResponse.HttpStatusCode > 299)
{ {
AnsiConsole.MarkupLine($"[red]failed to delete {BucketName}::{s3Object.Key}[/]"); AnsiConsole.MarkupLine($"[red]failed to delete {BucketName}::{s3Object.Key}[/]");
return false; return false;

7
EftPatchHelper/EftPatchHelper/Program.cs
View File

@ -32,8 +32,15 @@ namespace EftPatchHelper
var version = Assembly.GetExecutingAssembly().GetName().Version; var version = Assembly.GetExecutingAssembly().GetName().Version;
AnsiConsole.Write(new Rule($"[purple]v{version}[/]").Centered().RuleStyle("blue")); AnsiConsole.Write(new Rule($"[purple]v{version}[/]").Centered().RuleStyle("blue"));
try
{
var host = ConfigureHost(args); var host = ConfigureHost(args);
host.Services.GetRequiredService<Program>().Run(); host.Services.GetRequiredService<Program>().Run();
}
catch (Exception ex)
{
AnsiConsole.MarkupLine($"[red]{ex.Message.EscapeMarkup()}[/]");
}
AnsiConsole.MarkupLine("Press [blue]Enter[/] to close ..."); AnsiConsole.MarkupLine("Press [blue]Enter[/] to close ...");
Console.ReadLine(); Console.ReadLine();

2
EftPatchHelper/EftPatchHelper/Tasks/StartupSettingsTask.cs
View File

@ -74,7 +74,7 @@ namespace EftPatchHelper.Tasks
if (_settings.UsingR2()) if (_settings.UsingR2())
{ {
_options.UplaodToR2 = new ConfirmationPrompt("Upload to R2?").Show(AnsiConsole.Console); _options.UplaodToR2 = new ConfirmationPrompt($"Upload to R2 ({_settings.R2BucketName})?").Show(AnsiConsole.Console);
} }
if (_settings.SftpUploads.Count > 0) if (_settings.SftpUploads.Count > 0)

6
EftPatchHelper/EftPatchHelper/Tasks/UploadMirrorListTasks.cs
View File

@ -41,10 +41,12 @@ namespace EftPatchHelper.Tasks
public bool CreateMirrorList(FileInfo mirrorListFileInfo) public bool CreateMirrorList(FileInfo mirrorListFileInfo)
{ {
var sourcePatchVersion = _options.SourceClient.Version.Split('.').Last();
var targetPatchVersion = _options.TargetClient.Version.Split('.').Last();
var mirrorInfo = new PatchInfo var mirrorInfo = new PatchInfo
{ {
SourceClientVersion = int.Parse(_options.SourceClient.Version), SourceClientVersion = int.Parse(sourcePatchVersion),
TargetClientVersion = int.Parse(_options.TargetClient.Version), TargetClientVersion = int.Parse(targetPatchVersion),
Mirrors = _options.MirrorList.Values.ToList() Mirrors = _options.MirrorList.Values.ToList()
}; };