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

fixup some modlist definition mappings

Browse Source
This commit is contained in:
Timothy Baldridge 2019-10-20 13:30:39 -06:00
parent f851432d51
commit f1e316f544
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Wabbajack.Common/Consts.cs
View File

@ -53,7 +53,7 @@ namespace Wabbajack.Common
public static string ModPermissionsURL = "https://raw.githubusercontent.com/wabbajack-tools/opt-out-lists/master/NexusModPermissions.yml"; public static string ModPermissionsURL = "https://raw.githubusercontent.com/wabbajack-tools/opt-out-lists/master/NexusModPermissions.yml";
public static string ServerWhitelistURL = "https://raw.githubusercontent.com/wabbajack-tools/opt-out-lists/master/ServerWhitelist.yml"; public static string ServerWhitelistURL = "https://raw.githubusercontent.com/wabbajack-tools/opt-out-lists/master/ServerWhitelist.yml";
public static string ModlistMetadataURL = "https://raw.githubusercontent.com/wabbajack-tools/wabbajack-tools.github.io/code/src/assets/states/modlistState.json"; public static string ModlistMetadataURL = "https://raw.githubusercontent.com/wabbajack-tools/mod-lists/master/modlists.json";
public static string UserAgent public static string UserAgent
{ {

3
Wabbajack/UI/DownloadWindow.xaml.cs
View File

@ -53,7 +53,6 @@ namespace Wabbajack.UI
_url = url; _url = url;
_downloadName = name; _downloadName = name;
_destination = destination; _destination = destination;
_resultFn = resultFn;
Start(); Start();
} }
@ -69,7 +68,6 @@ namespace Wabbajack.UI
_parent.Result = DownloadWindow.WindowResult.Completed; _parent.Result = DownloadWindow.WindowResult.Completed;
_parent.Dispatcher.Invoke(() => _parent.Close()); _parent.Dispatcher.Invoke(() => _parent.Close());
_resultFn(DownloadWindow.WindowResult.Completed);
}); });
_downloadThread.Start(); _downloadThread.Start();
} }
@ -83,7 +81,6 @@ namespace Wabbajack.UI
File.Delete(_destination); File.Delete(_destination);
_parent.Result = DownloadWindow.WindowResult.Canceled; _parent.Result = DownloadWindow.WindowResult.Canceled;
_resultFn(DownloadWindow.WindowResult.Canceled);
} }

4
Wabbajack/UI/ModeSelectionWindow.xaml.cs
View File

@ -47,6 +47,10 @@ namespace Wabbajack
// UIUtils.OpenFileDialog($"Wabbajack Modlist (*{Consts.ModlistExtension})|*{Consts.ModlistExtension}")); // UIUtils.OpenFileDialog($"Wabbajack Modlist (*{Consts.ModlistExtension})|*{Consts.ModlistExtension}"));
var result = ((ModeSelectionWindowViewModel)DataContext).Download(); var result = ((ModeSelectionWindowViewModel)DataContext).Download();
if (result != null)
{
OpenMainWindow(RunMode.Install, result);
}
} }
private void OpenMainWindow(RunMode mode, string file) private void OpenMainWindow(RunMode mode, string file)

9
Wabbajack/UI/ModeSelectionWindowViewModel.cs
View File

@ -40,15 +40,10 @@ namespace Wabbajack.UI
if (!Directory.Exists(Consts.ModListDownloadFolder)) if (!Directory.Exists(Consts.ModListDownloadFolder))
Directory.CreateDirectory(Consts.ModListDownloadFolder); Directory.CreateDirectory(Consts.ModListDownloadFolder);
string dest = Path.Combine(Consts.ModListDownloadFolder, SelectedModList.Links.MachineURL); string dest = Path.Combine(Consts.ModListDownloadFolder, SelectedModList.Links.MachineURL + Consts.ModlistExtension);
string result = null; string result = null;
var window = new DownloadWindow(SelectedModList.Links.Download, SelectedModList.Title, dest, var window = new DownloadWindow(SelectedModList.Links.Download, SelectedModList.Title, dest);
complete =>
{
if (complete == DownloadWindow.WindowResult.Completed)
result = dest;
});
window.ShowDialog(); window.ShowDialog();
if (window.Result == DownloadWindow.WindowResult.Completed) if (window.Result == DownloadWindow.WindowResult.Completed)