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

HOTFIX: Fix game file sources that don't have MO2 specific names

Browse Source
This commit is contained in:
Timothy Baldridge
2021-01-13 18:53:08 -07:00
parent 997587d674
commit c8abca742a
9 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,5 +1,8 @@
### Changelog ### Changelog
#### Version - 2.4.1.1 - 1/13/2020
* HOTFIX: Fix game file sources that don't have MO2 specific names
#### Version - 2.4.1.0 - 1/12/2020 #### Version - 2.4.1.0 - 1/12/2020
* Fix errors with broken SQL DBs crashing the system * Fix errors with broken SQL DBs crashing the system
* Fix errors with bad SQL clean commands * Fix errors with bad SQL clean commands

4
Wabbajack.CLI/Wabbajack.CLI.csproj
View File

@ -6,8 +6,8 @@
<AssemblyName>wabbajack-cli</AssemblyName> <AssemblyName>wabbajack-cli</AssemblyName>
<Company>Wabbajack</Company> <Company>Wabbajack</Company>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<AssemblyVersion>2.4.1.0</AssemblyVersion> <AssemblyVersion>2.4.1.1</AssemblyVersion>
<FileVersion>2.4.1.0</FileVersion> <FileVersion>2.4.1.1</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright> <Copyright>Copyright © 2019-2020</Copyright>
<Description>An automated ModList installer</Description> <Description>An automated ModList installer</Description>
<PublishReadyToRun>true</PublishReadyToRun> <PublishReadyToRun>true</PublishReadyToRun>

1
Wabbajack.Common/Paths/RelativePath.cs
View File

@ -143,7 +143,6 @@ namespace Wabbajack.Common
{ {
return _path.StartsWith(s._path, StringComparison.OrdinalIgnoreCase); return _path.StartsWith(s._path, StringComparison.OrdinalIgnoreCase);
} }
public RelativePath Combine(params RelativePath[] paths ) public RelativePath Combine(params RelativePath[] paths )
{ {
return (RelativePath)Path.Combine(paths.Select(p => (string)p).Cons(_path).ToArray()); return (RelativePath)Path.Combine(paths.Select(p => (string)p).Cons(_path).ToArray());

4
Wabbajack.Launcher/Wabbajack.Launcher.csproj
View File

@ -4,8 +4,8 @@
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net5.0-windows</TargetFramework> <TargetFramework>net5.0-windows</TargetFramework>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<AssemblyVersion>2.4.1.0</AssemblyVersion> <AssemblyVersion>2.4.1.1</AssemblyVersion>
<FileVersion>2.4.1.0</FileVersion> <FileVersion>2.4.1.1</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright> <Copyright>Copyright © 2019-2020</Copyright>
<Description>Wabbajack Application Launcher</Description> <Description>Wabbajack Application Launcher</Description>
<PublishReadyToRun>true</PublishReadyToRun> <PublishReadyToRun>true</PublishReadyToRun>

23
Wabbajack.Lib/ACompiler.cs
View File

@ -198,7 +198,7 @@ namespace Wabbajack.Lib
return new IndexedArchive( return new IndexedArchive(
VFS.Index.ByRootPath[ag.MetaData().GameLocation().Combine(state.GameFile)]) VFS.Index.ByRootPath[ag.MetaData().GameLocation().Combine(state.GameFile)])
{ {
IniData = ini, Meta = meta IniData = ini, Meta = meta, Name = state.GameFile.Munge().ToString()
}; };
})); }));
} }
@ -223,11 +223,13 @@ namespace Wabbajack.Lib
a.State = (await ResolveArchive(a)).State; a.State = (await ResolveArchive(a)).State;
return null; return null;
} }
catch catch (Exception ex)
{ {
Utils.Log(ex.ToString());
return a; return a;
} }
})).NotNull().ToHashSet(); }))
.NotNull().ToHashSet();
if (remove.Count == 0) if (remove.Count == 0)
{ {
@ -509,20 +511,23 @@ namespace Wabbajack.Lib
Error( Error(
$"No download metadata found for {archive.Name}, please use MO2 to query info or add a .meta file and try again."); $"No download metadata found for {archive.Name}, please use MO2 to query info or add a .meta file and try again.");
var result = new Archive(await DownloadDispatcher.ResolveArchive(archive.IniData)); var state = (AbstractDownloadState?)await DownloadDispatcher.ResolveArchive(archive.IniData);
if (result.State == null) if (state == null)
Error($"{archive.Name} could not be handled by any of the downloaders"); Error($"{archive.Name} could not be handled by any of the downloaders");
result.Name = archive.Name ?? ""; var result = new Archive(state!)
result.Hash = archive.File.Hash; {
result.Size = archive.File.Size; Name = archive.Name ?? "",
Hash = archive.File.Hash,
Size = archive.File.Size
};
await result.State!.GetDownloader().Prepare(); await result.State!.GetDownloader().Prepare();
var token = new CancellationTokenSource(); var token = new CancellationTokenSource();
token.CancelAfter(Consts.MaxVerifyTime); token.CancelAfter(Consts.MaxVerifyTime);
if (result.State != null && !await result.State.Verify(result, token.Token)) if (!await result.State.Verify(result, token.Token))
Error( Error(
$"Unable to resolve link for {archive.Name}. If this is hosted on the Nexus the file may have been removed."); $"Unable to resolve link for {archive.Name}. If this is hosted on the Nexus the file may have been removed.");

3
Wabbajack.Lib/Downloaders/GameFileSourceDownloader.cs
View File

@ -98,7 +98,8 @@ namespace Wabbajack.Lib.Downloaders
public override string[] GetMetaIni() public override string[] GetMetaIni()
{ {
return new[] {"[General]", $"gameName={Game.MetaData().MO2ArchiveName}", $"gameFile={GameFile}"}; var meta = Game.MetaData();
return new[] {"[General]", $"gameName={meta.MO2ArchiveName ?? meta.Game.ToString()}", $"gameFile={GameFile}"};
} }
} }

2
Wabbajack.Lib/NexusApi/Dtos.cs
View File

@ -16,7 +16,7 @@ namespace Wabbajack.Lib.NexusApi
public class NexusFileInfo public class NexusFileInfo
{ {
public long category_id { get; set; } public long category_id { get; set; }
public string category_name { get; set; } = string.Empty; public string? category_name { get; set; } = null;
public string changelog_html { get; set; } = string.Empty; public string changelog_html { get; set; } = string.Empty;
public string description { get; set; } = string.Empty; public string description { get; set; } = string.Empty;
public string external_virus_scan_url { get; set; } = string.Empty; public string external_virus_scan_url { get; set; } = string.Empty;

4
Wabbajack.Server/Wabbajack.Server.csproj
View File

@ -3,8 +3,8 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net5.0-windows</TargetFramework> <TargetFramework>net5.0-windows</TargetFramework>
<AssemblyVersion>2.4.1.0</AssemblyVersion> <AssemblyVersion>2.4.1.1</AssemblyVersion>
<FileVersion>2.4.1.0</FileVersion> <FileVersion>2.4.1.1</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright> <Copyright>Copyright © 2019-2020</Copyright>
<Description>Wabbajack Server</Description> <Description>Wabbajack Server</Description>
<RuntimeIdentifier>win-x64</RuntimeIdentifier> <RuntimeIdentifier>win-x64</RuntimeIdentifier>

4
Wabbajack/Wabbajack.csproj
View File

@ -6,8 +6,8 @@
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<RuntimeIdentifier>win10-x64</RuntimeIdentifier> <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
<AssemblyVersion>2.4.1.0</AssemblyVersion> <AssemblyVersion>2.4.1.1</AssemblyVersion>
<FileVersion>2.4.1.0</FileVersion> <FileVersion>2.4.1.1</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright> <Copyright>Copyright © 2019-2020</Copyright>
<Description>An automated ModList installer</Description> <Description>An automated ModList installer</Description>
<PublishReadyToRun>true</PublishReadyToRun> <PublishReadyToRun>true</PublishReadyToRun>