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

2.5.3.12

Browse Source
This commit is contained in:
Timothy Baldridge 2022-04-04 14:24:13 -06:00
parent 6f322d4a35
commit eaaa082600
6 changed files with 47 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -1,5 +1,13 @@
### Changelog ### Changelog
#### Version - 2.5.3.12 - 4/4/2022
* Allow featured modlists to exist in other repositories
* Continue to load the gallery even if a parse failure happens while loading a repository
#### Version - 2.5.3.11 - 4/2/2022
* New entry in `Links` named `discordURL` allows authors to add a discord link to their install page
* Reworks for decentralization
#### Version - 2.5.3.10 - 3/26/2022 #### Version - 2.5.3.10 - 3/26/2022
* Report file sizes before generating patches * Report file sizes before generating patches
* When displaying a browser, we now show the navigated to Url (and a copy to clipboard button) * When displaying a browser, we now show the navigated to Url (and a copy to clipboard button)

6
Wabbajack.CLI/Wabbajack.CLI.csproj
View File

@ -6,9 +6,9 @@
<AssemblyName>wabbajack-cli</AssemblyName> <AssemblyName>wabbajack-cli</AssemblyName>
<Company>Wabbajack</Company> <Company>Wabbajack</Company>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<AssemblyVersion>2.5.3.10</AssemblyVersion> <AssemblyVersion>2.5.3.12</AssemblyVersion>
<FileVersion>2.5.3.10</FileVersion> <FileVersion>2.5.3.12</FileVersion>
<Copyright>Copyright © 2019-2021</Copyright> <Copyright>Copyright © 2019-2022</Copyright>
<Description>An automated ModList installer</Description> <Description>An automated ModList installer</Description>
<PublishReadyToRun>true</PublishReadyToRun> <PublishReadyToRun>true</PublishReadyToRun>
<RuntimeIdentifier>win10-x64</RuntimeIdentifier> <RuntimeIdentifier>win10-x64</RuntimeIdentifier>

6
Wabbajack.Launcher/Wabbajack.Launcher.csproj
View File

@ -4,9 +4,9 @@
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net5.0-windows</TargetFramework> <TargetFramework>net5.0-windows</TargetFramework>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<AssemblyVersion>2.5.3.10</AssemblyVersion> <AssemblyVersion>2.5.3.12</AssemblyVersion>
<FileVersion>2.5.3.10</FileVersion> <FileVersion>2.5.3.12</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright> <Copyright>Copyright © 2019-2022</Copyright>
<Description>Wabbajack Application Launcher</Description> <Description>Wabbajack Application Launcher</Description>
<PublishReadyToRun>true</PublishReadyToRun> <PublishReadyToRun>true</PublishReadyToRun>
<PublishSingleFile>true</PublishSingleFile> <PublishSingleFile>true</PublishSingleFile>

50
Wabbajack.Lib/ModListRegistry/ModListMetadata.cs
View File

@ -60,6 +60,8 @@ namespace Wabbajack.Lib.ModListRegistry
public ModListSummary ValidationSummary { get; set; } = new ModListSummary(); public ModListSummary ValidationSummary { get; set; } = new ModListSummary();
[JsonName("repositoryName")] public string RepositoryName { get; set; } = string.Empty; [JsonName("repositoryName")] public string RepositoryName { get; set; } = string.Empty;
[JsonIgnore] public string NamespacedName => $"{RepositoryName}/{Links.MachineURL}"; [JsonIgnore] public string NamespacedName => $"{RepositoryName}/{Links.MachineURL}";
[JsonIgnore] public bool IsFeatured { get; set; }
[JsonName("Links")] [JsonName("Links")]
public class LinksObject public class LinksObject
@ -120,41 +122,43 @@ namespace Wabbajack.Lib.ModListRegistry
return repositories!; return repositories!;
} }
public static async Task<HashSet<string>> LoadFeatured()
{
var client = new Http.Client();
var repositories = (await client.GetStringAsync("https://raw.githubusercontent.com/wabbajack-tools/mod-lists/master/featured_lists.json"))
.FromJsonString<string[]>();
return repositories!.ToHashSet();
}
public static async Task<ModlistMetadata[]> LoadModlists() public static async Task<ModlistMetadata[]> LoadModlists()
{ {
var repos = await LoadRepositories(); var repos = await LoadRepositories();
var featured = await LoadFeatured();
List<ModlistMetadata> metadatas = new(); List<ModlistMetadata> metadatas = new();
var client = new Http.Client(); var client = new Http.Client();
foreach (var repo in repos) foreach (var repo in repos)
{ {
var newData = (await client.GetStringAsync(repo.Value)) try
.FromJsonString<ModlistMetadata[]>() {
.Select(meta => var newData = (await client.GetStringAsync(repo.Value))
{ .FromJsonString<ModlistMetadata[]>()
meta.RepositoryName = repo.Key; .Select(meta =>
return meta; {
}); meta.RepositoryName = repo.Key;
metadatas.AddRange(newData); meta.IsFeatured = meta.RepositoryName == "wj-featured" || featured.Contains(meta.NamespacedName);
return meta;
});
metadatas.AddRange(newData);
}
catch (JsonException je)
{
Utils.Log($"Parsing {repo.Key} got a json parse exception {je}");
}
} }
return metadatas.ToArray(); return metadatas.ToArray();
} }
public static async Task<List<ModlistMetadata>> LoadUnlistedFromGithub()
{
try
{
var client = new Http.Client();
return (await client.GetStringAsync(Consts.UnlistedModlistMetadataURL)).FromJsonString<List<ModlistMetadata>>();
}
catch (Exception)
{
Utils.LogStatus("Error loading unlisted modlists");
return new List<ModlistMetadata>();
}
}
public async ValueTask<bool> NeedsDownload(AbsolutePath modlistPath) public async ValueTask<bool> NeedsDownload(AbsolutePath modlistPath)
{ {
if (!modlistPath.Exists) return true; if (!modlistPath.Exists) return true;

6
Wabbajack/Wabbajack.csproj
View File

@ -6,9 +6,9 @@
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<RuntimeIdentifier>win10-x64</RuntimeIdentifier> <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
<AssemblyVersion>2.5.3.10</AssemblyVersion> <AssemblyVersion>2.5.3.12</AssemblyVersion>
<FileVersion>2.5.3.10</FileVersion> <FileVersion>2.5.3.12</FileVersion>
<Copyright>Copyright © 2019-2021</Copyright> <Copyright>Copyright © 2019-2022</Copyright>
<Description>An automated ModList installer</Description> <Description>An automated ModList installer</Description>
<PublishReadyToRun>true</PublishReadyToRun> <PublishReadyToRun>true</PublishReadyToRun>
<StartupObject></StartupObject> <StartupObject></StartupObject>

4
buildall.bat
View File

@ -2,6 +2,8 @@ dotnet clean
dotnet restore dotnet restore
dotnet publish Wabbajack\Wabbajack.csproj --runtime win10-x64 --configuration Release /p:Platform=x64 -o M:\Games\wabbajack_files\app --self-contained dotnet publish Wabbajack\Wabbajack.csproj --runtime win10-x64 --configuration Release /p:Platform=x64 -o M:\Games\wabbajack_files\app --self-contained
dotnet publish Wabbajack.Launcher\Wabbajack.Launcher.csproj --runtime win10-x64 --configuration Release /p:Platform=x64 -o M:\Games\wabbajack_files\launcher --self-contained dotnet publish Wabbajack.Launcher\Wabbajack.Launcher.csproj --runtime win10-x64 --configuration Release /p:Platform=x64 -o M:\Games\wabbajack_files\launcher --self-contained
dotnet publish c:\oss\Wabbajack\Wabbajack.CLI\Wabbajack.CLI.csproj --runtime win10-x64 --configuration Release /p:Platform=x64 -o M:\Games\wabbajack_files\cli --self-contained
"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool.exe" sign /t http://timestamp.sectigo.com M:\Games\wabbajack_files\launcher\Wabbajack.exe "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool.exe" sign /t http://timestamp.sectigo.com M:\Games\wabbajack_files\launcher\Wabbajack.exe
"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool.exe" sign /t http://timestamp.sectigo.com M:\Games\wabbajack_files\app\Wabbajack.exe "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool.exe" sign /t http://timestamp.sectigo.com M:\Games\wabbajack_files\app\Wabbajack.exe
"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool.exe" sign /t http://timestamp.sectigo.com M:\Games\wabbajack_files\app\wabbajack-cli.exe "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool.exe" sign /t http://timestamp.sectigo.com M:\Games\wabbajack_files\app\wabbajack-cli.exe
"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool.exe" sign /t http://timestamp.sectigo.com M:\Games\wabbajack_files\cli\wabbajack-cli.exe