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

CompilerVM: Mo2Folder and MOProfile made derivative

Browse Source
This commit is contained in:
Justin Swanson 2019-11-09 15:26:23 -06:00
parent 3804b5d35b
commit 0ef91d9da8
2 changed files with 58 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Wabbajack/Settings.cs
View File

@ -64,7 +64,6 @@ namespace Wabbajack
public string Website { get; set; } public string Website { get; set; }
public string Readme { get; set; } public string Readme { get; set; }
public string SplashScreen { get; set; } public string SplashScreen { get; set; }
public string Location { get; set; }
public string DownloadLocation { get; set; } public string DownloadLocation { get; set; }
} }
} }

76
Wabbajack/View Models/CompilerVM.cs
View File

@ -17,11 +17,11 @@ namespace Wabbajack
{ {
public MainWindowVM MWVM { get; } public MainWindowVM MWVM { get; }
[Reactive] private readonly ObservableAsPropertyHelper<string> _Mo2Folder;
public string Mo2Folder { get; set; } public string Mo2Folder => _Mo2Folder.Value;
[Reactive] private readonly ObservableAsPropertyHelper<string> _MOProfile;
public string MOProfile { get; set; } public string MOProfile => _MOProfile.Value;
[Reactive] [Reactive]
public string ModListName { get; set; } public string ModListName { get; set; }
@ -109,12 +109,64 @@ namespace Wabbajack
}) })
.ToProperty(this, nameof(this.Image)); .ToProperty(this, nameof(this.Image));
ConfigureForBuild(source); this._Mo2Folder = this.WhenAny(x => x.ModlistLocation.TargetPath)
.Select(loc =>
{
try
{
var profile_folder = Path.GetDirectoryName(loc);
return Path.GetDirectoryName(Path.GetDirectoryName(profile_folder));
}
catch (Exception)
{
return null;
}
})
.ToProperty(this, nameof(this.Mo2Folder));
this._MOProfile = this.WhenAny(x => x.ModlistLocation.TargetPath)
.Select(loc =>
{
try
{
var profile_folder = Path.GetDirectoryName(loc);
return Path.GetFileName(profile_folder);
}
catch (Exception)
{
return null;
}
})
.ToProperty(this, nameof(this.MOProfile));
// If Mo2 folder changes and download location is empty, set it for convenience
this.WhenAny(x => x.Mo2Folder)
.Where(x => Directory.Exists(x))
.Subscribe(x =>
{
try
{
var tmp_compiler = new Compiler(this.Mo2Folder);
this.DownloadLocation.TargetPath = tmp_compiler.MO2DownloadsFolder;
}
catch (Exception ex)
{
Utils.Log($"Error setting default download location {ex}");
}
})
.DisposeWith(this.CompositeDisposable);
// Load settings // Load settings
CompilationSettings settings = this.MWVM.Settings.CompilationSettings.TryCreate(source); CompilationSettings settings = this.MWVM.Settings.CompilationSettings.TryCreate(source);
this.AuthorText = settings.Author; this.AuthorText = settings.Author;
this.ModListName = settings.ModListName; if (string.IsNullOrWhiteSpace(settings.ModListName))
{
// Set ModlistName initially off just the MO2Profile
this.ModListName = this.MOProfile;
}
else
{
this.ModListName = settings.ModListName;
}
this.Description = settings.Description; this.Description = settings.Description;
this.ReadMeText.TargetPath = settings.Readme; this.ReadMeText.TargetPath = settings.Readme;
this.ImagePath.TargetPath = settings.SplashScreen; this.ImagePath.TargetPath = settings.SplashScreen;
@ -123,10 +175,6 @@ namespace Wabbajack
{ {
this.DownloadLocation.TargetPath = settings.DownloadLocation; this.DownloadLocation.TargetPath = settings.DownloadLocation;
} }
if (!string.IsNullOrWhiteSpace(settings.Location))
{
this.ModlistLocation.TargetPath = settings.Location;
}
this.MWVM.Settings.SaveSignal this.MWVM.Settings.SaveSignal
.Subscribe(_ => .Subscribe(_ =>
{ {
@ -136,7 +184,6 @@ namespace Wabbajack
settings.Readme = this.ReadMeText.TargetPath; settings.Readme = this.ReadMeText.TargetPath;
settings.SplashScreen = this.ImagePath.TargetPath; settings.SplashScreen = this.ImagePath.TargetPath;
settings.Website = this.Website; settings.Website = this.Website;
settings.Location = this.ModlistLocation.TargetPath;
settings.DownloadLocation = this.DownloadLocation.TargetPath; settings.DownloadLocation = this.DownloadLocation.TargetPath;
}) })
.DisposeWith(this.CompositeDisposable); .DisposeWith(this.CompositeDisposable);
@ -145,17 +192,10 @@ namespace Wabbajack
private void ConfigureForBuild(string location) private void ConfigureForBuild(string location)
{ {
var profile_folder = Path.GetDirectoryName(location); var profile_folder = Path.GetDirectoryName(location);
this.Mo2Folder = Path.GetDirectoryName(Path.GetDirectoryName(profile_folder));
if (!File.Exists(Path.Combine(this.Mo2Folder, "ModOrganizer.exe"))) if (!File.Exists(Path.Combine(this.Mo2Folder, "ModOrganizer.exe")))
{ {
Utils.Log($"Error! No ModOrganizer2.exe found in {this.Mo2Folder}"); Utils.Log($"Error! No ModOrganizer2.exe found in {this.Mo2Folder}");
} }
this.MOProfile = Path.GetFileName(profile_folder);
this.ModListName = this.MOProfile;
var tmp_compiler = new Compiler(this.Mo2Folder);
this.DownloadLocation.TargetPath = tmp_compiler.MO2DownloadsFolder;
} }
private async Task ExecuteBegin() private async Task ExecuteBegin()