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 #76 from Noggog/ViewModel

Browse Source 
ViewModel class /w RaiseAndSetIfChanged
This commit is contained in:
Timothy Baldridge 2019-10-10 05:30:21 -06:00 committed by GitHub
commit c980de3dd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 114 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
VS Snippets/guiprop.snippet Normal file
View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8" ?>
<CodeSnippets xmlns="http://schemas.microsoft.com/VisualStudio/2005/CodeSnippet">
<CodeSnippet Format="1.0.0">
<Header>
<Title>Notify property changed property</Title>
<Shortcut>guiprop</Shortcut>
<Description>Code snippet for a NotifyingPropertyChanged variable</Description>
<SnippetTypes>
<SnippetType>Expansion</SnippetType>
</SnippetTypes>
</Header>
<Snippet>
<Declarations>
<Literal>
<ID>type</ID>
<ToolTip>Property type</ToolTip>
<Default>int</Default>
</Literal>
<Literal>
<ID>property</ID>
<ToolTip>Property name</ToolTip>
<Default>MyProperty</Default>
</Literal>
</Declarations>
<Code Language="csharp"><![CDATA[private $type$ _$property$;
public $type$ $property$ { get => _$property$; set => this.RaiseAndSetIfChanged(ref _$property$, value); }$end$]]>
</Code>
</Snippet>
</CodeSnippet>
</CodeSnippets>

199
Wabbajack/AppState.cs
View File

@ -17,31 +17,11 @@ using Wabbajack.NexusApi;
namespace Wabbajack
{
internal class AppState : INotifyPropertyChanged, IDataErrorInfo
internal class AppState : ViewModel, IDataErrorInfo
{
private ICommand _begin;
private ICommand _changeDownloadPath;
private ICommand _changePath;
private string _downloadLocation;
private string _htmlReport;
private bool _ignoreMissingFiles;
private string _location;
private string _locationLabel;
private string _mo2Folder;
private string _mode;
private ModList _modList;
private string _modListName;
private int _queueProgress;
private ICommand _showReportCommand;
private ICommand _visitNexusSiteCommand;
private readonly DateTime _startTime;
@ -51,7 +31,6 @@ namespace Wabbajack
public AppState(Dispatcher d, string mode)
{
var image = new BitmapImage();
image.BeginInit();
image.StreamSource = Assembly.GetExecutingAssembly().GetManifestResourceStream("Wabbajack.banner.png");
@ -77,9 +56,6 @@ namespace Wabbajack
Mode = mode;
Dirty = false;
dispatcher = d;
Log = new ObservableCollection<string>();
Status = new ObservableCollection<CPUStatus>();
InternalStatus = new List<CPUStatus>();
var th = new Thread(() => UpdateLoop());
th.Priority = ThreadPriority.BelowNormal;
@ -100,90 +76,45 @@ namespace Wabbajack
public List<SlideShowItem> SlideShowElements = new List<SlideShowItem>();
private DateTime _lastSlideShowUpdate = new DateTime();
public ObservableCollection<string> Log { get; }
public ObservableCollection<CPUStatus> Status { get; }
public ObservableCollection<string> Log { get; } = new ObservableCollection<string>();
public ObservableCollection<CPUStatus> Status { get; } = new ObservableCollection<CPUStatus>();
public string Mode
{
get => _mode;
set
{
_mode = value;
OnPropertyChanged("Mode");
}
}
private string _Mode;
public string Mode { get => _Mode; set => this.RaiseAndSetIfChanged(ref _Mode, value); }
public string ModListName
{
get => _modListName;
set
{
_modListName = value;
OnPropertyChanged("ModListName");
}
}
private string _ModListName;
public string ModListName { get => _ModListName; set => this.RaiseAndSetIfChanged(ref _ModListName, value); }
public string Location
{
get => _location;
set
{
_location = value;
OnPropertyChanged("Location");
}
}
private string _Location;
public string Location { get => _Location; set => this.RaiseAndSetIfChanged(ref _Location, value); }
public string LocationLabel
{
get => _locationLabel;
set
{
_locationLabel = value;
OnPropertyChanged("LocationLabel");
}
}
private string _LocationLabel;
public string LocationLabel { get => _LocationLabel; set => this.RaiseAndSetIfChanged(ref _LocationLabel, value); }
public string DownloadLocation
{
get => _downloadLocation;
set
{
_downloadLocation = value;
OnPropertyChanged("DownloadLocation");
}
}
private string _DownloadLocation;
public string DownloadLocation { get => _DownloadLocation; set => this.RaiseAndSetIfChanged(ref _DownloadLocation, value); }
public Visibility ShowReportButton => _htmlReport == null ? Visibility.Collapsed : Visibility.Visible;
private string _htmlReport;
public string HTMLReport
{
get => _htmlReport;
set
{
_htmlReport = value;
OnPropertyChanged("HTMLReport");
OnPropertyChanged("ShowReportButton");
RaisePropertyChanged();
RaisePropertyChanged(nameof(ShowReportButton));
}
}
public int QueueProgress
{
get => _queueProgress;
set
{
if (value != _queueProgress)
{
_queueProgress = value;
OnPropertyChanged("QueueProgress");
}
}
}
private int _QueueProgress;
public int QueueProgress { get => _QueueProgress; set => this.RaiseAndSetIfChanged(ref _QueueProgress, value); }
private List<CPUStatus> InternalStatus { get; }
private List<CPUStatus> InternalStatus { get; } = new List<CPUStatus>();
public string LogFile { get; }
private ICommand _changePath;
public ICommand ChangePath
{
get
@ -193,6 +124,7 @@ namespace Wabbajack
}
}
private ICommand _changeDownloadPath;
public ICommand ChangeDownloadPath
{
get
@ -203,6 +135,7 @@ namespace Wabbajack
}
}
private ICommand _begin;
public ICommand Begin
{
get
@ -212,6 +145,7 @@ namespace Wabbajack
}
}
private ICommand _showReportCommand;
public ICommand ShowReportCommand
{
get
@ -221,6 +155,7 @@ namespace Wabbajack
}
}
private ICommand _visitNexusSiteCommand;
public ICommand VisitNexusSiteCommand
{
get
@ -245,11 +180,7 @@ namespace Wabbajack
public bool UIReady
{
get => _uiReady;
set
{
_uiReady = value;
OnPropertyChanged("UIReady");
}
set => this.RaiseAndSetIfChanged(ref _uiReady, value);
}
private BitmapImage _wabbajackLogo = null;
@ -260,66 +191,25 @@ namespace Wabbajack
set
{
_splashScreenImage = value;
OnPropertyChanged("SplashScreenImage");
RaisePropertyChanged();
}
}
public string _splashScreenModName = "Wabbajack";
public string SplashScreenModName
{
get => _splashScreenModName;
set
{
_splashScreenModName = value;
OnPropertyChanged("SplashScreenModName");
}
}
private string _SplashScreenModName = "Wabbajack";
public string SplashScreenModName { get => _SplashScreenModName; set => this.RaiseAndSetIfChanged(ref _SplashScreenModName, value); }
public string _splashScreenAuthorName = "Halgari & the Wabbajack Team";
public string SplashScreenAuthorName
{
get => _splashScreenAuthorName;
set
{
_splashScreenAuthorName = value;
OnPropertyChanged("SplashScreenAuthorName");
}
}
private string _SplashScreenAuthorName = "Halgari & the Wabbajack Team";
public string SplashScreenAuthorName { get => _SplashScreenAuthorName; set => this.RaiseAndSetIfChanged(ref _SplashScreenAuthorName, value); }
public string _splashScreenSummary = "";
private string _modListPath;
public string SplashScreenSummary
{
get => _splashScreenSummary;
set
{
_splashScreenSummary = value;
OnPropertyChanged("SplashScreenSummary");
}
}
private string _SplashScreenSummary;
public string SplashScreenSummary { get => _SplashScreenSummary; set => this.RaiseAndSetIfChanged(ref _SplashScreenSummary, value); }
public event PropertyChangedEventHandler PropertyChanged;
public string Error => "Error";
public void OnPropertyChanged(string name)
{
if(PropertyChanged != null)
{
PropertyChanged(this, new PropertyChangedEventArgs(name));
}
}
public string Error
{
get { return "Error"; }
}
public string this[string columnName] => Validate(columnName);
public string this[string columnName]
{
get
{
return Validate(columnName);
}
}
private string Validate(string columnName)
{
string validationMessage = null;
@ -449,7 +339,7 @@ namespace Wabbajack
Dirty = true;
while (id >= InternalStatus.Count) InternalStatus.Add(new CPUStatus());
InternalStatus[id] = new CPUStatus {ID = id, Msg = msg, Progress = progress};
InternalStatus[id] = new CPUStatus { ID = id, Msg = msg, Progress = progress };
}
}
@ -469,7 +359,7 @@ namespace Wabbajack
if (folder != null)
{
Location = folder;
if (_downloadLocation == null)
if (DownloadLocation == null)
DownloadLocation = Path.Combine(Location, "downloads");
}
}
@ -510,7 +400,6 @@ namespace Wabbajack
Process.Start(file);
}
private void ExecuteBegin()
{
UIReady = false;
@ -574,15 +463,13 @@ namespace Wabbajack
Utils.Log("Cannot compile modlist: no valid Mod Organizer profile directory selected.");
UIReady = true;
}
}
}
}
public class CPUStatus
{
public int Progress { get; internal set; }
public string Msg { get; internal set; }
public int ID { get; internal set; }
}
public class CPUStatus
{
public int Progress { get; internal set; }
public string Msg { get; internal set; }
public int ID { get; internal set; }
}
}

33
Wabbajack/NexusApi/NexusApi.cs
View File

@ -16,13 +16,13 @@ using WebSocketSharp;
namespace Wabbajack.NexusApi
{
public class NexusApiClient : INotifyPropertyChanged
public class NexusApiClient : ViewModel
{
private static readonly string API_KEY_CACHE_FILE = "nexus.key_cache";
private static readonly uint CACHED_VERSION_NUMBER = 1;
private readonly HttpClient _httpClient;
@ -136,9 +136,8 @@ namespace Wabbajack.NexusApi
_dailyRemaining = Math.Min(dailyRemaining, hourlyRemaining);
_hourlyRemaining = Math.Min(dailyRemaining, hourlyRemaining);
}
OnPropertyChanged(nameof(DailyRemaining));
OnPropertyChanged(nameof(HourlyRemaining));
RaisePropertyChanged(nameof(DailyRemaining));
RaisePropertyChanged(nameof(HourlyRemaining));
}
#endregion
@ -157,7 +156,7 @@ namespace Wabbajack.NexusApi
headers.Add("Application-Name", Consts.AppName);
headers.Add("Application-Version", $"{Assembly.GetEntryAssembly().GetName().Version}");
}
private T Get<T>(string url)
{
Task<HttpResponseMessage> responseTask = _httpClient.GetAsync(url, HttpCompletionOption.ResponseHeadersRead);
@ -171,7 +170,7 @@ namespace Wabbajack.NexusApi
return stream.FromJSON<T>();
}
}
public string GetNexusDownloadLink(NexusMod archive, bool cache = false)
{
@ -214,7 +213,7 @@ namespace Wabbajack.NexusApi
Directory.CreateDirectory(Consts.NexusCacheDirectory);
ModInfo result = null;
TOP:
TOP:
var path = Path.Combine(Consts.NexusCacheDirectory, $"mod-info-{archive.GameName}-{archive.ModID}.json");
try
{
@ -250,7 +249,7 @@ namespace Wabbajack.NexusApi
Utils.Status($"Endorsing ${mod.GameName} - ${mod.ModID}");
var url = $"https://api.nexusmods.com/v1/games/{ConvertGameName(mod.GameName)}/mods/{mod.ModID}/endorse.json";
var content = new FormUrlEncodedContent(new Dictionary<string, string> {{"version", mod.Version}});
var content = new FormUrlEncodedContent(new Dictionary<string, string> { { "version", mod.Version } });
using (var stream = _httpClient.PostStreamSync(url, content))
{
@ -263,7 +262,7 @@ namespace Wabbajack.NexusApi
{
get
{
if (!Directory.Exists(Consts.NexusCacheDirectory)) return new SlideShowItem[]{};
if (!Directory.Exists(Consts.NexusCacheDirectory)) return new SlideShowItem[] { };
return Directory.EnumerateFiles(Consts.NexusCacheDirectory)
.Where(f => f.EndsWith(".json"))
@ -283,7 +282,7 @@ namespace Wabbajack.NexusApi
.Where(m => m._internal_version == CACHED_VERSION_NUMBER && m.picture_url != null)
.Select(m => new SlideShowItem
{
ImageURL = m.picture_url,
ImageURL = m.picture_url,
ModName = FixupSummary(m.name),
AuthorName = FixupSummary(m.author),
ModURL = GetModURL(m.game_name, m.mod_id),
@ -297,18 +296,6 @@ namespace Wabbajack.NexusApi
{
public string URI { get; set; }
}
#region INotifyPropertyChanged
public event PropertyChangedEventHandler PropertyChanged;
private void OnPropertyChanged(string name)
{
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
}
#endregion
}
}

30
Wabbajack/ViewModel.cs Normal file
View File

@ -0,0 +1,30 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text;
using System.Threading.Tasks;
namespace Wabbajack
{
public class ViewModel : INotifyPropertyChanged
{
public event PropertyChangedEventHandler PropertyChanged;
protected void RaisePropertyChanged([CallerMemberName] string name = null)
{
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
}
protected void RaiseAndSetIfChanged<T>(
ref T item,
T newItem,
[CallerMemberName] string propertyName = null)
{
if (EqualityComparer<T>.Default.Equals(item, newItem)) return;
item = newItem;
this.RaisePropertyChanged(propertyName);
}
}
}

1
Wabbajack/Wabbajack.csproj
View File

@ -198,6 +198,7 @@
<Compile Include="Updater\CheckForUpdates.cs" />
<Compile Include="Validation\DTOs.cs" />
<Compile Include="Validation\ValidateModlist.cs" />
<Compile Include="ViewModel.cs" />
<Compile Include="zEditIntegration.cs" />
<Page Include="MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>