Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upload both small and large images

Browse Source
This commit is contained in:
Timothy Baldridge 2022-05-14 22:33:17 -06:00
parent dbdb0713f7
commit 0e99dce23e
4 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/tests.yaml vendored
View File

@ -7,7 +7,7 @@ on:
branches: [ main ] branches: [ main ]
env: env:
VERSION: 3.0.0.0-beta10 VERSION: 3.0.0.1
jobs: jobs:
build: build:

36
Wabbajack.CLI/Verbs/ValidateLists.cs
View File

@ -217,8 +217,9 @@ public class ValidateLists : IVerb
? ListStatus.Failed ? ListStatus.Failed
: ListStatus.Available; : ListStatus.Available;
var image = await ProcessModlistImage(reports, modList, token); var (smallImage, largeImage) = await ProcessModlistImage(reports, modList, token);
validatedList.Image = new Uri($"https://raw.githubusercontent.com/wabbajack-tools/mod-lists/master/reports/{image.ToString().Replace("\\", "/")}"); validatedList.SmallImage = new Uri($"https://raw.githubusercontent.com/wabbajack-tools/mod-lists/master/reports/{smallImage.ToString().Replace("\\", "/")}");
validatedList.LargeImage = new Uri($"https://raw.githubusercontent.com/wabbajack-tools/mod-lists/master/reports/{largeImage.ToString().Replace("\\", "/")}");
return validatedList; return validatedList;
}).ToArray(); }).ToArray();
@ -249,26 +250,44 @@ public class ValidateLists : IVerb
return 0; return 0;
} }
private async Task<RelativePath> ProcessModlistImage(AbsolutePath reports, ModlistMetadata validatedList, private async Task<(RelativePath SmallImage, RelativePath LargeImage)> ProcessModlistImage(AbsolutePath reports, ModlistMetadata validatedList,
CancellationToken token) CancellationToken token)
{ {
_logger.LogInformation("Processing Modlist Image"); _logger.LogInformation("Processing Modlist Image");
var baseFolder = reports.Combine(validatedList.NamespacedName); var baseFolder = reports.Combine(validatedList.NamespacedName);
baseFolder.CreateDirectory(); baseFolder.CreateDirectory();
var standardWidth = 466;
await using var imageStream = await _httpClient.GetStreamAsync(validatedList.Links.ImageUri, token); await using var imageStream = await _httpClient.GetStreamAsync(validatedList.Links.ImageUri, token);
var ms = new MemoryStream(); var ms = new MemoryStream();
var hash = await imageStream.HashingCopy(ms, token); var hash = await imageStream.HashingCopy(ms, token);
ms.Position = 0; ms.Position = 0;
RelativePath smallImage, largeImage;
// Large Image
{
var standardWidth = 1152;
using var image = await Image.LoadAsync(ms, token); using var image = await Image.LoadAsync(ms, token);
var height = standardWidth * image.Height / image.Width; var height = standardWidth * image.Height / image.Width;
image.Mutate(x => x image.Mutate(x => x
.Resize(standardWidth, height)); .Resize(standardWidth, height));
var path = validatedList.RepositoryName.ToRelativePath().Combine(hash.ToHex()).WithExtension(Ext.Webp); largeImage = validatedList.RepositoryName.ToRelativePath().Combine(hash.ToHex()+"_large").WithExtension(Ext.Webp);
await image.SaveAsync(path.RelativeTo(reports).ToString(), cancellationToken: token); await image.SaveAsync(largeImage.RelativeTo(reports).ToString(), cancellationToken: token);
}
return path; // Small Image
{
var standardWidth = 466;
using var image = await Image.LoadAsync(ms, token);
var height = standardWidth * image.Height / image.Width;
image.Mutate(x => x
.Resize(standardWidth, height));
smallImage = validatedList.RepositoryName.ToRelativePath().Combine(hash.ToHex()+"_small").WithExtension(Ext.Webp);
await image.SaveAsync(smallImage.RelativeTo(reports).ToString(), cancellationToken: token);
}
return (smallImage, largeImage);
} }
private async Task SendDefinitionToLoadOrderLibrary(ModlistMetadata metadata, ModList modListData, CancellationToken token) private async Task SendDefinitionToLoadOrderLibrary(ModlistMetadata metadata, ModList modListData, CancellationToken token)
@ -526,7 +545,8 @@ public class ValidateLists : IVerb
MachineURL = l.MachineURL, MachineURL = l.MachineURL,
Name = l.Name, Name = l.Name,
Updating = 0, Updating = 0,
Image = l.Image SmallImage = l.SmallImage,
LargeImage = l.LargeImage
}).ToArray(); }).ToArray();

3
Wabbajack.DTOs/ModListStatus/ModListSummary.cs
View File

@ -25,5 +25,6 @@ public class ModListSummary
[JsonPropertyName("has_failures")] public bool HasFailures => Failed > 0 || ModListIsMissing; [JsonPropertyName("has_failures")] public bool HasFailures => Failed > 0 || ModListIsMissing;
[JsonPropertyName("image")] public Uri Image { get; set; } [JsonPropertyName("small_image")] public Uri SmallImage { get; set; }
[JsonPropertyName("large_image")] public Uri LargeImage { get; set; }
} }

3
Wabbajack.DTOs/ModListValidation/ValidatedModList.cs
View File

@ -16,5 +16,6 @@ public class ValidatedModList
public ListStatus Status { get; set; } public ListStatus Status { get; set; }
public long Failures => Archives.Count(a => a.Status == ArchiveStatus.InValid); public long Failures => Archives.Count(a => a.Status == ArchiveStatus.InValid);
public Uri Image { get; set; } public Uri SmallImage { get; set; }
public Uri LargeImage { get; set; }
} }