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

Merge pull request #1302 from LostDragonist/ld_fixes

Browse Source 
LD Fixes
This commit is contained in:
Timothy Baldridge 2021-02-08 17:06:38 -07:00 committed by GitHub
commit 9512dba665
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 63 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
Wabbajack.Common/GameMetaData.cs
View File

@ -12,7 +12,7 @@ using Wabbajack.Common.StoreHandlers;
namespace Wabbajack.Common
{
[JsonConverter(typeof(StringEnumConverter))]
public enum Game
public enum Game
{
//MO2 GAMES
Morrowind,
@ -78,7 +78,7 @@ namespace Wabbajack.Common
// C:\ProgramData\Origin\LocalContent\{game name)\*.mfst
// So for DA:O this is "DR208591800.mfst" -> "DR:208591800"
public List<string> OriginIDs { get; set; } = new();
public List<string> EpicGameStoreIDs { get; internal set; } = new List<string>();
// to get BethNet IDs: check the registry
@ -139,7 +139,7 @@ namespace Wabbajack.Common
path = _cachedPath;
return true;
}
var ret = TryGetGameLocation();
if (ret != null)
{
@ -166,7 +166,7 @@ namespace Wabbajack.Common
{
}
}
public static class EnumExtensions
{
public static string GetDescription<T>(this T enumerationValue)
@ -236,7 +236,7 @@ namespace Wabbajack.Common
result = GetByMO2ArchiveName(someName);
if (result != null) return result;
result = GetByMO2Name(someName);
if (result != null) return result;
@ -482,35 +482,35 @@ namespace Wabbajack.Common
MainExecutable = @"Binaries\Win32\Dishonored.exe"
}
},
{
Game.Witcher3, new GameMetaData
{
Game = Game.Witcher3,
NexusName = "witcher3",
{
Game.Witcher3, new GameMetaData
{
Game = Game.Witcher3,
NexusName = "witcher3",
NexusGameId = 952,
MO2Name = "The Witcher 3: Wild Hunt",
SteamIDs = new List<int>{292030, 499450}, // normal and GotY
GOGIDs = new List<int>{1207664643, 1495134320, 1207664663, 1640424747}, // normal, GotY and both in packages
RequiredFiles = new List<string>
{
"bin\\x64\\witcher3.exe"
SteamIDs = new List<int>{292030, 499450}, // normal and GotY
GOGIDs = new List<int>{1207664643, 1495134320, 1207664663, 1640424747}, // normal, GotY and both in packages
RequiredFiles = new List<string>
{
"bin\\x64\\witcher3.exe"
},
MainExecutable = @"bin\x64\witcher3.exe"
}
},
{
Game.StardewValley, new GameMetaData
{
Game = Game.StardewValley,
{
Game.StardewValley, new GameMetaData
{
Game = Game.StardewValley,
NexusName = "stardewvalley",
MO2Name = "Stardew Valley",
NexusGameId = 1303,
SteamIDs = new List<int>{413150},
SteamIDs = new List<int>{413150},
GOGIDs = new List<int>{1453375253},
IsGenericMO2Plugin = true,
RequiredFiles = new List<string>
{
"Stardew Valley.exe"
RequiredFiles = new List<string>
{
"Stardew Valley.exe"
},
MainExecutable = "Stardew Valley.exe"
}
@ -550,69 +550,69 @@ namespace Wabbajack.Common
MainExecutable = @"MW5Mercs\Binaries\Win64\MechWarrior-Win64-Shipping.exe"
}
},
{
Game.NoMansSky, new GameMetaData
{
Game = Game.NoMansSky,
NexusName = "nomanssky",
{
Game.NoMansSky, new GameMetaData
{
Game = Game.NoMansSky,
NexusName = "nomanssky",
NexusGameId = 1634,
MO2Name = "No Man's Sky",
SteamIDs = new List<int>{275850},
GOGIDs = new List<int>{1446213994},
RequiredFiles = new List<string>
{
@"Binaries\NMS.exe"
RequiredFiles = new List<string>
{
@"Binaries\NMS.exe"
},
MainExecutable = @"Binaries\NMS.exe"
MainExecutable = @"Binaries\NMS.exe"
}
},
{
Game.DragonAgeOrigins, new GameMetaData
{
{
Game.DragonAgeOrigins, new GameMetaData
{
Game = Game.DragonAgeOrigins,
NexusName = "dragonage",
NexusName = "dragonage",
NexusGameId = 140,
MO2Name = "Dragon Age: Origins", // Probably wrong
MO2Name = "Dragon Age: Origins",
SteamIDs = new List<int>{47810},
OriginIDs = new List<string>{"DR:208591800"},
OriginIDs = new List<string>{"DR:169789300", "DR:208591800"},
GOGIDs = new List<int>{1949616134},
RequiredFiles = new List<string>
{
@"bin_ship\daorigins.exe"
RequiredFiles = new List<string>
{
@"bin_ship\daorigins.exe"
},
MainExecutable = @"bin_ship\daorigins.exe"
MainExecutable = @"bin_ship\daorigins.exe"
}
},
{
Game.DragonAge2, new GameMetaData
{
{
Game.DragonAge2, new GameMetaData
{
Game = Game.DragonAge2,
NexusName = "dragonage2",
NexusName = "dragonage2",
NexusGameId = 141,
MO2Name = "Dragon Age 2", // Probably wrong
SteamIDs = new List<int>{1238040},
OriginIDs = new List<string>{"OFB-EAST:59474"},
RequiredFiles = new List<string>
{
@"bin_ship\DragonAge2.exe"
RequiredFiles = new List<string>
{
@"bin_ship\DragonAge2.exe"
},
MainExecutable = @"bin_ship\DragonAge2.exe"
MainExecutable = @"bin_ship\DragonAge2.exe"
}
},
{
Game.DragonAgeInquisition, new GameMetaData
{
{
Game.DragonAgeInquisition, new GameMetaData
{
Game = Game.DragonAgeInquisition,
NexusName = "dragonageinquisition",
NexusName = "dragonageinquisition",
NexusGameId = 728,
MO2Name = "Dragon Age: Inquisition", // Probably wrong
SteamIDs = new List<int>{1222690},
OriginIDs = new List<string>{"OFB-EAST:51937"},
RequiredFiles = new List<string>
{
@"DragonAgeInquisition.exe"
RequiredFiles = new List<string>
{
@"DragonAgeInquisition.exe"
},
MainExecutable = @"DragonAgeInquisition.exe"
MainExecutable = @"DragonAgeInquisition.exe"
}
}
};

41
Wabbajack.Lib/Downloaders/ManualDownloader.cs
View File

@ -13,11 +13,6 @@ namespace Wabbajack.Lib.Downloaders
{
public class ManualDownloader : IDownloader
{
private FileSystemWatcher _watcher;
private Subject<FileEvent> _fileEvents = new Subject<FileEvent>();
private KnownFolder _downloadfolder;
public readonly AsyncLock Lock = new AsyncLock();
class FileEvent
{
public string FullPath { get; set; } = string.Empty;
@ -27,36 +22,6 @@ namespace Wabbajack.Lib.Downloaders
public ManualDownloader()
{
_downloadfolder = new KnownFolder(KnownFolderType.Downloads);
_watcher = new FileSystemWatcher(_downloadfolder.Path);
_watcher.Created += _watcher_Created;
_watcher.Changed += _watcher_Changed;
}
private void _watcher_Changed(object sender, FileSystemEventArgs e)
{
PublishEvent(e);
}
private void _watcher_Created(object sender, FileSystemEventArgs e)
{
PublishEvent(e);
}
private void PublishEvent(FileSystemEventArgs e)
{
try
{
_fileEvents.OnNext(new FileEvent
{
Size = new FileInfo(e.FullPath).Length,
Name = e.Name!,
FullPath = e.FullPath
});
}
catch (IOException)
{
}
}
public async Task<AbstractDownloadState?> GetDownloaderState(dynamic archiveINI, bool quickMode)
@ -68,12 +33,12 @@ namespace Wabbajack.Lib.Downloaders
public async Task Prepare()
{
}
[JsonName("ManualDownloader")]
public class State : AbstractDownloadState
{
public string Url { get; }
[JsonIgnore]
public override object[] PrimaryKey => new object[] { Url };
@ -111,7 +76,7 @@ namespace Wabbajack.Lib.Downloaders
public override string[] GetMetaIni()
{
return new []
return new []
{
"[General]",
$"manualURL={Url}",

4
Wabbajack/Views/Settings/PerformanceSettingsView.xaml
View File

@ -52,7 +52,7 @@
FormatString="F0"
Increment="2"
Maximum="128"
Minimum="2" />
Minimum="1" />
<TextBlock Grid.Row="4" Grid.Column="0"
x:Name="DiskThreadsLabel"
VerticalAlignment="Center"
@ -66,7 +66,7 @@
FormatString="F0"
Increment="2"
Maximum="128"
Minimum="2" />
Minimum="1" />
<TextBlock Grid.Row="5" Grid.Column="0"
x:Name="ReduceHDDThreadsLabel"
VerticalAlignment="Center"