diff --git a/Cake/build.cake b/Cake/build.cake index 047b2ed..b588e49 100644 --- a/Cake/build.cake +++ b/Cake/build.cake @@ -141,7 +141,8 @@ Task(CleanSolutionTask) var customProject = ParseProject(project.Path, configuration: Configuration, platform: Platform); - CleanDirectory(customProject.OutputPath.FullPath); + foreach(var dir in customProject.OutputPaths) + CleanDirectory(dir); if(customProject.OutputType != "Library") // WinExe continue; @@ -149,7 +150,8 @@ Task(CleanSolutionTask) if(!project.Name.Contains("Test")) // we only care about test assemblies continue; - testsDirectories.Add(customProject.OutputPath.FullPath); + foreach(var dir in customProject.OutputPaths) + testsDirectories.Add(dir.FullPath); } }); diff --git a/Maple.sln b/Maple.sln index a9926ba..ebbd199 100644 --- a/Maple.sln +++ b/Maple.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.27130.2010 +VisualStudioVersion = 15.0.27130.2024 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D65C950A-327A-496D-A49C-B45E8F97C610}" ProjectSection(SolutionItems) = preProject @@ -9,6 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .XamlStyler = .XamlStyler src\Resources\Art_Of_Escapism_-_Universe_Words.mp3 = src\Resources\Art_Of_Escapism_-_Universe_Words.mp3 src\Resources\client_secret.json = src\Resources\client_secret.json + NuGet.Config = NuGet.Config src\Resources\SharedAssemblyInfo.cs = src\Resources\SharedAssemblyInfo.cs EndProjectSection EndProject diff --git a/NuGet.Config b/NuGet.Config new file mode 100644 index 0000000..17290f9 --- /dev/null +++ b/NuGet.Config @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Maple.Core/Commands/RelayCommand.cs b/src/Maple.Core/Commands/RelayCommand.cs index f5e5b5d..e998960 100644 --- a/src/Maple.Core/Commands/RelayCommand.cs +++ b/src/Maple.Core/Commands/RelayCommand.cs @@ -103,7 +103,7 @@ public bool CanExecute(object parameter) return true; if (parameter == null && typeof(T).IsValueType) - return _canExecute.Invoke(default(T)); + return _canExecute.Invoke(default); if (parameter == null || parameter is T) return (_canExecute.Invoke((T)parameter)); diff --git a/src/Maple.Core/DiagnosticReport.cs b/src/Maple.Core/DiagnosticReport.cs deleted file mode 100644 index 889713b..0000000 --- a/src/Maple.Core/DiagnosticReport.cs +++ /dev/null @@ -1,499 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Runtime.InteropServices; -using System.Text; -using Microsoft.Win32; -using Humanizer; - -namespace Maple.Core -{ - - /// - /// A helper class for generating a report containing details related to - /// System, Process, Assemblies, Network and Environment - /// on which the application executes. - /// - public static class DiagnosticReport - { - private const char Pipe = '|'; - private const char Dot = '.'; - private const char Dash = '-'; - private const char Space = ' '; - private const char Colon = ':'; - private static readonly string NewLine = Environment.NewLine; - private static readonly string LinePrefix = Pipe + "\t"; - - private static readonly Action[] Actions = - { - AddSystem, - AddProcess, - AddDrives, - AddAssemblies, - AddNetworking - }; - - private static readonly string[] SystemHeaders = - { - "OS", - "64Bit OS", - "CLR Runtime", - "FQDN", - "Machine Name", - "Installed RAM", - "CPU", - "CPU Core Count", - "User", - "System Directory", - "Current Directory" - }; - - private static readonly string[] ProcessHeaders = - { - "Id", - "Name", - "Started", - "Loaded In", - "Optimized", - "64Bit Process", - "Large Address Aware", - "Module Name", - "Module File Name", - "Product Name", - "Original File Name", - "File Name", - "File Version", - "Product Version", - "Language", - "Copyright", - "WorkingSet", - "Interactive", - "CommandLine" - }; - - private static readonly string[] DrivesHeaders = - { - "Name", "Type", "Format", "Label", "Capacity(GB)", "Free(GB)", "Available(GB)" - }; - - private static readonly string[] AssemblyHeaders = - { - "Name", "GAC", "64Bit", "Optimized", "Framework", "Location", "CodeBase" - }; - - /// - /// Returns the details related to System, Process, Assemblies - /// and Environment on which the application executes. - /// - public static string Generate(DiagnosticReportType type = DiagnosticReportType.Full) - { - try - { - return GenerateImpl(type); - } - catch (Exception e) - { - return $"Unable to generate the Diagnostic Report. Error:{NewLine}\t{e}"; - } - } - - private static string GenerateImpl(DiagnosticReportType type) - { - var sw = Stopwatch.StartNew(); - - var builder = new StringBuilder(); - for (var i = 0; i < Actions.Length; i++) - { - var enabled = ((int)type & (1 << i)) != 0; - if (enabled) { Actions[i](builder); } - } - - sw.Stop(); - - builder.Insert(0, $"/{NewLine}{Pipe}Diagnostic Report generated at: {DateTime.Now:dd-MM-yyyy HH:mm:ss.fff} in: {sw.Elapsed.TotalMilliseconds} milliseconds.{NewLine}"); - builder.Append('\\'); - return builder.ToString(); - } - - private static void AddSystem(StringBuilder builder) - { - var maxHeaderLength = SystemHeaders.Max(h => h.Length); - var formatter = "{0,-" + (maxHeaderLength + 1) + "}"; - - var sectionIndex = builder.Length; - Format(SystemHeaders[0], Environment.OSVersion); - Format(SystemHeaders[1], Environment.Is64BitOperatingSystem); - Format(SystemHeaders[2], Environment.Version); - Format(SystemHeaders[4], Environment.MachineName); - Format(SystemHeaders[3], NetworkHelper.GetFQDN()); - Format(SystemHeaders[8], Environment.UserDomainName + "\\" + Environment.UserName); - Format(SystemHeaders[6], GetProcessorName()); - Format(SystemHeaders[7], Environment.ProcessorCount); - Format(SystemHeaders[5], GetInstalledMemoryInGigaBytes()); - Format(SystemHeaders[9], Environment.SystemDirectory); - Format(SystemHeaders[10], Environment.CurrentDirectory); - - var maxLineLength = GetMaximumLineLength(builder, sectionIndex); - builder.Insert(sectionIndex, GetSeperator("System", maxLineLength)); - - void Format(string key, object value) - { - builder - .Append(LinePrefix) - .Append(Dot) - .Append(Space) - .AppendFormat(formatter, key) - .Append(Colon) - .Append(Space) - .AppendLine(value.ToString()); - } - } - - private static void AddDrives(StringBuilder builder) - { - var values = new List(); - - foreach (var d in DriveInfo.GetDrives()) - { - var row = new string[7]; - row[0] = d.Name; - row[1] = d.DriveType.ToString(); - - var dashString = Dash.ToString(); - string driveFormat = dashString, volumeLabel = dashString; - double capacity = 0, free = 0, available = 0; - - if (d.IsReady) - { - - driveFormat = d.DriveFormat; - volumeLabel = d.VolumeLabel; - capacity = d.TotalSize.Bytes().Gigabytes; - free = d.TotalFreeSpace.Bytes().Gigabytes; - available = d.AvailableFreeSpace.Bytes().Gigabytes; - } - - row[2] = driveFormat; - row[3] = volumeLabel; - row[4] = capacity.ToString("N0"); - row[5] = free.ToString("N0"); - row[6] = available.ToString("N0"); - - values.Add(row); - } - - WrapInTable(builder, DrivesHeaders, values); - } - - private static void AddNetworking(StringBuilder builder) - { - var result = ProcessHelper.ExecuteAsync("ipconfig", "/all").Result; - - var sectionIndex = builder.Length; - foreach (var entry in result.StandardOutput) - { - var entryLength = entry.Length; - if (entryLength == 0) { continue; } - - builder.Append(LinePrefix); - - var firstChar = entry[0]; - if (firstChar != Space) - { - // Add extra line between the new title and the previous - // lines only if it's not the first title - if (!entry.Equals("Windows IP Configuration", StringComparison.Ordinal)) - { - builder.AppendLine().Append(LinePrefix); - } - - if (entry[entryLength - 1] == Colon) { entryLength = entryLength - 1; } - - builder.Append(Dot).Append(Space); - for (var k = 0; k < entryLength; k++) { builder.Append(entry[k]); } - - builder.AppendLine().Append(LinePrefix); - - builder.Append(Space).Append(Space); - for (var j = 0; j < entryLength; j++) { builder.Append(Dash); } - } - else - { - builder.Append(Space).Append(Space); - - if (entryLength > 4) - { - if (entry[3] == Space) - { - builder.Append(Space).Append(Space); - } - else - { - builder.Append(Dot).Append(Space); - } - - for (var i = 3; i < entryLength; i++) - { - builder.Append(entry[i]); - } - - } - else - { - builder.Append("[Invalid Data]"); - } - } - - builder.AppendLine(); - } - - var maxLineLength = GetMaximumLineLength(builder, sectionIndex); - builder.Insert(sectionIndex, GetSeperator("Networking", maxLineLength)); - } - - private static void AddProcess(StringBuilder builder) - { - var maxHeaderLength = ProcessHeaders.Max(h => h.Length); - var formatter = "{0,-" + (maxHeaderLength + 1) + "}"; - - var sectionIndex = builder.Length; - using (var p = Process.GetCurrentProcess()) - { - var pVerInfo = p.MainModule.FileVersionInfo; - Format(ProcessHeaders[0], p.Id); - Format(ProcessHeaders[1], p.ProcessName); - Format(ProcessHeaders[2], p.StartTime.ToString("dd-MM-yyyy HH:mm:ss.fff")); - Format(ProcessHeaders[3], ApplicationHelper.GetProcessStartupDuration()); - Format(ProcessHeaders[17], Environment.UserInteractive); - Format(ProcessHeaders[4], IsOptimized()); - Format(ProcessHeaders[5], Environment.Is64BitProcess); - Format(ProcessHeaders[6], ApplicationHelper.IsProcessLargeAddressAware()); - Format(ProcessHeaders[16], Environment.WorkingSet.Bytes().Humanize()); - Format(ProcessHeaders[12], pVerInfo.FileVersion); - Format(ProcessHeaders[13], pVerInfo.ProductVersion); - Format(ProcessHeaders[14], pVerInfo.Language); - Format(ProcessHeaders[15], pVerInfo.LegalCopyright); - Format(ProcessHeaders[10], pVerInfo.OriginalFilename); - Format(ProcessHeaders[11], pVerInfo.FileName); - Format(ProcessHeaders[7], p.MainModule.ModuleName); - Format(ProcessHeaders[8], p.MainModule.FileName); - Format(ProcessHeaders[9], pVerInfo.ProductName); - - var cmdArgs = Environment.GetCommandLineArgs(); - Format(ProcessHeaders[18], cmdArgs[0]); - - for (var i = 1; i < cmdArgs.Length; i++) - { - builder - .Append(LinePrefix) - .Append(Space).Append(Space) - .AppendFormat(formatter, string.Empty) - .Append(Space).Append(Space) - .AppendLine(cmdArgs[i]); - } - - var maxLineLength = GetMaximumLineLength(builder, sectionIndex); - builder.Insert(sectionIndex, GetSeperator("Process", maxLineLength)); - - void Format(string key, object value) - { - builder - .Append(LinePrefix) - .Append(Dot) - .Append(Space) - .AppendFormat(formatter, key) - .Append(Colon) - .Append(Space) - .AppendLine(value.ToString()); - } - - string IsOptimized() - { - var executingAssembly = Assembly.GetEntryAssembly(); - return executingAssembly == null - ? "N/A - Assembly was called from Unmanaged code." - : executingAssembly.IsOptimized().ToString(); - } - } - } - - private static void AddAssemblies(StringBuilder builder) - { - var sectionIndex = builder.Length; - - var maxHeaderLength = AssemblyHeaders.Max(h => h.Length); - - var nameFormatter = "{0}{1:D3}{2} {3,-" + (maxHeaderLength + 1) + "}: {4}{5}"; - var formatter = "{0,-" + (maxHeaderLength + 1) + "}"; - - var assCounter = 1; - AppDomain.CurrentDomain.GetAssemblies() - .Where(ass => !ass.IsDynamic) - .OrderByDescending(o => o.GlobalAssemblyCache) - .ForEach(x => - { - builder.AppendFormat(nameFormatter, LinePrefix, assCounter, Pipe, AssemblyHeaders[0], x.FullName, NewLine); - - Format(AssemblyHeaders[1], x.GlobalAssemblyCache); - Format(AssemblyHeaders[2], !x.Is32Bit()); - Format(AssemblyHeaders[3], x.IsOptimized()); - Format(AssemblyHeaders[4], x.GetFrameworkVersion()); - Format(AssemblyHeaders[5], x.Location); - Format(AssemblyHeaders[6], x.CodeBase); - assCounter++; - }); - - var maxLineLength = GetMaximumLineLength(builder, sectionIndex); - builder.Insert(sectionIndex, GetSeperator("Assemblies", maxLineLength)); - - void Format(string key, object value) - { - builder - .Append(LinePrefix) - .Append(Space).Append(Space).Append(Space) - .Append(Dot) - .Append(Space) - .AppendFormat(formatter, key) - .Append(Colon) - .Append(Space) - .AppendLine(value.ToString()); - } - } - - private static void WrapInTable(StringBuilder builder, string[] columnHeaders, List values) - { - foreach (var row in values) - { - if (row.Length != columnHeaders.Length) - { - throw new InvalidDataException("There should be a corresponding data for every column header"); - } - } - - // initialize cellLengths first based on length of the headers - var cellLengths = new int[columnHeaders.Length]; - for (var i = 0; i < columnHeaders.Length; i++) - { - var headerLength = columnHeaders[i].Length; - cellLengths[i] = headerLength; - } - - foreach (var row in values) - { - for (var i = 0; i < columnHeaders.Length; i++) - { - var cellVal = row[i]; - if (cellVal.Length > cellLengths[i]) - { - cellLengths[i] = cellVal.Length; - } - } - } - - for (var i = 0; i < cellLengths.Length; i++) - { - cellLengths[i] = cellLengths[i] + 2; - } - - var headerBuilder = new StringBuilder(); - - // insert headers - headerBuilder.Append(LinePrefix); - for (var i = 0; i < columnHeaders.Length; i++) - { - var headerVal = columnHeaders[i]; - var formatter = "{0} {1,-" + (cellLengths[i] - 2) + "} "; - headerBuilder.AppendFormat(formatter, Pipe, headerVal); - } - headerBuilder.Append(Pipe).AppendLine(); - - // insert headers underline - headerBuilder.Append(LinePrefix); - for (var i = 0; i < columnHeaders.Length; i++) - { - headerBuilder.Append(Pipe).Append(new string(Dash, cellLengths[i])); - } - - var maxLineLengthInHeader = GetMaximumLineLength(headerBuilder); - var beginAndEnd = $"{LinePrefix} {new string(Dash, maxLineLengthInHeader - LinePrefix.Length - 2)}{NewLine}"; - headerBuilder.Insert(0, beginAndEnd); - - var beginPos = builder.Length; - - // insert row values - builder.Append(Pipe).AppendLine(); - foreach (var row in values) - { - builder.Append(LinePrefix); - for (var j = 0; j < row.Length; j++) - { - var formatter = "{0} {1,-" + (cellLengths[j] - 2) + "} "; - builder.AppendFormat(formatter, Pipe, row[j]); - } - builder.Append(Pipe).AppendLine(); - } - - builder.Insert(beginPos, headerBuilder.ToString()); - builder.Append(beginAndEnd); - - var maxLineLength = GetMaximumLineLength(builder, beginPos); - builder.Insert(beginPos, GetSeperator("Drives", maxLineLength)); - } - - private static int GetMaximumLineLength(StringBuilder builder, int start = 0) - { - if (start >= builder.Length) { throw new IndexOutOfRangeException(); } - - int maxLength = 0, tmpLength = 0; - var prevChar = '\0'; - - for (var i = start; i < builder.Length; i++) - { - var currChar = builder[i]; - - if (currChar == '\n') - { - if (prevChar == '\r') { --tmpLength; } - if (maxLength < tmpLength) { maxLength = tmpLength; } - tmpLength = 0; - } - else { tmpLength++; } - - prevChar = currChar; - } - return maxLength; - } - - /// - /// Returns the full CPU name using the registry. - /// See - /// - /// The CPU Name - private static string GetProcessorName() - { - var key = Registry.LocalMachine.OpenSubKey(@"HARDWARE\DESCRIPTION\System\CentralProcessor\0\"); - return key?.GetValue("ProcessorNameString").ToString() ?? "Not Found"; - } - - private static string GetInstalledMemoryInGigaBytes() - { - GetPhysicallyInstalledSystemMemory(out var installedMemoryKb); - return installedMemoryKb.Bytes().Humanize(); - } - - private static string GetSeperator(string title, int count) - { - return $"{Pipe}{NewLine}{Pipe}{title}{Pipe}{new string(Dot, count - title.Length)}{NewLine}{Pipe}{NewLine}"; - } - - /// - /// - /// - [DllImport("kernel32.dll")] - [return: MarshalAs(UnmanagedType.Bool)] - private static extern bool GetPhysicallyInstalledSystemMemory(out long totalMemoryInKilobytes); - } -} diff --git a/src/Maple.Core/DiagnosticReportType.cs b/src/Maple.Core/DiagnosticReportType.cs deleted file mode 100644 index 7537fd2..0000000 --- a/src/Maple.Core/DiagnosticReportType.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System; - -namespace Maple.Core -{ - /// - /// Represents the different types of report which can - /// be generated by . - /// - /// Reports can be mixed as: - /// - /// DiagnosticReportType.System | DiagnosticReportType.Process - /// - /// - /// - [Flags] - public enum DiagnosticReportType - { - /// - /// Includes details about the System. - /// - System = 1, - - /// - /// Includes details about the Process. - /// - Process = 2, - - /// - /// Includes details about the Drives. - /// - Drives = 4, - - /// - /// Includes details about the referenced Assemblies. - /// - Assemblies = 8, - - /// - /// Includes details about the Networking. - /// - Networking = 16, - - /// - /// Generates the full report. - /// - Full = System | Process | Drives | Assemblies | Networking - } -} diff --git a/src/Maple.Core/DispatcherFactory.cs b/src/Maple.Core/DispatcherFactory.cs deleted file mode 100644 index 792347d..0000000 --- a/src/Maple.Core/DispatcherFactory.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System; -using System.Windows.Threading; - -namespace Maple.Core -{ - public static class DispatcherFactory - { - /// - /// Gets the dispatcher. - /// - /// - public static Dispatcher GetDispatcher() - { - return Dispatcher.CurrentDispatcher; - } - - /// - /// Invokes the specified action. - /// - /// The action. - public static void Invoke(Action action) - { - var dispatcher = GetDispatcher(); - - if (dispatcher.CheckAccess()) - action(); - else - dispatcher.BeginInvoke(action); - } - - /// - /// Invokes the specified action. - /// - /// - /// The action. - /// The parameter. - /// The priority. - public static void Invoke(Action action, T parameter, DispatcherPriority priority = DispatcherPriority.Normal) - { - var dispatcher = GetDispatcher(); - - if (dispatcher.CheckAccess()) - action?.Invoke(parameter); - else - dispatcher.BeginInvoke(action, priority, parameter); - } - } -} diff --git a/src/Maple.Core/DynamicDictionary.cs b/src/Maple.Core/DynamicDictionary.cs deleted file mode 100644 index 471ce19..0000000 --- a/src/Maple.Core/DynamicDictionary.cs +++ /dev/null @@ -1,219 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.ComponentModel; -using System.Diagnostics; -using System.Dynamic; - -namespace Maple.Core -{ - /// - /// Provides an abstraction for an object to be used dynamically as a key value pair - /// where the property is the key and value is an . - /// - public sealed class DynamicDictionary : DynamicObject, IDictionary - { - private readonly IDictionary _dictionary; - - /// - /// Creates a new instance of . - /// - /// - /// The flag indicating whether keys should be treated regardless of the case. - /// - [DebuggerStepThrough] - public DynamicDictionary(bool ignoreCase = true) - { - _dictionary = new Dictionary( - ignoreCase ? StringComparer.OrdinalIgnoreCase : StringComparer.Ordinal); - } - - /// - /// Add the given to this instance. - /// - /// - public void Add(KeyValuePair item) - { - _dictionary.Add(item); - } - - /// - /// Removes all the items from this instance. - /// - public void Clear() - { - _dictionary.Clear(); - } - - /// - /// Determines whether this instance contains the given . - /// - public bool Contains(KeyValuePair item) - { - return _dictionary.Contains(item); - } - - /// - /// Copies the elements of this instance to the given , starting at a particular . - /// - public void CopyTo(KeyValuePair[] array, int arrayIndex) - { - _dictionary.CopyTo(array, arrayIndex); - } - - /// - /// Removes the given from this instance. - /// - public bool Remove(KeyValuePair item) - { - return _dictionary.Remove(item); - } - - /// - /// Gets the number of elements contained in this instance. - /// - public int Count => _dictionary.Keys.Count; - - /// - /// Determines whether this instance is Read-Only. - /// - public bool IsReadOnly => _dictionary.IsReadOnly; - - /// - /// Returns an enumerator that iterates through the keys and values of this instance. - /// - public IEnumerator> GetEnumerator() - { - return _dictionary.GetEnumerator(); - } - - /// - /// Returns an enumerator that iterates through the keys and values of this instance. - /// - IEnumerator IEnumerable.GetEnumerator() - { - return GetEnumerator(); - } - - /// - /// Determines whether this instance contains an element with the given . - /// - public bool ContainsKey(string key) - { - return _dictionary.ContainsKey(key); - } - - /// - /// Adds an element for the given and associated to this instance. - /// - public void Add(string key, object value) - { - _dictionary.Add(key, value); - } - - /// - /// Removes the element with the given from this instance. - /// - public bool Remove(string key) - { - return _dictionary.Remove(key); - } - - /// - /// Attempts to get the value associated to the given . - /// - public bool TryGetValue(string key, out object value) - { - return _dictionary.TryGetValue(key, out value); - } - - /// - /// Gets or sets the value stored against the given . - /// If the given does not exist, NULL is returned. - /// - public object this[string key] - { - get - { - _dictionary.TryGetValue(key, out var result); - return result; - } - - set { _dictionary[key] = value; } - } - - /// - /// Gets an containing the keys of this instance. - /// - public ICollection Keys => _dictionary.Keys; - - /// - /// Gets an containing the values of this instance. - /// - public ICollection Values => _dictionary.Values; - - /// - /// Attempts to get the member. - /// - [EditorBrowsable(EditorBrowsableState.Never)] - public override bool TryGetMember(GetMemberBinder binder, out object result) - { - if (_dictionary.ContainsKey(binder.Name)) - { - result = _dictionary[binder.Name]; - return true; - } - - if (base.TryGetMember(binder, out result)) - { - return true; - } - - // always return null if not found. - result = null; - return true; - } - - /// - /// Attempts to set the member. - /// - [EditorBrowsable(EditorBrowsableState.Never)] - public override bool TrySetMember(SetMemberBinder binder, object result) - { - if (!_dictionary.ContainsKey(binder.Name)) { _dictionary.Add(binder.Name, result); } - else { _dictionary[binder.Name] = result; } - return true; - } - - /// - /// Attempts to invoke the member. - /// - [EditorBrowsable(EditorBrowsableState.Never)] - public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result) - { - if (_dictionary.ContainsKey(binder.Name) && _dictionary[binder.Name] is Delegate) - { - var del = (Delegate)_dictionary[binder.Name]; - result = del.DynamicInvoke(args); - return true; - } - - return base.TryInvokeMember(binder, args, out result); - } - - /// - /// Attempts to delete the member. - /// - [EditorBrowsable(EditorBrowsableState.Never)] - public override bool TryDeleteMember(DeleteMemberBinder binder) - { - if (_dictionary.ContainsKey(binder.Name)) - { - _dictionary.Remove(binder.Name); - return true; - } - - return base.TryDeleteMember(binder); - } - } -} diff --git a/src/Maple.Core/Ensure.cs b/src/Maple.Core/Ensure.cs index 84c7945..9d279e8 100644 --- a/src/Maple.Core/Ensure.cs +++ b/src/Maple.Core/Ensure.cs @@ -3,6 +3,7 @@ using System.Diagnostics; using System.IO; using System.Linq; + using Maple.Localization.Properties; namespace Maple.Core @@ -22,7 +23,7 @@ public static class Ensure /// Thrown when TException is . /// [DebuggerStepThrough] - public static void That(bool condition, string message = default(string)) + public static void That(bool condition, string message = default) where TException : Exception { if (!condition) @@ -43,7 +44,7 @@ public static class Ensure /// Thrown when is . /// [DebuggerStepThrough] - public static void That(bool condition, string message = default(string)) + public static void That(bool condition, string message = default) { if (string.IsNullOrEmpty(message)) message = Resources.ExceptionMessageFalseCondition; @@ -61,7 +62,7 @@ public static class Ensure /// Thrown when is . /// [DebuggerStepThrough] - public static void Not(bool condition, string message = default(string)) + public static void Not(bool condition, string message = default) where TException : Exception { if (string.IsNullOrEmpty(message)) @@ -79,7 +80,7 @@ public static class Ensure /// Thrown when is . /// [DebuggerStepThrough] - public static void Not(bool condition, string message = default(string)) + public static void Not(bool condition, string message = default) { if (string.IsNullOrEmpty(message)) message = Resources.ExceptionMessageFalseCondition; @@ -122,7 +123,7 @@ public static T NotNull(T value, string argName) /// /// Null values will cause an exception to be thrown [DebuggerStepThrough] - public static void Equal(T left, T right, string message = default(string)) + public static void Equal(T left, T right, string message = default) { if (string.IsNullOrEmpty(message)) message = Resources.ExceptionMessageEqualValues; @@ -142,7 +143,7 @@ public static T NotNull(T value, string argName) /// /// Null values will cause an exception to be thrown [DebuggerStepThrough] - public static void NotEqual(T left, T right, string message = default(string)) + public static void NotEqual(T left, T right, string message = default) { if (string.IsNullOrEmpty(message)) message = Resources.ExceptionMessageNotEqualValues; @@ -164,7 +165,7 @@ public static T NotNull(T value, string argName) /// Thrown when is empty. /// [DebuggerStepThrough] - public static ICollection NotNullOrEmpty(ICollection collection, string message = default(string)) + public static ICollection NotNullOrEmpty(ICollection collection, string message = default) { if (string.IsNullOrEmpty(message)) message = Resources.ExceptionMessageCollectionNullOrEmpty; @@ -184,7 +185,7 @@ public static T NotNull(T value, string argName) /// Thrown when is null or empty or whitespace. /// [DebuggerStepThrough] - public static string NotNullOrEmptyOrWhiteSpace(string value, string message = default(string)) + public static string NotNullOrEmptyOrWhiteSpace(string value, string message = default) { if (string.IsNullOrEmpty(message)) message = Resources.ExceptionMessageStringNullEmpyOrWhiteSpace; diff --git a/src/Maple.Core/EventAggregator/MapleMessenger.cs b/src/Maple.Core/EventAggregator/MapleMessenger.cs index c00fd6c..661b76b 100644 --- a/src/Maple.Core/EventAggregator/MapleMessenger.cs +++ b/src/Maple.Core/EventAggregator/MapleMessenger.cs @@ -25,13 +25,13 @@ public MapleMessenger(ITranslationProvider translationProvider, ILoggingService public SubscriptionToken Subscribe(Action deliveryAction) where TMessage : class, IMapleMessage { - return AddSubscriptionInternal(deliveryAction, (m) => true, true, _mapleMessageProxy); + return AddSubscriptionInternal(deliveryAction, (m) => true, false, _mapleMessageProxy); } public SubscriptionToken Subscribe(Action deliveryAction, IMapleMessageProxy proxy) where TMessage : class, IMapleMessage { - return AddSubscriptionInternal(deliveryAction, (m) => true, true, proxy); + return AddSubscriptionInternal(deliveryAction, (m) => true, false, proxy); } public SubscriptionToken Subscribe(Action deliveryAction, bool useStrongReferences) diff --git a/src/Maple.Core/EventAggregator/Messages/CancellableGenericMapleMessage.cs b/src/Maple.Core/EventAggregator/Messages/Base/CancellableGenericMapleMessage.cs similarity index 100% rename from src/Maple.Core/EventAggregator/Messages/CancellableGenericMapleMessage.cs rename to src/Maple.Core/EventAggregator/Messages/Base/CancellableGenericMapleMessage.cs diff --git a/src/Maple.Core/EventAggregator/Messages/GenericMapleMessage.cs b/src/Maple.Core/EventAggregator/Messages/Base/GenericMapleMessage.cs similarity index 100% rename from src/Maple.Core/EventAggregator/Messages/GenericMapleMessage.cs rename to src/Maple.Core/EventAggregator/Messages/Base/GenericMapleMessage.cs diff --git a/src/Maple.Core/EventAggregator/Messages/MapleMessageBase.cs b/src/Maple.Core/EventAggregator/Messages/Base/MapleMessageBase.cs similarity index 94% rename from src/Maple.Core/EventAggregator/Messages/MapleMessageBase.cs rename to src/Maple.Core/EventAggregator/Messages/Base/MapleMessageBase.cs index b043fef..09f78ad 100644 --- a/src/Maple.Core/EventAggregator/Messages/MapleMessageBase.cs +++ b/src/Maple.Core/EventAggregator/Messages/Base/MapleMessageBase.cs @@ -1,4 +1,5 @@ using System; + using Maple.Localization.Properties; namespace Maple.Core @@ -12,7 +13,7 @@ public abstract class MapleMessageBase : IMapleMessage /// Store a WeakReference to the sender just in case anyone is daft enough to /// keep the message around and prevent the sender from being collected. /// - private WeakReference _sender; + private readonly WeakReference _sender; public object Sender { get diff --git a/src/Maple.Core/Messages/CompletedMediaItemMessage.cs b/src/Maple.Core/EventAggregator/Messages/CompletedMediaItemMessage.cs similarity index 100% rename from src/Maple.Core/Messages/CompletedMediaItemMessage.cs rename to src/Maple.Core/EventAggregator/Messages/CompletedMediaItemMessage.cs diff --git a/src/Maple.Core/Messages/FileSystemInfoChangedMessage.cs b/src/Maple.Core/EventAggregator/Messages/FileSystemInfoChangedMessage.cs similarity index 100% rename from src/Maple.Core/Messages/FileSystemInfoChangedMessage.cs rename to src/Maple.Core/EventAggregator/Messages/FileSystemInfoChangedMessage.cs diff --git a/src/Maple.Core/Messages/LoadedMessage.cs b/src/Maple.Core/EventAggregator/Messages/LoadedMessage.cs similarity index 100% rename from src/Maple.Core/Messages/LoadedMessage.cs rename to src/Maple.Core/EventAggregator/Messages/LoadedMessage.cs diff --git a/src/Maple.Core/Messages/LogMessageReceivedMessage.cs b/src/Maple.Core/EventAggregator/Messages/LogMessageReceivedMessage.cs similarity index 100% rename from src/Maple.Core/Messages/LogMessageReceivedMessage.cs rename to src/Maple.Core/EventAggregator/Messages/LogMessageReceivedMessage.cs diff --git a/src/Maple.Core/Messages/PlayingMediaItemMessage.cs b/src/Maple.Core/EventAggregator/Messages/PlayingMediaItemMessage.cs similarity index 100% rename from src/Maple.Core/Messages/PlayingMediaItemMessage.cs rename to src/Maple.Core/EventAggregator/Messages/PlayingMediaItemMessage.cs diff --git a/src/Maple.Core/Messages/RepeatModeChangedMessage.cs b/src/Maple.Core/EventAggregator/Messages/RepeatModeChangedMessage.cs similarity index 100% rename from src/Maple.Core/Messages/RepeatModeChangedMessage.cs rename to src/Maple.Core/EventAggregator/Messages/RepeatModeChangedMessage.cs diff --git a/src/Maple.Core/Messages/ShuffleModeChangedMessage.cs b/src/Maple.Core/EventAggregator/Messages/ShuffleModeChangedMessage.cs similarity index 100% rename from src/Maple.Core/Messages/ShuffleModeChangedMessage.cs rename to src/Maple.Core/EventAggregator/Messages/ShuffleModeChangedMessage.cs diff --git a/src/Maple.Core/Messages/UiPrimaryColorChangedMessage.cs b/src/Maple.Core/EventAggregator/Messages/UiPrimaryColorChangedMessage.cs similarity index 100% rename from src/Maple.Core/Messages/UiPrimaryColorChangedMessage.cs rename to src/Maple.Core/EventAggregator/Messages/UiPrimaryColorChangedMessage.cs diff --git a/src/Maple.Core/Messages/ViewModelSelectionChangedMessage.cs b/src/Maple.Core/EventAggregator/Messages/ViewModelSelectionChangedMessage.cs similarity index 100% rename from src/Maple.Core/Messages/ViewModelSelectionChangedMessage.cs rename to src/Maple.Core/EventAggregator/Messages/ViewModelSelectionChangedMessage.cs diff --git a/src/Maple.Core/Messages/ViewModelSelectionChangingMessage.cs b/src/Maple.Core/EventAggregator/Messages/ViewModelSelectionChangingMessage.cs similarity index 100% rename from src/Maple.Core/Messages/ViewModelSelectionChangingMessage.cs rename to src/Maple.Core/EventAggregator/Messages/ViewModelSelectionChangingMessage.cs diff --git a/src/Maple.Core/EventAggregator/SubscriptionToken.cs b/src/Maple.Core/EventAggregator/SubscriptionToken.cs index 5eaaf0b..b4b474b 100644 --- a/src/Maple.Core/EventAggregator/SubscriptionToken.cs +++ b/src/Maple.Core/EventAggregator/SubscriptionToken.cs @@ -35,7 +35,7 @@ private void Dispose(bool disposing) // free managed resources if (_hub.IsAlive && _hub.Target is IMessenger hub) { - var unsubscribeMethod = typeof(IMessenger).GetMethod("Unsubscribe", new Type[] { typeof(SubscriptionToken) }); + var unsubscribeMethod = typeof(IMessenger).GetMethod(nameof(IMessenger.Unsubscribe), new Type[] { typeof(SubscriptionToken) }); unsubscribeMethod = unsubscribeMethod.MakeGenericMethod(_messageType); unsubscribeMethod.Invoke(hub, new object[] { this }); } diff --git a/src/Maple.Core/Extensions/GenericExtensions.cs b/src/Maple.Core/Extensions/GenericExtensions.cs deleted file mode 100644 index 43efc07..0000000 --- a/src/Maple.Core/Extensions/GenericExtensions.cs +++ /dev/null @@ -1,241 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Dynamic; -using System.Linq; -using System.Reflection; -using System.Reflection.Emit; -using System.Runtime.Serialization; - -namespace Maple.Core -{ - /// - /// A set of extension methods for generic types. - /// - public static class GenericExtensions - { - /// - /// This dictionary caches the delegates for each 'to-clone' type. - /// - private static readonly Dictionary CachedIlShallow = new Dictionary(); - private static readonly Dictionary CachedIlDeep = new Dictionary(); - private static LocalBuilder _localBuilder; - - /// - /// Converts the given to a . - /// - public static DynamicDictionary ToDynamic(this T @object, bool inherit = true) - { - var dynDic = new DynamicDictionary(); - foreach (var property in @object.GetType().GetInstanceProperties(inherit)) - { - dynDic.Add(property.Name, property.GetValue(@object, null)); - } - - return dynDic; - } - - /// - /// Returns True if has the default value of . - /// - /// The object to check for default. - /// True if has default or null value otherwise False. - public static bool IsDefault(this T @object) - { - return EqualityComparer.Default.Equals(@object, default(T)); - } - - /// - /// Returns an uninitialized instance of the without calling any of its constructor(s). - /// - /// - /// - /// Because the new instance of the object is initialized to zero and no constructors are run, - /// the object might not represent a state that is regarded as valid by that object. - /// The current method should only be used for deserialization when the user intends to immediately - /// populate all fields. It does not create an uninitialized string, - /// since creating an empty instance of an immutable type serves no purpose. - /// - /// Generic Type - /// An instance of type - /// with all its non-static fields initialized to its default value. - /// - public static T GetUninitializedInstance() - { - return (T)FormatterServices.GetUninitializedObject(typeof(T)); - } - - /// - /// Gets all the private, public, inherited instance property names for the given . - /// - /// This method can be used to return both a public or non-public property names - /// and supports instances of . - /// - /// Object to get properties from - /// The flag indicating whether inherited properties should be included or not - /// The flag indicating whether private properties should be included or not - /// - public static string[] GetPropertyNames(this T @object, bool inherit = true, bool includePrivate = true) - { - if (@object is IDynamicMetaObjectProvider expando) - { - var dic = (IDictionary)expando; - return dic.Keys.ToArray(); - } - - return @object.GetType() - .GetInstanceProperties(inherit, includePrivate) - .Select(p => p.Name).ToArray(); - } - - /// - /// Generic cloning method that clones an object using IL. - /// Only the first call of a certain type will hold back performance. - /// After the first call, the compiled IL is executed. - /// - /// Type of object to clone - /// Object to clone - /// Cloned object - public static T CloneShallowUsingIl(this T @object) - { - var type = typeof(T); - if (!CachedIlShallow.TryGetValue(type, out var myExec)) - { - // Create ILGenerator (both DM declarations work) - var dymMethod = new DynamicMethod("DoClone", type, new[] { type }, Assembly.GetExecutingAssembly().ManifestModule, true); - var cInfo = @object.GetType().GetConstructor(new Type[] { }); - var generator = dymMethod.GetILGenerator(); - - generator.Emit(OpCodes.Newobj, cInfo); - generator.Emit(OpCodes.Stloc_0); - foreach (var field in @object.GetType().GetFields(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public)) - { - generator.Emit(OpCodes.Ldloc_0); - generator.Emit(OpCodes.Ldarg_0); - generator.Emit(OpCodes.Ldfld, field); - generator.Emit(OpCodes.Stfld, field); - } - generator.Emit(OpCodes.Ldloc_0); - generator.Emit(OpCodes.Ret); - myExec = dymMethod.CreateDelegate(typeof(Func)); - CachedIlShallow.Add(type, myExec); - } - return ((Func)myExec)(@object); - } - - /// - /// Performs a deep copy of the object using the by generating IL. - /// Only the first call for a certain type will have impact on performance; After the first call, the compiled IL is executed. - /// - /// - /// The type of object being cloned. - /// The object instance to clone. - /// the cloned object - public static T CloneDeepUsingIl(this T myObject) - { - var type = typeof(T); - if (!CachedIlDeep.TryGetValue(type, out var myExec)) - { - // Create ILGenerator (both DM declarations work) - var dymMethod = new DynamicMethod("DoClone", type, new[] { type }, Assembly.GetExecutingAssembly().ManifestModule, true); - var cInfo = myObject.GetType().GetConstructor(new Type[] { }); - var generator = dymMethod.GetILGenerator(); - - generator.Emit(OpCodes.Newobj, cInfo); - generator.Emit(OpCodes.Stloc_0); - - foreach (var field in type.GetFields(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public)) - { - if (field.FieldType.IsValueType || field.FieldType == typeof(string)) - { - CopyValueType(generator, field); - } - else if (field.FieldType.IsClass) - { - CopyReferenceType(generator, field); - } - } - generator.Emit(OpCodes.Ldloc_0); - generator.Emit(OpCodes.Ret); - myExec = dymMethod.CreateDelegate(typeof(Func)); - CachedIlDeep.Add(type, myExec); - } - return ((Func)myExec)(myObject); - } - - private static void CopyValueType(ILGenerator generator, FieldInfo field) - { - generator.Emit(OpCodes.Ldloc_0); - generator.Emit(OpCodes.Ldarg_0); - generator.Emit(OpCodes.Ldfld, field); - generator.Emit(OpCodes.Stfld, field); - } - - private static void CopyReferenceType(ILGenerator generator, FieldInfo field) - { - // We have a reference type. - _localBuilder = generator.DeclareLocal(field.FieldType); - if (field.FieldType.GetInterface("IEnumerable") != null) - { - // We have a list type (generic). - if (field.FieldType.IsGenericType) - { - // Get argument of list type - var argType = field.FieldType.GetGenericArguments()[0]; - // Check that it has a constructor that accepts another IEnumerable. - var genericType = typeof(IEnumerable<>).MakeGenericType(argType); - - var ci = field.FieldType.GetConstructor(new[] { genericType }); - if (ci != null) - { - // It has! (Like the List<> class) - generator.Emit(OpCodes.Ldarg_0); - generator.Emit(OpCodes.Ldfld, field); - generator.Emit(OpCodes.Newobj, ci); - generator.Emit(OpCodes.Stloc, _localBuilder); - PlaceNewTempObjInClone(generator, field); - } - } - } - else - { - CreateNewTempObject(generator, field.FieldType); - PlaceNewTempObjInClone(generator, field); - foreach (var fi in field.FieldType.GetFields(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public)) - { - if (fi.FieldType.IsValueType || fi.FieldType == typeof(string)) - { - CopyValueTypeTemp(generator, field, fi); - } - else if (fi.FieldType.IsClass) - { - CopyReferenceType(generator, fi); - } - } - } - } - - private static void CreateNewTempObject(ILGenerator generator, Type type) - { - var cInfo = type.GetConstructor(new Type[] { }); - generator.Emit(OpCodes.Newobj, cInfo); - generator.Emit(OpCodes.Stloc, _localBuilder); - } - - private static void PlaceNewTempObjInClone(ILGenerator generator, FieldInfo field) - { - // Get object from custom location and store it in right field of location 0 - generator.Emit(OpCodes.Ldloc_0); - generator.Emit(OpCodes.Ldloc, _localBuilder); - generator.Emit(OpCodes.Stfld, field); - } - - private static void CopyValueTypeTemp(ILGenerator generator, FieldInfo fieldParent, FieldInfo fieldDetail) - { - generator.Emit(OpCodes.Ldloc_1); - generator.Emit(OpCodes.Ldarg_0); - generator.Emit(OpCodes.Ldfld, fieldParent); - generator.Emit(OpCodes.Ldfld, fieldDetail); - generator.Emit(OpCodes.Stfld, fieldDetail); - } - } -} diff --git a/src/Maple.Core/Extensions/LinqExtensions.cs b/src/Maple.Core/Extensions/LinqExtensions.cs index b223f7f..7a7a3ba 100644 --- a/src/Maple.Core/Extensions/LinqExtensions.cs +++ b/src/Maple.Core/Extensions/LinqExtensions.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; + using Maple.Domain; using Maple.Localization.Properties; @@ -25,53 +26,7 @@ public static T Random(this IEnumerable baseCollection) // consider a thread-safe static instance var r = new Random(); var list = baseCollection as IList ?? baseCollection.ToList(); - return list.Count == 0 ? default(T) : list[r.Next(0, list.Count)]; - } - - /// - /// determines if some of the submitted items can be added to the collection and returns a collection of these items - /// - /// The base collection. - /// The new items. - /// - /// - /// CanAddRange can't return a result. There were no valid parameters - newItems - /// or - /// CanAddRange can't return a result. There were no valid parameters - baseCollection - /// - public static IEnumerable CanAddRange(this IList baseCollection, IList newItems) - { - if (baseCollection == null) - throw new ArgumentNullException(nameof(baseCollection), $"{nameof(baseCollection)} {Resources.IsRequired}"); - - if (newItems?.Any() != true) - throw new ArgumentNullException(nameof(newItems), $"{nameof(newItems)} {Resources.IsRequired}"); - - var excludedIDs = new HashSet(baseCollection.Select(p => p.Id)); - return newItems.Where(p => !excludedIDs.Contains(p.Id)); - } - - /// - /// determines if some of the submitted items can be added to the collection and returns a collection of these items - /// - /// The base collection. - /// The new items. - /// - /// - /// CanAddRange can't return a result. There were no valid parameters - newItems - /// or - /// CanAddRange can't return a result. There were no valid parameters - baseCollection - /// - public static IEnumerable CanAddRange(this IList baseCollection, IList newItems) - { - if (baseCollection == null) - throw new ArgumentNullException(nameof(baseCollection), $"{nameof(baseCollection)} {Resources.IsRequired}"); - - if (newItems?.Any() != true) - throw new ArgumentNullException(nameof(newItems), $"{nameof(newItems)} {Resources.IsRequired}"); - - var excludedIDs = new HashSet(baseCollection.Select(p => p.Id)); - return newItems.Where(p => !excludedIDs.Contains(p.Id)); + return list.Count == 0 ? default : list[r.Next(0, list.Count)]; } public static IEnumerable ForEach(this IEnumerable baseCollection, Func action) diff --git a/src/Maple.Core/Extensions/StringExtensions.cs b/src/Maple.Core/Extensions/StringExtensions.cs index 67332a0..492b076 100644 --- a/src/Maple.Core/Extensions/StringExtensions.cs +++ b/src/Maple.Core/Extensions/StringExtensions.cs @@ -1,15 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Globalization; -using System.IO; -using System.IO.Compression; -using System.Linq; -using System.Text; -using System.Text.RegularExpressions; -using System.Threading; -using System.Xml; -using System.Xml.Linq; +using System.Diagnostics; namespace Maple.Core { @@ -19,40 +8,24 @@ namespace Maple.Core public static class StringExtensions { /// - /// Contains characters that may be used as regular expression arguments after \. - /// - private static readonly char[] RegexCharacters = { 'G', 'Z', 'A', 'n', 'W', 'w', 'v', 't', 's', 'S', 'r', 'k', 'f', 'D', 'd', 'B', 'b' }; - - private static readonly char[] InvalidFileNameCharacters = Path.GetInvalidFileNameChars(); - private static readonly char[] InvalidPathCharacters = Path.GetInvalidPathChars(); - /// - /// A nicer way of calling - /// - /// The string to test. - /// if the format parameter is null or an empty string (""); otherwise, . + /// A nicer way of calling The string to test. if the format + /// parameter is null or an empty string (""); otherwise, . [DebuggerStepThrough] public static bool IsNullOrEmpty(this string value) { return string.IsNullOrEmpty(value); } - /// - /// A nice way of calling the inverse of - /// - /// The string to test. - /// if the format parameter is not null or an empty string (""); otherwise, . - [DebuggerStepThrough] - public static bool IsNotNullOrEmpty(this string value) - { - return !value.IsNullOrEmpty(); - } - /// /// A nice way of checking if a string is null, empty or whitespace /// /// The string to test. - /// if the format parameter is null or an empty string (""); otherwise, . + /// + /// if the format parameter is null or an empty string (""); otherwise, + /// . + /// [DebuggerStepThrough] public static bool IsNullOrEmptyOrWhiteSpace(this string value) { @@ -63,613 +36,14 @@ public static bool IsNullOrEmptyOrWhiteSpace(this string value) /// A nice way of checking the inverse of (if a string is null, empty or whitespace) /// /// The string to test. - /// if the format parameter is not null or an empty string (""); otherwise, . - [DebuggerStepThrough] - public static bool IsNotNullOrEmptyOrWhiteSpace(this string value) - { - return !value.IsNullOrEmptyOrWhiteSpace(); - } - - /// - /// Parses a string as Boolean, valid inputs are: true|false|yes|no|1|0. - /// Input is parsed as Case-Insensitive. - /// - public static bool TryParseAsBool(this string value, out bool result) - { - Ensure.NotNull(value, nameof(value)); - - const StringComparison CompPolicy = StringComparison.OrdinalIgnoreCase; - - if (value.Equals("true", CompPolicy) - || value.Equals("yes", CompPolicy) - || value.Equals("1", CompPolicy)) - { - result = true; - return true; - } - - if (value.Equals("false", CompPolicy) - || value.Equals("no", CompPolicy) - || value.Equals("0", CompPolicy)) - { - result = false; - return true; - } - - result = false; - return false; - } - - /// Formats arguments into string based on the provided . - /// The as string. - /// The arguments. - /// The formatted string. - /// Thrown when is null or empty or whitespace. - [DebuggerStepThrough] - public static string FormatWith(this string format, params object[] args) - { - Ensure.NotNullOrEmptyOrWhiteSpace(format); - return string.Format(format, args); - } - - /// Formats arguments into string based on the provided . - /// The as string. - /// The format provider. - /// The arguments. - /// The formatted string. - /// Thrown when is null or empty or whitespace. - [DebuggerStepThrough] - public static string FormatWith(this string format, IFormatProvider provider, params object[] args) - { - Ensure.NotNullOrEmptyOrWhiteSpace(format); - return string.Format(provider, format, args); - } - - /// - /// Allows for using strings in coalescing operations. - /// - /// The string value to check. - /// Null if is empty or the original . - [DebuggerStepThrough] - public static string NullIfEmpty(this string value) - { - return value == string.Empty ? null : value; - } - - /// - /// Tries to extract the value between the tag from the . - /// This method is case insensitive. - /// - /// The input string. - /// The tag whose value will be returned e.g span, img. - /// The extracted value. - /// True if successful otherwise False. - public static bool TryExtractValueFromTag(this string input, string tagName, out string value) - { - Ensure.NotNull(input, nameof(input)); - Ensure.NotNull(tagName, nameof(tagName)); - - var pattern = $"<{tagName}[^>]*>(.*)"; - var match = Regex.Match(input, pattern, RegexOptions.IgnoreCase); - - if (match.Success) - { - value = match.Groups[1].ToString(); - return true; - } - - value = null; - return false; - } - - /// - /// Returns a string array containing the trimmed substrings in this - /// that are delimited by the provided . - /// - public static string[] SplitAndTrim(this string value, params char[] separators) - { - Ensure.NotNull(value, nameof(value)); - return value.Trim() - .Split(separators, StringSplitOptions.RemoveEmptyEntries) - .Select(s => s.Trim()) - .ToArray(); - } - - /// - /// Checks if the contains the based on the provided rules. - /// - public static bool Contains(this string input, string stringToCheckFor, StringComparison comparison) - { - return input.IndexOf(stringToCheckFor, comparison) >= 0; - } - - /// - /// Checks that given matches any of the potential matches. - /// Inspired by: http://stackoverflow.com/a/20644611/23199 - /// - public static bool EqualsAny(this string input, StringComparer comparer, string match1, string match2) - { - return comparer.Equals(input, match1) || comparer.Equals(input, match2); - } - - /// - /// Checks that given matches any of the potential matches. - /// Inspired by: http://stackoverflow.com/a/20644611/23199 - /// - public static bool EqualsAny(this string input, StringComparer comparer, string match1, string match2, string match3) - { - return comparer.Equals(input, match1) || comparer.Equals(input, match2) || comparer.Equals(input, match3); - } - - /// - /// Checks that given is in a list of potential . - /// Inspired by: http://stackoverflow.com/a/20644611/23199 - /// - public static bool EqualsAny(this string input, StringComparer comparer, params string[] matches) - { - return matches.Any(x => comparer.Equals(x, input)); - } - - /// - /// Checks to see if the given input is a valid palindrome or not. - /// - /// The input string - /// True if palindrome otherwise False - public static bool IsPalindrome(this string input) - { - Ensure.NotNull(input, nameof(input)); - var min = 0; - var max = input.Length - 1; - while (true) - { - if (min > max) { return true; } - - var a = input[min]; - var b = input[max]; - if (char.ToLower(a) != char.ToLower(b)) { return false; } - - min++; - max--; - } - } - - /// - /// Truncates the to the maximum length of and - /// replaces the truncated part with - /// - /// The input string - /// Total length of characters to maintain before truncation. - /// The suffix to add to the end of the truncated - /// Truncated string. - public static string Truncate(this string input, int maxLength, string suffix = "") - { - Ensure.NotNull(input, nameof(input)); - Ensure.NotNull(suffix, nameof(suffix)); - - if (maxLength < 0) { return input; } - if (maxLength == 0) { return string.Empty; } - - var chars = input.Take(maxLength).ToArray(); - - if (chars.Length != input.Length) - { - return new string(chars) + suffix; - } - - return new string(chars); - } - - /// - /// Removes different types of new lines from a given string. - /// - /// input string. - /// The given input minus any new line characters. - public static string RemoveNewLines(this string input) - { - Ensure.NotNull(input, nameof(input)); - return input.Replace("\n", string.Empty).Replace("\r", string.Empty); - } - - /// - /// Separates a PascalCase string. - /// - /// "ThisIsPascalCase".SeparatePascalCase(); // returns "This Is Pascal Case" - /// The format to split - /// The original string separated on each uppercase character. - public static string SeparatePascalCase(this string value) - { - Ensure.NotNullOrEmptyOrWhiteSpace(value); - return Regex.Replace(value, "([A-Z])", " $1").Trim(); - } - - /// - /// Converts string to Pascal Case - /// This Is A Pascal Case String. - /// - /// The given input. - /// The given converted to Pascal Case. - public static string ToPascalCase(this string input) - { - Ensure.NotNull(input, nameof(input)); - - var cultureInfo = Thread.CurrentThread.CurrentCulture; - var textInfo = cultureInfo.TextInfo; - return textInfo.ToTitleCase(input); - } - - /// - /// Compares against , the comparison is case-sensitive. - /// - /// The input string - /// The target string - /// True if equal otherwise False - public static bool IsEqualTo(this string input, string target) - { - if (input == null && target == null) { return true; } - if (input == null || target == null) { return false; } - if (input.Length != target.Length) { return false; } - - return string.CompareOrdinal(input, target) == 0; - } - - /// - /// Handy method to print arguments to System.Console. - /// - /// The input string. - /// The arguments. - [DebuggerStepThrough] - public static void Print(this string input, params object[] args) - { - Console.WriteLine(input, args); - } - - /// - /// Generates a slug. - /// - /// Credit goes to . - /// - /// - [DebuggerStepThrough] - public static string GenerateSlug(this string value, uint? maxLength = null) - { - // prepare string, remove diacritics, lower case and convert hyphens to whitespace - var result = RemoveDiacritics(value).Replace("-", " ").ToLowerInvariant(); - - result = Regex.Replace(result, @"[^a-z0-9\s-]", string.Empty); // remove invalid characters - result = Regex.Replace(result, @"\s+", " ").Trim(); // convert multiple spaces into one space - - if (maxLength.HasValue) - { - result = result.Substring(0, result.Length <= maxLength ? result.Length : (int)maxLength.Value).Trim(); - } - return Regex.Replace(result, @"\s", "-"); - } - - /// - /// Removes the diacritics from the given - /// - /// - /// Credit goes to . - /// - [DebuggerStepThrough] - public static string RemoveDiacritics(this string input) - { - var normalizedString = input.Normalize(NormalizationForm.FormD); - var stringBuilder = StringBuilderCache.Acquire(); - - foreach (var c in normalizedString) - { - var unicodeCategory = CharUnicodeInfo.GetUnicodeCategory(c); - if (unicodeCategory != UnicodeCategory.NonSpacingMark) - { - stringBuilder.Append(c); - } - } - - return StringBuilderCache.GetStringAndRelease(stringBuilder).Normalize(NormalizationForm.FormC); - } - - /// - /// A method to convert English digits to Persian numbers. - /// - public static string ToPersianNumber(this string input) - { - Ensure.NotNull(input, nameof(input)); - return input - .Replace("0", "۰") - .Replace("1", "۱") - .Replace("2", "۲") - .Replace("3", "۳") - .Replace("4", "۴") - .Replace("5", "۵") - .Replace("6", "۶") - .Replace("7", "۷") - .Replace("8", "۸") - .Replace("9", "۹"); - } - - /// - /// Gets a sequence containing every element with the name equal to . - /// - /// The input containing XML - /// The name of the elements to return - /// The flag indicating whether the name should be looked up in a case sensitive manner - /// The sequence containing all the elements matching the - public static IEnumerable GetElements(this string xmlInput, XName name, bool ignoreCase = true) - { - Ensure.NotNull(xmlInput, nameof(xmlInput)); - return xmlInput.GetElements(name, new XmlReaderSettings(), ignoreCase); - } - - /// - /// Gets a sequence containing every element with the name equal to . - /// - /// The input containing XML - /// The name of the elements to return - /// The settings used by the - /// The flag indicating whether the name should be looked up in a case sensitive manner - /// The sequence containing all the elements matching the - public static IEnumerable GetElements(this string xmlInput, XName name, XmlReaderSettings settings, bool ignoreCase = true) - { - Ensure.NotNull(xmlInput, nameof(xmlInput)); - Ensure.NotNull(name, nameof(name)); - Ensure.NotNull(settings, nameof(settings)); - - using (var stringReader = new StringReader(xmlInput)) - using (var xmlReader = XmlReader.Create(stringReader, settings)) - { - foreach (var xElement in xmlReader.GetEelements(name, ignoreCase)) - { - yield return xElement; - } - } - } - - /// - /// Compresses the given to Base64 string. - /// - /// The string to be compressed - /// The compressed string in Base64 - public static string Compress(this string input) - { - Ensure.NotNull(input, nameof(input)); - - var buffer = Encoding.UTF8.GetBytes(input); - using (var memStream = new MemoryStream()) - using (var zipStream = new GZipStream(memStream, CompressionMode.Compress, true)) - { - zipStream.Write(buffer, 0, buffer.Length); - zipStream.Close(); - - memStream.Position = 0; - - var compressedData = new byte[memStream.Length]; - memStream.Read(compressedData, 0, compressedData.Length); - - var gZipBuffer = new byte[compressedData.Length + 4]; - Buffer.BlockCopy(compressedData, 0, gZipBuffer, 4, compressedData.Length); - Buffer.BlockCopy(BitConverter.GetBytes(buffer.Length), 0, gZipBuffer, 0, 4); - return Convert.ToBase64String(gZipBuffer); - } - } - - /// - /// Decompresses a Base64 compressed string. - /// - /// The string compressed in Base64 - /// The uncompressed string - public static string Decompress(this string compressedInput) - { - Ensure.NotNull(compressedInput, nameof(compressedInput)); - - var gZipBuffer = Convert.FromBase64String(compressedInput); - using (var memStream = new MemoryStream()) - { - var dataLength = BitConverter.ToInt32(gZipBuffer, 0); - memStream.Write(gZipBuffer, 4, gZipBuffer.Length - 4); - memStream.Position = 0; - - var buffer = new byte[dataLength]; - using (var zipStream = new GZipStream(memStream, CompressionMode.Decompress)) - { - zipStream.Read(buffer, 0, buffer.Length); - } - - return Encoding.UTF8.GetString(buffer); - } - } - - /// - /// Ensures the given can be used as a file name. - /// - public static bool IsValidFileName(this string input) - { - return input.IsNotNullOrEmptyOrWhiteSpace() && input.IndexOfAny(InvalidFileNameCharacters) == -1; - } - - /// - /// Ensures the given can be used as a path. - /// - public static bool IsValidPathName(this string input) - { - return input.IsNotNullOrEmptyOrWhiteSpace() && input.IndexOfAny(InvalidPathCharacters) == -1; - } - - /// - /// Returns a from a Base64 encoded . - /// - /// DRfscsSQbUu8bXRqAvcWQA== or DRfscsSQbUu8bXRqAvcWQA depending on . - /// - /// - /// See: - /// - /// - public static Guid ToGuid(this string input, bool trimmed = true) - { - return trimmed ? new Guid(Convert.FromBase64String(input + "==")) - : new Guid(Convert.FromBase64String(input)); - } - - /// - /// Converts API to [aA][pP][iI]. - /// - /// This should be used as much faster alternative to adding - /// or using the (?i) for example (?i)API(?-i) - /// - /// - public static string ToCaseIncensitiveRegexArgument(this string input) - { - if (input.IsNullOrEmptyOrWhiteSpace()) { return input; } - - var patternIndexes = input.GetStartAndEndIndexes("(?<", ">").ToArray(); - var hasPattern = patternIndexes.Length > 0; - var isInPattern = false; - - var builder = StringBuilderCache.Acquire(); - // ReSharper disable once ForCanBeConvertedToForeach - for (var i = 0; i < input.Length; i++) - { - var prev = i == 0 ? new char() : input[i - 1]; - var currChar = input[i]; - - if (hasPattern) - { - foreach (var pair in patternIndexes) - { - if (i >= pair.Key && i <= pair.Value) - { - isInPattern = true; - break; - } - - isInPattern = false; - } - } - - if (!char.IsLetter(currChar) - || (prev == '\\' && RegexCharacters.Contains(currChar)) - || isInPattern) - { - builder.Append(currChar); - continue; - } - - builder.Append('['); - - if (char.IsUpper(currChar)) - { - builder.Append(char.ToLower(currChar)).Append(currChar); - } - else - { - builder.Append(currChar).Append(char.ToUpper(currChar)); - } - builder.Append(']'); - } - return StringBuilderCache.GetStringAndRelease(builder); - } - - /// - /// Returns all the start and end indexes of the occurrences of the - /// given and - /// in the given . - /// - /// The input to search. - /// The starting tag e.g. <div>. - /// The ending tag e.g. </div>. /// - /// A sequence where the key is - /// the starting position and value is the end position. + /// if the format parameter is not null or an empty string (""); + /// otherwise, . /// [DebuggerStepThrough] - public static IEnumerable> GetStartAndEndIndexes(this string input, string startTag, string endTag) - { - var startIdx = 0; - int endIdx; - - while ((startIdx = input.IndexOf(startTag, startIdx, StringComparison.Ordinal)) != -1 - && (endIdx = input.IndexOf(endTag, startIdx, StringComparison.Ordinal)) != -1) - { - var result = new KeyValuePair(startIdx, endIdx); - startIdx = endIdx; - yield return result; - } - } - } - - /// - /// Extension methods for classes in the namespace. - /// - public static class XmlExtensions - { - /// - /// Sets the default XML namespace of every element in the given XML element - /// - public static void SetDefaultXmlNamespace(this XElement element, XNamespace xmlns) - { - Ensure.NotNull(element, nameof(element)); - Ensure.NotNull(xmlns, nameof(xmlns)); - - if (element.Name.NamespaceName == string.Empty) - { - element.Name = xmlns + element.Name.LocalName; - } - - foreach (var e in element.Elements()) - { - e.SetDefaultXmlNamespace(xmlns); - } - } - - /// - /// Gets a sequence containing every element with the name equal to . - /// - /// The used to read the XML - /// The name of the elements to return - /// The flag indicating whether the name should be looked up in a case sensitive manner - /// The sequence containing all the elements matching the - public static IEnumerable GetEelements(this XmlReader reader, XName name, bool ignoreCase = true) - { - Ensure.NotNull(reader, nameof(reader)); - Ensure.NotNull(name, nameof(name)); - - var compPolicy = ignoreCase - ? StringComparison.InvariantCultureIgnoreCase - : StringComparison.InvariantCulture; - - reader.MoveToElement(); - while (reader.Read()) - { - while (reader.NodeType == XmlNodeType.Element - && reader.Name.Equals(name.LocalName, compPolicy)) - { - yield return (XElement)XNode.ReadFrom(reader); - } - } - } - - /// - /// Converts the content of the given to . - /// - public static DynamicDictionary ToDynamic(this XmlReader reader, bool ignoreCase = true) + public static bool IsNotNullOrEmptyOrWhiteSpace(this string value) { - Ensure.NotNull(reader, nameof(reader)); - - var result = new DynamicDictionary(ignoreCase); - var elements = new List(); - result["Elements"] = elements; - - reader.MoveToElement(); - while (reader.Read()) - { - while (reader.NodeType == XmlNodeType.Element) - { - var element = (XElement)XNode.ReadFrom(reader); - elements.Add(element); - } - } - - return result; + return !value.IsNullOrEmptyOrWhiteSpace(); } } } diff --git a/src/Maple.Core/Helpers/NetworkHelper.cs b/src/Maple.Core/Helpers/NetworkHelper.cs deleted file mode 100644 index 611ed66..0000000 --- a/src/Maple.Core/Helpers/NetworkHelper.cs +++ /dev/null @@ -1,84 +0,0 @@ -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; -using System.Net; -using System.Net.NetworkInformation; -using System.Net.Sockets; - -namespace Maple.Core -{ - /// - /// Provides a set of methods to help work with network related activities. - /// - [SuppressMessage("ReSharper", "InconsistentNaming")] - public static class NetworkHelper - { - /// - /// Returns the LocalHost Fully Qualified Domain Name - /// - /// - /// The localhost Fully Qualified Domain Name - public static string GetFQDN() - { - var domainName = IPGlobalProperties.GetIPGlobalProperties().DomainName; - var hostName = Dns.GetHostName(); - - domainName = "." + domainName; - if (!hostName.EndsWith(domainName)) - { - hostName += domainName; - } - - return hostName; - } - - /// - /// Gets the local IP address for the machine or VM running the code. - /// - /// - /// - /// - /// The local IP address - public static IPAddress GetLocalIPAddress() - { - using (var socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, 0)) - { - // can be any address - socket.Connect("10.0.2.4", 65530); - var endPoint = socket.LocalEndPoint as IPEndPoint; - // ReSharper disable once PossibleNullReferenceException - return IPAddress.Parse(endPoint.Address.ToString()); - } - } - - /// - /// Gets all the IP (v4 and not v6) addresses of the local computer together with - /// the interface to which the IP belongs. - /// - /// - public static IDictionary GetLocalIPAddresses() - { - // Get a list of all network interfaces (usually one per network card, dial-up, and VPN connection) - var networkInterfaces = NetworkInterface.GetAllNetworkInterfaces(); - - var result = new Dictionary(); - foreach (var networkInterface in networkInterfaces) - { - // Read the IP configuration for each network - var properties = networkInterface.GetIPProperties(); - - // Each network interface may have multiple IP addresses - foreach (var address in properties.UnicastAddresses) - { - // We're only interested in IPv4 addresses for now - if (address.Address.AddressFamily != AddressFamily.InterNetwork) { continue; } - - // Ignore loopback addresses (e.g., 127.0.0.1) - if (IPAddress.IsLoopback(address.Address)) { continue; } - - result.Add(address.Address, networkInterface.Name); - } - } - return result; - } - } -} diff --git a/src/Maple.Core/Helpers/ProcessHelper.cs b/src/Maple.Core/Helpers/ProcessHelper.cs deleted file mode 100644 index 8205735..0000000 --- a/src/Maple.Core/Helpers/ProcessHelper.cs +++ /dev/null @@ -1,117 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Threading; -using System.Threading.Tasks; - -namespace Maple.Core -{ - /// - /// Provides a set of methods to help work with a . - /// - public static class ProcessHelper - { - /// - /// Starts a Process Asynchronously. - /// - /// - /// The information for the process to run. - /// The cancellation token. - /// A task representing the started process which you can await until process exits. - public static Task ExecuteAsync(ProcessStartInfo processInfo, CancellationToken cToken = default(CancellationToken)) - { - Ensure.NotNull(processInfo, nameof(processInfo)); - - processInfo.UseShellExecute = false; - processInfo.CreateNoWindow = true; - processInfo.RedirectStandardOutput = true; - processInfo.RedirectStandardError = true; - - var process = new Process - { - EnableRaisingEvents = true, - StartInfo = processInfo - }; - - var tcs = new TaskCompletionSource(); - var standardOutput = new List(); - var standardError = new List(); - - var standardOutputResults = new TaskCompletionSource(); - process.OutputDataReceived += (sender, args) => - { - if (args.Data != null) - standardOutput.Add(args.Data); - else - standardOutputResults.SetResult(standardOutput.ToArray()); - }; - - var standardErrorResults = new TaskCompletionSource(); - process.ErrorDataReceived += (sender, args) => - { - if (args.Data != null) - standardError.Add(args.Data); - else - standardErrorResults.SetResult(standardError.ToArray()); - }; - - process.Exited += (sender, args) => - { - // Since the Exited event can happen asynchronously to the output and error events, - // we use the task results for stdout/stderr to ensure they are both closed - tcs.TrySetResult(new ProcessExecutionResult(process, standardOutputResults.Task.Result, standardErrorResults.Task.Result)); - }; - - using (cToken.Register(() => - { - tcs.TrySetCanceled(); - try - { - if (!process.HasExited) { process.Kill(); } - } - catch (InvalidOperationException) { } - })) - { - cToken.ThrowIfCancellationRequested(); - - if (!process.Start()) - { - tcs.TrySetException(new InvalidOperationException("Failed to start the process.")); - } - - process.BeginOutputReadLine(); - process.BeginErrorReadLine(); - return tcs.Task; - } - } - - /// - /// Starts a process represented by asynchronously. - /// - /// - /// The path to the process. - /// The arguments to be passed to the process. - /// The cancellation token. - /// A task representing the started process which you can await until process exits. - public static Task ExecuteAsync(string processPath, string args, CancellationToken cToken = default(CancellationToken)) - { - Ensure.NotNullOrEmptyOrWhiteSpace(processPath); - return ExecuteAsync(new ProcessStartInfo(processPath, args), cToken); - } - - /// - /// Starts a process represented by and asynchronously. - /// - /// - /// The path to the process. - /// The arguments to be passed to the process. - /// The cancellation token. - /// A task representing the started process which you can await until process exits. - public static Task ExecuteAsync(FileInfo processPath, string args, CancellationToken cToken = default(CancellationToken)) - { - Ensure.NotNull(processPath, nameof(processPath)); - return ExecuteAsync(new ProcessStartInfo(processPath.FullName, args), cToken); - } - } -} diff --git a/src/Maple.Core/IO/Base/MapleFileSystemBase.cs b/src/Maple.Core/IO/Base/MapleFileSystemBase.cs index 712e670..b0a5d1a 100644 --- a/src/Maple.Core/IO/Base/MapleFileSystemBase.cs +++ b/src/Maple.Core/IO/Base/MapleFileSystemBase.cs @@ -1,5 +1,6 @@ using System; using System.Windows.Input; + using Maple.Localization.Properties; namespace Maple.Core @@ -16,9 +17,7 @@ public static bool NoFilesFilter(object obj) public static bool SearchFilter(object obj) { - var info = obj as IFileSystemInfo; - - if (info == null) + if (!(obj is IFileSystemInfo info)) return false; if (info.IsHidden || info.IsBusy) diff --git a/src/Maple.Core/IO/FileSystemViewModel.cs b/src/Maple.Core/IO/FileSystemViewModel.cs index eea2689..ef2a498 100644 --- a/src/Maple.Core/IO/FileSystemViewModel.cs +++ b/src/Maple.Core/IO/FileSystemViewModel.cs @@ -2,6 +2,7 @@ using System.IO; using System.Linq; using System.Windows.Input; + using Maple.Domain; namespace Maple.Core @@ -117,9 +118,7 @@ private void OnSelectedItemChanged() public void SetSelectedItem(object item) { - var value = item as MapleFileSystemContainerBase; - - if (value == null) + if (!(item is MapleFileSystemContainerBase value)) return; SelectedItem = value; @@ -132,9 +131,7 @@ private bool CanSetSelectedItem(object item) if (item == null) return false; - var value = item as MapleFileSystemContainerBase; - - return value != null && value != SelectedItem; + return item is MapleFileSystemContainerBase value && value != SelectedItem; } } } diff --git a/src/Maple.Core/IO/Util/SelectedTreeViewItemBehavior.cs b/src/Maple.Core/IO/Util/SelectedTreeViewItemBehavior.cs deleted file mode 100644 index af7d48c..0000000 --- a/src/Maple.Core/IO/Util/SelectedTreeViewItemBehavior.cs +++ /dev/null @@ -1,72 +0,0 @@ -using System.Windows; -using System.Windows.Controls; -using System.Windows.Interactivity; - -namespace Maple.Core -{ - /// - /// - /// - /// - /// - public class SelectedTreeViewItemBehavior : Behavior - { - /// - /// Gets or sets the selected item. - /// - /// - /// The selected item. - /// - /// - public object SelectedItem - { - get { return GetValue(SelectedItemProperty); } - set { SetValue(SelectedItemProperty, value); } - } - - /// - /// The selected item property - /// - /// - public static readonly DependencyProperty SelectedItemProperty = DependencyProperty.Register( - nameof(SelectedItem), - typeof(object), - typeof(SelectedTreeViewItemBehavior), - new UIPropertyMetadata(null, OnSelectedItemChanged)); - - private static void OnSelectedItemChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e) - { - var item = e.NewValue as TreeViewItem; - - item?.SetValue(TreeViewItem.IsSelectedProperty, true); - } - - /// - /// Called when [attached]. - /// - /// - protected override void OnAttached() - { - base.OnAttached(); - - AssociatedObject.SelectedItemChanged += OnTreeViewSelectedItemChanged; - } - - /// - /// Called when [detaching]. - /// - /// - protected override void OnDetaching() - { - base.OnDetaching(); - - if (AssociatedObject != null) - AssociatedObject.SelectedItemChanged -= OnTreeViewSelectedItemChanged; - } - - private void OnTreeViewSelectedItemChanged(object sender, RoutedPropertyChangedEventArgs e) - { - SelectedItem = e.NewValue; - } - } -} diff --git a/src/Maple.Core/Interfaces/IIocFrameworkElement.cs b/src/Maple.Core/Interfaces/IIocFrameworkElement.cs deleted file mode 100644 index 0724ec1..0000000 --- a/src/Maple.Core/Interfaces/IIocFrameworkElement.cs +++ /dev/null @@ -1,16 +0,0 @@ -namespace Maple.Core -{ - /// - /// - /// - public interface IIocFrameworkElement - { - /// - /// Gets the translation manager. - /// - /// - /// The translation manager. - /// - ILocalizationService TranslationManager { get; } - } -} diff --git a/src/Maple.Core/Interfaces/ILoadableViewModel.cs b/src/Maple.Core/Interfaces/ILoadableViewModel.cs deleted file mode 100644 index e00dcb7..0000000 --- a/src/Maple.Core/Interfaces/ILoadableViewModel.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Windows.Input; -using Maple.Domain; - -namespace Maple.Core -{ - /// - /// - /// - /// - public interface ILoadableViewModel : IRefreshable - { - /// - /// Gets a value indicating whether this instance is loaded. - /// - /// - /// true if this instance is loaded; otherwise, false. - /// - bool IsLoaded { get; } - - ICommand LoadCommand { get; } - ICommand RefreshCommand { get; } - } -} diff --git a/src/Maple.Core/Interfaces/ISaveableViewModel.cs b/src/Maple.Core/Interfaces/ISaveableViewModel.cs deleted file mode 100644 index 219cefc..0000000 --- a/src/Maple.Core/Interfaces/ISaveableViewModel.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Windows.Input; - -namespace Maple.Core -{ - public interface ISaveableViewModel - { - ICommand SaveCommand { get; } - } -} diff --git a/src/Maple.Core/Maple.Core.csproj b/src/Maple.Core/Maple.Core.csproj index e37cb5a..d70fc17 100644 --- a/src/Maple.Core/Maple.Core.csproj +++ b/src/Maple.Core/Maple.Core.csproj @@ -23,6 +23,7 @@ 4 AnyCPU false + 7.2 pdbonly @@ -33,9 +34,10 @@ 4 - - - + + 6.2.2 + + 2.2.0 @@ -43,9 +45,12 @@ 2.2.0 - - - + + 7.1.0.5212 + + + 1.7.8 + @@ -55,6 +60,7 @@ + @@ -72,17 +78,12 @@ - - - - - @@ -90,54 +91,54 @@ - - - + + + - - - - - + + + + + - - + + + + - - - + - - - - - - + + + + + - - + + + + True True Settings.settings - @@ -147,11 +148,22 @@ - + + + - + + + + + + + + + + @@ -159,13 +171,53 @@ - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -189,6 +241,10 @@ {A073FC92-90E3-4541-8B52-6F7293187871} Maple.Localization + + {b5be546f-8d9f-4fb9-b235-af05fd553f9e} + Maple.Youtube + \ No newline at end of file diff --git a/src/Maple.Core/Observables/Base/ILoadableViewModel.cs b/src/Maple.Core/Observables/Base/ILoadableViewModel.cs new file mode 100644 index 0000000..86b44ee --- /dev/null +++ b/src/Maple.Core/Observables/Base/ILoadableViewModel.cs @@ -0,0 +1,10 @@ +namespace Maple.Core +{ + public interface ILoadableViewModel + { + bool IsLoaded { get; } + + IAsyncCommand LoadCommand { get; } + IAsyncCommand RefreshCommand { get; } + } +} diff --git a/src/Maple.Core/Observables/Base/ObservableObject.cs b/src/Maple.Core/Observables/Base/ObservableObject.cs index 163ab2c..b8d7fb7 100644 --- a/src/Maple.Core/Observables/Base/ObservableObject.cs +++ b/src/Maple.Core/Observables/Base/ObservableObject.cs @@ -27,7 +27,7 @@ protected virtual void OnPropertyChanged([CallerMemberName]string propertyName = protected virtual bool SetValue(ref T field, T value, Action OnChanging = null, Action OnChanged = null, [CallerMemberName]string propertyName = null) { - if (EqualityComparer.Default.Equals(field, value)) + if (EqualityComparer.Default.Equals(field, value)) // TODO add cache for equality comparer as readonly field return false; OnChanging?.Invoke(); diff --git a/src/Maple.Core/Observables/BusyStack.cs b/src/Maple.Core/Observables/BusyStack.cs index 02dba57..06be200 100644 --- a/src/Maple.Core/Observables/BusyStack.cs +++ b/src/Maple.Core/Observables/BusyStack.cs @@ -1,5 +1,8 @@ using System; using System.Collections.Concurrent; +using System.Threading.Tasks; +using System.Windows; + using Maple.Localization.Properties; namespace Maple.Core @@ -20,7 +23,7 @@ public class BusyStack : ObservableObject protected ConcurrentBag Items { get { return _items; } - set { SetValue(ref _items, value, InvokeOnChanged); } + set { SetValue(ref _items, value, async () => await InvokeOnChanged()); } } private Action _onChanged; @@ -60,12 +63,12 @@ public BusyStack(Action onChanged) /// Tries to take an item from the stack and returns true if that action was successful /// /// - public bool Pull() + public async Task Pull() { - var result = Items.TryTake(out BusyToken token); + var result = Items.TryTake(out var token); if (result) - InvokeOnChanged(); + await InvokeOnChanged(); return result; } @@ -74,11 +77,11 @@ public bool Pull() /// Adds a new to the Stack /// /// The token. - public void Push(BusyToken token) + public async Task Push(BusyToken token) { Items.Add(token); - InvokeOnChanged(); + await InvokeOnChanged(); } /// @@ -89,7 +92,7 @@ public void Push(BusyToken token) /// public bool HasItems() { - return Items?.TryPeek(out BusyToken token) ?? false; + return Items?.TryPeek(out var token) ?? false; } /// @@ -103,9 +106,9 @@ public BusyToken GetToken() return new BusyToken(this); } - private void InvokeOnChanged() + private async Task InvokeOnChanged() { - DispatcherFactory.Invoke(OnChanged, HasItems()); + await Application.Current.Dispatcher.InvokeAsync(() => OnChanged(HasItems())); } } } diff --git a/src/Maple.Core/Observables/BusyToken.cs b/src/Maple.Core/Observables/BusyToken.cs index f8ce9af..aad612a 100644 --- a/src/Maple.Core/Observables/BusyToken.cs +++ b/src/Maple.Core/Observables/BusyToken.cs @@ -23,9 +23,10 @@ public class BusyToken : WeakReference, IDisposable /// Initializes a new instance of the class. /// /// The stack. - public BusyToken(BusyStack stack) : base(stack) + public BusyToken(BusyStack stack) + : base(stack) { - stack.Push(this); + stack.Push(this).GetAwaiter().GetResult(); } /// diff --git a/src/Maple.Core/Observables/NotifyTaskCompletion.cs b/src/Maple.Core/Observables/NotifyTaskCompletion.cs index cdc8650..792982e 100644 --- a/src/Maple.Core/Observables/NotifyTaskCompletion.cs +++ b/src/Maple.Core/Observables/NotifyTaskCompletion.cs @@ -11,7 +11,7 @@ public sealed class NotifyTaskCompletion : INotifyPropertyChanged public Task Task { get; private set; } public Task TaskCompletion { get; private set; } - public TResult Result => (Task.Status == TaskStatus.RanToCompletion) ? Task.Result : default(TResult); + public TResult Result => (Task.Status == TaskStatus.RanToCompletion) ? Task.Result : default; public TaskStatus Status { get { return Task.Status; } } public bool IsCompleted { get { return Task.IsCompleted; } } diff --git a/src/Maple.Core/Observables/RangeObservableCollection.cs b/src/Maple.Core/Observables/RangeObservableCollection.cs index ce8f7ac..a25725a 100644 --- a/src/Maple.Core/Observables/RangeObservableCollection.cs +++ b/src/Maple.Core/Observables/RangeObservableCollection.cs @@ -1,11 +1,10 @@ using System; -using System.Collections; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Collections.Specialized; using System.ComponentModel; -using System.Linq; using System.Runtime.CompilerServices; + using Maple.Domain; using Maple.Localization.Properties; @@ -47,11 +46,6 @@ private void RaiseCollectionChanged(NotifyCollectionChangedEventArgs param) base.OnCollectionChanged(param); } - public virtual void AddRange(IList items) - { - AddRange(items.Cast()); - } - public virtual void AddRange(IEnumerable items) { if (items == null) @@ -80,34 +74,6 @@ public virtual void RemoveRange(IEnumerable items) OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset)); } - public virtual void RemoveRange(IList items) - { - if (items == null) - throw new ArgumentNullException(nameof(items), $"{nameof(items)} {Resources.IsRequired}"); - - using (_busyStack.GetToken()) - { - foreach (var item in items.Cast()) - Remove(item); - } - - OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset)); - } - - public virtual void RemoveRange(IList items) - { - if (items == null) - throw new ArgumentNullException(nameof(items), $"{nameof(items)} {Resources.IsRequired}"); - - using (_busyStack.GetToken()) - { - foreach (var item in items) - Remove(item); - } - - OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset)); - } - public void OnPropertyChanged([CallerMemberName]string propertyName = null) { OnPropertyChanged(new PropertyChangedEventArgs(propertyName)); @@ -122,10 +88,5 @@ private void RaisePropertyChanged(PropertyChangedEventArgs param) { base.OnPropertyChanged(param); } - - public void AddRange(IList items) - { - AddRange((IEnumerable)items); - } } } diff --git a/src/Maple.Core/Observables/ViewModels/BaseDataListViewModel.cs b/src/Maple.Core/Observables/ViewModels/BaseDataListViewModel.cs index 0b3949d..f179661 100644 --- a/src/Maple.Core/Observables/ViewModels/BaseDataListViewModel.cs +++ b/src/Maple.Core/Observables/ViewModels/BaseDataListViewModel.cs @@ -1,84 +1,59 @@ using System; using System.Collections; using System.Collections.Generic; +using System.ComponentModel; using System.Linq; -using System.Threading.Tasks; -using System.Windows.Input; + using Maple.Domain; using Maple.Localization.Properties; namespace Maple.Core { - /// - /// ListViewModel implementation for ObservableObjects related to the DataAccessLayer (DB) - /// - /// a wrapper class implementing - /// a DTO implementing - /// - public abstract class BaseDataListViewModel : BaseListViewModel, ILoadableViewModel - where TViewModel : BaseDataViewModel, ISequence - where TModel : class, IBaseObject + // TODO add virtualization here + public abstract class BaseDataListViewModel : BaseListViewModel + where TViewModel : VirtualizationViewModel, ISequence + where TModel : class, IEntity { protected readonly ISequenceService _sequenceProvider; protected readonly ILocalizationService _translationService; protected readonly ILoggingService _log; - /// - /// Gets the load command. - /// - /// - /// The load command. - /// - public ICommand LoadCommand => AsyncCommand.Create(LoadAsync, () => !IsLoaded); - /// - /// Gets the refresh command. - /// - /// - /// The refresh command. - /// - public ICommand RefreshCommand => AsyncCommand.Create(LoadAsync); - /// - /// Gets the save command. - /// - /// - /// The save command. - /// - public ICommand SaveCommand => new RelayCommand(Save); + protected IRepository Repository { get; } + + private ICollectionView _view; + public ICollectionView View + { + get { return _view; } + protected set { SetValue(ref _view, value); } + } protected BaseDataListViewModel(ViewModelServiceContainer container) : base(container.Messenger) { + Repository = container.Repository; + _log = container.Log; _translationService = container.LocalizationService; _sequenceProvider = container.SequenceService; - } - public abstract Task LoadAsync(); - public abstract void Save(); + View = new VirtualizingCollectionViewSource(container, Items); + } - /// - /// Removes the specified item. - /// - /// The item. - public override void Remove(TViewModel viewModel) + public override void Remove(TViewModel item) { - if (viewModel == null) - throw new ArgumentNullException(nameof(viewModel), $"{nameof(viewModel)} {Resources.IsRequired}"); + if (item == null) + throw new ArgumentNullException(nameof(item), $"{nameof(item)} {Resources.IsRequired}"); using (BusyStack.GetToken()) { - while (Items.Contains(viewModel)) + while (Items.Contains(item)) { - viewModel.Model.IsDeleted = true; - base.Remove(viewModel); + Repository.Delete(item.ViewModel.Model); + base.Remove(item); } } } - /// - /// Removes the range. - /// - /// The items. public override void RemoveRange(IEnumerable items) { if (items == null) @@ -86,16 +61,11 @@ public override void RemoveRange(IEnumerable items) using (BusyStack.GetToken()) { - items.ForEach(p => p.Model.IsDeleted = true); + items.ForEach(p => Remove(p)); base.RemoveRange(items); } } - /// - /// Removes the range. - /// - /// The items. - /// items public override void RemoveRange(IList items) { if (items == null) @@ -108,14 +78,14 @@ public override void RemoveRange(IList items) } } - public override void Add(TViewModel viewModel) + public override void Add(TViewModel item) { - if (viewModel == null) - throw new ArgumentNullException(nameof(viewModel), $"{nameof(viewModel)} {Resources.IsRequired}"); + if (item == null) + throw new ArgumentNullException(nameof(item), $"{nameof(item)} {Resources.IsRequired}"); var sequence = _sequenceProvider.Get(Items.Cast().ToList()); - viewModel.Sequence = sequence; - base.Add(viewModel); + item.Sequence = sequence; + base.Add(item); } public override void AddRange(IEnumerable items) diff --git a/src/Maple.Core/Observables/ViewModels/BaseDataViewModel.cs b/src/Maple.Core/Observables/ViewModels/BaseDataViewModel.cs index b3fbbd4..ff2ee14 100644 --- a/src/Maple.Core/Observables/ViewModels/BaseDataViewModel.cs +++ b/src/Maple.Core/Observables/ViewModels/BaseDataViewModel.cs @@ -1,11 +1,10 @@ using System; using System.Runtime.CompilerServices; -using Maple.Domain; namespace Maple.Core { - public abstract class BaseDataViewModel : BaseViewModel - where TModel : class, IBaseObject + public abstract class BaseDataViewModel : BaseViewModel + where TModel : class { protected ChangeTracker ChangeTracker { get; } protected bool SkipChangeTracking { get; set; } @@ -15,19 +14,6 @@ public bool IsChanged get { return ChangeTracker.HasChanged; } } - protected override bool SetValue(ref T field, T value, Action OnChanging = null, Action OnChanged = null, [CallerMemberName] string propertyName = null) - { - var result = base.SetValue(ref field, value, OnChanging, OnChanged, propertyName); - - if (result) - { - if (!SkipChangeTracking && ChangeTracker.Update(value, propertyName)) - OnPropertyChanged(nameof(IsChanged)); - } - - return result; - } - protected BaseDataViewModel(TModel model, IMessenger messenger) : base(model, messenger) { @@ -38,5 +24,17 @@ protected BaseDataViewModel(TModel model, IMessenger messenger) SkipChangeTracking = false; } + + protected override bool SetValue(ref T field, T value, Action OnChanging = null, Action OnChanged = null, [CallerMemberName] string propertyName = null) + { + var result = base.SetValue(ref field, value, OnChanging, OnChanged, propertyName); + + if (result && !SkipChangeTracking && ChangeTracker.Update(value, propertyName)) + { + OnPropertyChanged(nameof(IsChanged)); + } + + return result; + } } } diff --git a/src/Maple.Core/Observables/ViewModels/BaseListViewModel.cs b/src/Maple.Core/Observables/ViewModels/BaseListViewModel.cs index f6f54aa..66e70fc 100644 --- a/src/Maple.Core/Observables/ViewModels/BaseListViewModel.cs +++ b/src/Maple.Core/Observables/ViewModels/BaseListViewModel.cs @@ -1,13 +1,10 @@ using System; using System.Collections; using System.Collections.Generic; -using System.Collections.Specialized; +using System.Collections.ObjectModel; using System.ComponentModel; -using System.Diagnostics; using System.Linq; -using System.Windows.Data; using System.Windows.Input; -using Maple.Domain; namespace Maple.Core { @@ -19,226 +16,104 @@ namespace Maple.Core public abstract class BaseListViewModel : ViewModel where TViewModel : INotifyPropertyChanged { - protected readonly object _itemsLock; - - /// - /// Indicates whether the LoadCommand/ the Load Method has been executed yet - /// - public bool IsLoaded { get; protected set; } - private TViewModel _selectedItem; - public virtual TViewModel SelectedItem + public TViewModel SelectedItem { get { return _selectedItem; } set { - if (EqualityComparer.Default.Equals(_selectedItem, value)) - return; - - Messenger.Publish(new ViewModelSelectionChangingMessage(Items, _selectedItem)); - _selectedItem = value; - Messenger.Publish(new ViewModelSelectionChangedMessage(Items, _selectedItem)); - - OnPropertyChanged(); + SetValue(ref _selectedItem, value, + () => Messenger.Publish(new ViewModelSelectionChangingMessage(Items, _selectedItem)), + () => Messenger.Publish(new ViewModelSelectionChangedMessage(Items, _selectedItem))); } } - private IRangeObservableCollection _items; - /// - /// Contains all the UI relevant Models and notifies about changes in the collection and inside the Models themself - /// - [DebuggerBrowsable(DebuggerBrowsableState.RootHidden)] - public IReadOnlyCollection Items - { - get { return (IReadOnlyCollection)_items; } - private set { SetValue(ref _items, (IRangeObservableCollection)value); } - } - - private ICollectionView _view; - /// - /// For grouping, sorting and filtering - /// - /// - /// The view. - /// - public ICollectionView View - { - get { return _view; } - private set { SetValue(ref _view, value); } - } + protected ObservableCollection Items { get; } + public ReadOnlyCollection ReadOnlyItems { get; } - public int Count => Items?.Count ?? 0; - /// - /// Gets the at the specified index. - /// - /// - /// The . - /// - /// The index. - /// public TViewModel this[int index] { - get { return _items[index]; } + get { return Items[index]; } } public ICommand RemoveRangeCommand { get; private set; } public ICommand RemoveCommand { get; private set; } public ICommand ClearCommand { get; private set; } - public ICommand AddCommand { get; protected set; } protected BaseListViewModel(IMessenger messenger) : base(messenger) { - _itemsLock = new object(); - - - Items = new RangeObservableCollection(); - _items.CollectionChanged += ItemsCollectionChanged; - - View = CollectionViewSource.GetDefaultView(Items); - - // initial Notification, so that UI recognizes the value - OnPropertyChanged(nameof(Count)); - - InitializeCommands(); - - BindingOperations.EnableCollectionSynchronization(Items, _itemsLock); - } - - protected BaseListViewModel(IList items, IMessenger messenger) - : this(messenger) - { - AddRange(items); - } - - protected BaseListViewModel(IEnumerable items, IMessenger messenger) - : this(messenger) - { - AddRange(items); - } + Items = new ObservableCollection(); + ReadOnlyItems = new ReadOnlyCollection(Items); - private void InitializeCommands() - { RemoveCommand = new RelayCommand(Remove, CanRemove); RemoveRangeCommand = new RelayCommand(RemoveRange, CanRemoveRange); - ClearCommand = new RelayCommand(() => Clear(), CanClear); - } - - private void ItemsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e) - { - OnPropertyChanged(nameof(Count)); - } - - protected virtual void OnLoaded() - { - IsLoaded = true; - Messenger.Publish(new LoadedMessage(this, this)); + ClearCommand = new RelayCommand(Clear, CanClear); } - /// - /// Adds the specified item. - /// - /// The item. - /// item public virtual void Add(TViewModel item) { if (item == null) throw new ArgumentNullException(nameof(item)); using (BusyStack.GetToken()) - _items.Add(item); + Items.Add(item); } - /// The items. - /// items public virtual void AddRange(IEnumerable items) { if (items == null) throw new ArgumentNullException(nameof(items)); using (BusyStack.GetToken()) - _items.AddRange(items); - } - - protected virtual bool CanAdd(TViewModel item) - { - return Items != null && item != null; + Items.ForEach(p => Add(p)); } - /// - /// Removes the specified item. - /// - /// The item. public virtual void Remove(TViewModel item) { using (BusyStack.GetToken()) - _items.Remove(item); + Items.Remove(item); } - /// The items. - /// items public virtual void RemoveRange(IEnumerable items) { if (items == null) throw new ArgumentNullException(nameof(items)); using (BusyStack.GetToken()) - _items.RemoveRange(items); + Items.ForEach(p => Remove(p)); } - /// The items. - /// items public virtual void RemoveRange(IList items) { if (items == null) throw new ArgumentNullException(nameof(items)); using (BusyStack.GetToken()) - _items.RemoveRange(items.Cast()); + Items.ForEach(p => Remove(p)); } - /// - /// Determines whether this instance can remove the specified item. - /// - /// The item. - /// - /// true if this instance can remove the specified item; otherwise, false. - /// public virtual bool CanRemove(TViewModel item) { return CanClear() && item != null && Items.Contains(item); } - /// - /// Checks if any of the submitted items can be removed - /// - /// The items. - /// - /// true if this instance [can remove range] the specified items; otherwise, false. - /// public virtual bool CanRemoveRange(IEnumerable items) { return CanClear() && items != null && items.Any(p => Items.Contains(p)); } - /// - /// Determines whether this instance [can remove range] the specified items. - /// - /// The items. - /// - /// true if this instance [can remove range] the specified items; otherwise, false. - /// public virtual bool CanRemoveRange(IList items) { - return items == null ? false : CanRemoveRange(items.Cast()); + return !(items == null) && CanRemoveRange(items.Cast()); } public virtual void Clear() { - SelectedItem = default(TViewModel); + SelectedItem = default; using (BusyStack.GetToken()) - _items.Clear(); + Items.Clear(); } public virtual bool CanClear() diff --git a/src/Maple.Core/Observables/ViewModels/ValidableBaseDataListViewModel.cs b/src/Maple.Core/Observables/ViewModels/ValidableBaseDataListViewModel.cs new file mode 100644 index 0000000..a790495 --- /dev/null +++ b/src/Maple.Core/Observables/ViewModels/ValidableBaseDataListViewModel.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; +using System.Windows.Input; + +using Maple.Domain; + +namespace Maple.Core +{ + // TODO add logic for handling INotifyDataErrorInfo for children and on this + public abstract class ValidableBaseDataListViewModel : BaseDataListViewModel, ILoadableViewModel, IVirtualizedListViewModel + where TViewModel : VirtualizationViewModel, ISequence + where TModel : class, IEntity, new() + { + public bool IsLoaded { get; protected set; } + + public IAsyncCommand LoadCommand { get; } + public IAsyncCommand RefreshCommand { get; } + + public ICommand AddCommand { get; } + + protected ValidableBaseDataListViewModel(ViewModelServiceContainer container) + : base(container) + { + AddCommand = new RelayCommand(Add, CanAdd); + LoadCommand = AsyncCommand.Create(Load, CanLoad); + RefreshCommand = AsyncCommand.Create(Refresh, CanRefresh); + } + + private void Add() + { + // create new instance + // add to repo + // wrap in viewmodel + // add to internal list + } + + private bool CanAdd() + { + return Items != null; + } + + private Task Load(CancellationToken token) + { + throw new NotImplementedException(); + } + + private bool CanLoad() + { + return !IsLoaded && !IsBusy; + } + + private Task Refresh() + { + throw new NotImplementedException(); + } + + private bool CanRefresh() + { + return !IsBusy; + } + + protected Task GetCountAsync() + { + return Repository.GetCountAsync(); + } + + protected async Task> GetItemsWithKey(ICollection ids) + { + return await Repository.GetByIdsAsync(ids); + } + + public void ExtendItems(IEnumerable items) + { + throw new System.NotImplementedException(); + } + + public void DeflateItem(object item) + { + throw new System.NotImplementedException(); + } + } +} diff --git a/src/Maple.Core/Observables/ViewModels/ValidableBaseDataViewModel.cs b/src/Maple.Core/Observables/ViewModels/ValidableBaseDataViewModel.cs index 9cd4649..9f99568 100644 --- a/src/Maple.Core/Observables/ViewModels/ValidableBaseDataViewModel.cs +++ b/src/Maple.Core/Observables/ViewModels/ValidableBaseDataViewModel.cs @@ -5,16 +5,18 @@ using System.Diagnostics; using System.Linq; using System.Runtime.CompilerServices; + using FluentValidation; using FluentValidation.Results; + using Maple.Domain; using Maple.Localization.Properties; namespace Maple.Core { - public abstract class ValidableBaseDataViewModel : BaseDataViewModel, INotifyDataErrorInfo - where TViewModel : BaseDataViewModel, ISequence - where TModel : class, IBaseObject + public abstract class ValidableBaseDataViewModel : BaseDataViewModel, INotifyDataErrorInfo + where TViewModel : BaseDataViewModel, ISequence + where TModel : class, IEntity { protected bool SkipValidation { get; set; } @@ -60,13 +62,7 @@ public IEnumerable GetErrors(string propertyName) return Messages[propertyName].Errors.Select(p => p.ErrorMessage); } - /// - /// Validates the specified property name. - /// - /// Name of the property. - /// - /// - public virtual void Validate([CallerMemberName] string propertyName = null) + public virtual void Validate(string propertyName) { if (SkipValidation) return; @@ -81,7 +77,7 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName { base.OnPropertyChanged(propertyName); - if (this == null || SkipValidation) + if (SkipValidation) return; AddOrUpdateValidationResults(Validator.Validate(this, propertyName), propertyName); diff --git a/src/Maple.Core/Observables/ViewModels/ViewModel.cs b/src/Maple.Core/Observables/ViewModels/ViewModel.cs index cc473f4..2c1a5f5 100644 --- a/src/Maple.Core/Observables/ViewModels/ViewModel.cs +++ b/src/Maple.Core/Observables/ViewModels/ViewModel.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; + using Maple.Localization.Properties; namespace Maple.Core @@ -41,7 +42,9 @@ protected virtual void Dispose(bool disposing) if (disposing) { +#pragma warning disable S1066 // Collapsible "if" statements should be merged if (MessageTokens != null) +#pragma warning restore S1066 // Collapsible "if" statements should be merged { foreach (var token in MessageTokens) Messenger.Unsubscribe(token); diff --git a/src/Maple.Core/Observables/Virtualization/Base/IVirtualizedListViewModel.cs b/src/Maple.Core/Observables/Virtualization/Base/IVirtualizedListViewModel.cs new file mode 100644 index 0000000..39ccd74 --- /dev/null +++ b/src/Maple.Core/Observables/Virtualization/Base/IVirtualizedListViewModel.cs @@ -0,0 +1,10 @@ +using System.Collections.Generic; + +namespace Maple.Core +{ + public interface IVirtualizedListViewModel + { + void ExtendItems(IEnumerable items); + void DeflateItem(object item); + } +} diff --git a/src/Maple.Core/Observables/Virtualization/VirtualizationViewModel.cs b/src/Maple.Core/Observables/Virtualization/VirtualizationViewModel.cs new file mode 100644 index 0000000..4c259db --- /dev/null +++ b/src/Maple.Core/Observables/Virtualization/VirtualizationViewModel.cs @@ -0,0 +1,93 @@ +using System; +using System.Threading.Tasks; +using System.Windows.Input; + +using Maple.Localization.Properties; + +namespace Maple.Core +{ + // container for one viewmodel + public class VirtualizationViewModel : ObservableObject + where TModel : class + { + private readonly IDataProvider, TKeyDataType> _dataProvider; + + private readonly TKeyDataType _id; + + private bool _isExtended; + public bool IsExtended + { + get { return _isExtended; } + private set { SetValue(ref _isExtended, value); } + } + + private VirtualizationViewModelState _state; + public VirtualizationViewModelState State // TODO add implementation details + { + get { return _state; } + private set { SetValue(ref _state, value); } + } + + private bool _isBusy; + public bool IsBusy + { + get { return _isBusy; } + private set { SetValue(ref _isBusy, value); } + } + + private BaseDataViewModel _viewModel; + public BaseDataViewModel ViewModel + { + get { return _viewModel; } + set { SetValue(ref _viewModel, value); } + } + + private ICommand _deflateCommand; + public ICommand DeflateCommand + { + get { return _deflateCommand; } + private set { SetValue(ref _deflateCommand, value); } + } + + private IAsyncCommand _expandCommand; + public IAsyncCommand ExpandCommand + { + get { return _expandCommand; } + private set { SetValue(ref _expandCommand, value); } + } + + public VirtualizationViewModel(TKeyDataType id, IDataProvider, TKeyDataType> dataProvider) + { + _id = id; + _dataProvider = dataProvider ?? throw new ArgumentNullException(nameof(dataProvider), $"{nameof(dataProvider)} {Resources.IsRequired}"); + + DeflateCommand = new RelayCommand(Deflate, CanDeflate); + ExpandCommand = AsyncCommand.Create(Expand, CanExpand); + } + + public async Task Expand() + { + if (ViewModel != null) + return; + + ViewModel = await _dataProvider.Get(_id).ConfigureAwait(true); + IsExtended = true; + } + + public bool CanExpand() + { + return ViewModel == null && !IsExtended; + } + + public void Deflate() + { + ViewModel = null; // enables GC + IsExtended = false; + } + + public bool CanDeflate() + { + return ViewModel != null && IsExtended; + } + } +} diff --git a/src/Maple.Core/Observables/Virtualization/VirtualizationViewModelState.cs b/src/Maple.Core/Observables/Virtualization/VirtualizationViewModelState.cs new file mode 100644 index 0000000..3529da6 --- /dev/null +++ b/src/Maple.Core/Observables/Virtualization/VirtualizationViewModelState.cs @@ -0,0 +1,14 @@ +using System; + +namespace Maple.Core +{ + [Flags] + public enum VirtualizationViewModelState + { + None = 0, + Expanded = 1 << 0, + Deflated = 1 << 1, + Expanding = 1 << 2, + Deflating = 1 << 3, + } +} diff --git a/src/Maple.Core/Observables/Virtualization/VirtualizingCollectionViewSource.cs b/src/Maple.Core/Observables/Virtualization/VirtualizingCollectionViewSource.cs new file mode 100644 index 0000000..590ac79 --- /dev/null +++ b/src/Maple.Core/Observables/Virtualization/VirtualizingCollectionViewSource.cs @@ -0,0 +1,71 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Runtime.Caching; +using System.Windows.Data; +using System.Windows.Threading; + +namespace Maple.Core +{ + public sealed class VirtualizingCollectionViewSource : ListCollectionView + { + private readonly IVirtualizedListViewModel _sponsor; + private readonly HashSet _deferredItems; + private readonly MemoryCache _cache; + private readonly CacheItemPolicy _policy; + + private bool _isDeferred; + + public VirtualizingCollectionViewSource(ViewModelServiceContainer container, IList list) + : base(list) + { + if (container == null) + throw new ArgumentNullException(nameof(container)); + + _cache = container.Cache; + _policy = container.CacheItemPolicy; + + _deferredItems = new HashSet(); + _sponsor = list as IVirtualizedListViewModel; + } + + public void CacheRemovedCallback(CacheEntryRemovedArguments arguments) + { + _sponsor.DeflateItem(arguments.CacheItem.Value); + } + + public override object GetItemAt(int index) + { + if (!_isDeferred) + { + _deferredItems.Clear(); + + Dispatcher.BeginInvoke(DispatcherPriority.Normal, (Action)LoadDeferredItems); + + _isDeferred = true; + } + + var item = base.GetItemAt(index); + if (!_deferredItems.Contains(item)) + _deferredItems.Add(item); + + return item; + } + + private void LoadDeferredItems() + { + var uniqueSet = new HashSet(); + foreach (var item in _deferredItems) + { + var hashCode = item.GetHashCode(); + if (!_cache.Contains(hashCode.ToString())) + uniqueSet.Add(item); + + _cache.Add(new CacheItem(hashCode.ToString(), item), _policy); + } + + _sponsor.ExtendItems(uniqueSet); + _isDeferred = false; + } + } +} diff --git a/src/Maple.Core/ProcessExecutionResult.cs b/src/Maple.Core/ProcessExecutionResult.cs deleted file mode 100644 index ab1f89f..0000000 --- a/src/Maple.Core/ProcessExecutionResult.cs +++ /dev/null @@ -1,79 +0,0 @@ -using System; -using System.Diagnostics; - -namespace Maple.Core -{ - /// - /// Represents the result of executing a process. - /// - public sealed class ProcessExecutionResult : IDisposable - { - private Process _process; - private bool _disposed; - - internal ProcessExecutionResult(Process process, string[] standardOutput, string[] standardError) - { - _process = Ensure.NotNull(process, nameof(process)); - - PID = _process.Id; - ExecutionTime = _process.ExitTime - _process.StartTime; - StandardOutput = Ensure.NotNull(standardOutput, nameof(standardOutput)); - StandardError = Ensure.NotNull(standardError, nameof(standardError)); - } - - /// - /// Gets the process ID. - /// - // ReSharper disable once InconsistentNaming - public int PID { get; } - - /// - /// Gets the execution time of the process. - /// - public TimeSpan ExecutionTime { get; } - - /// - /// Gets the standard output of the process. - /// - public string[] StandardOutput { get; } - - /// - /// Gets the standard error of the process. - /// - public string[] StandardError { get; } - - /// - /// Read the value of the process property identified by the given . - /// - public T ReadProcessInfo(Func selector) - { - return selector(_process); - } - - public void Dispose() - { - Dispose(true); - GC.SuppressFinalize(this); - } - - /// - /// Releases all resources used by the underlying process. - /// - private void Dispose(bool disposing) - { - if (_disposed) - return; - - if (disposing) - { - if (_process != null) - { - _process.Dispose(); - _process = null; - } - } - - _disposed = true; - } - } -} diff --git a/src/Maple.Core/Services/Caching/ICachingService.cs b/src/Maple.Core/Services/Caching/ICachingService.cs new file mode 100644 index 0000000..0e1d6eb --- /dev/null +++ b/src/Maple.Core/Services/Caching/ICachingService.cs @@ -0,0 +1,13 @@ +namespace Maple.Core +{ + public interface ICachingService + { + bool Contains(TKey key); + bool Add(TKey key, TObject item); + + bool TryGetValue(TKey key, out TObject item); + + void Clear(); + bool Remove(TKey key); + } +} diff --git a/src/Maple.Core/Services/Caching/MemoryCacheService.cs b/src/Maple.Core/Services/Caching/MemoryCacheService.cs new file mode 100644 index 0000000..94e8aab --- /dev/null +++ b/src/Maple.Core/Services/Caching/MemoryCacheService.cs @@ -0,0 +1,96 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Caching; + +using Maple.Localization.Properties; + +namespace Maple.Core +{ + public abstract class MemoryCacheService : ICachingService + where TObject : class + { + private readonly HashSet _trackedEntries; + private readonly MemoryCache _cache; + private readonly CacheItemPolicy _policy; + private readonly IVirtualizedListViewModel _virtualizationProvider; + private readonly string _cacheKeyPart; + + private MemoryCacheService() + { + _cacheKeyPart = typeof(TObject).FullName; + _trackedEntries = new HashSet(); + _policy = new CacheItemPolicy() + { + SlidingExpiration = TimeSpan.FromSeconds(3), + Priority = CacheItemPriority.Default, + RemovedCallback = new CacheEntryRemovedCallback(CacheRemovedCallback) + }; + } + + protected MemoryCacheService(MemoryCache cache, IVirtualizedListViewModel virtualizationProvider) + : this() + { + _virtualizationProvider = virtualizationProvider ?? throw new ArgumentNullException(nameof(virtualizationProvider), $"{nameof(virtualizationProvider)} {Resources.IsRequired}"); + _cache = cache ?? throw new ArgumentNullException(nameof(cache), $"{nameof(cache)} {Resources.IsRequired}"); + } + + public bool Add(TKey key, TObject item) + { + if (item == null) + throw new ArgumentNullException(nameof(item), $"{nameof(item)} {Resources.IsRequired}"); + + var result = _cache.Add(new CacheItem(GetInternalKey(key), item), _policy); + + if (result) + _trackedEntries.Add(key); + + return result; + } + + public bool Contains(TKey key) + { + return _cache.Contains(GetInternalKey(key)); + } + + public void Clear() + { + foreach (var entry in _trackedEntries) + Remove(entry); + + _trackedEntries.Clear(); + } + + public bool Remove(TKey key) + { + var result = _cache.Remove(GetInternalKey(key)) is TObject; + + if (result) + _trackedEntries.Remove(key); + + return result; + } + + public abstract void CacheRemovedCallback(CacheEntryRemovedArguments arguments); + + private string GetInternalKey(TKey key) + { + return _cacheKeyPart + key; + } + + public bool TryGetValue(TKey key, out TObject item) + { + item = (TObject)_cache.Get(GetInternalKey(key)); + + return true; + } + + // hm, speed? + public bool TryGetValues(out IEnumerable items, params TKey[] keys) + { + items = _cache.GetValues(keys.Select(key => GetInternalKey(key))).Select(p => p.Value).Cast(); + + return true; + } + } +} diff --git a/src/Maple.Core/Services/Caching/SimpleStaticCacheService.cs b/src/Maple.Core/Services/Caching/SimpleStaticCacheService.cs new file mode 100644 index 0000000..7db35cc --- /dev/null +++ b/src/Maple.Core/Services/Caching/SimpleStaticCacheService.cs @@ -0,0 +1,19 @@ +using System.Collections.Generic; + +namespace Maple.Core +{ + public sealed class SimpleStaticCacheService : Dictionary, ICachingService + { + public bool Contains(TPrimaryKeyType key) + { + return ContainsKey(key); + } + + bool ICachingService.Add(TPrimaryKeyType key, TViewModel item) + { + Add(key, item); + + return true; + } + } +} diff --git a/src/Maple.Core/Services/Caching/WeakReferenceCache.cs b/src/Maple.Core/Services/Caching/WeakReferenceCache.cs new file mode 100644 index 0000000..141b61d --- /dev/null +++ b/src/Maple.Core/Services/Caching/WeakReferenceCache.cs @@ -0,0 +1,64 @@ +using System; +using System.Collections.Concurrent; + +namespace Maple.Core +{ + public sealed class WeakReferenceCache : ICachingService + where TObject : class + { + private readonly ConcurrentDictionary> _references; + + public WeakReferenceCache() + { + _references = new ConcurrentDictionary>(); + } + + public bool Add(TKey key, TObject item) + { + return Add(key, item, false); + } + + public bool Add(TKey key, TObject item, bool isStrongReference) + { + if (item is IDisposable) + throw new ArgumentException("can't accept IDisposeable, since we dont know when the object will be disposed and we cant call Dispose on it"); + + _references.AddOrUpdate(key, new WeakReference(item), (existingKey, existingEntry) => new WeakReference(item)); + + + return true; + // Consider + // And finally a word of warning: weak references aren't a guaranteed profit for application performance. + // In most cases, they will make an algorithm more performant than when using very large local variables. + // But it's not guaranteed, and in some cases it could produce noticeable overhead(for example when the huge object is a data structure consisting of many smaller objects with references to each other, + // and a WeakRefence to the data structure turns all those internal refernces to weak references, this might incur garbage collector overhead, + // because every reference has to be checked to decide if the object as a whole can be recovered or deleted). + // So the best advice with weak references is: profile or benchmark it, to make sure that you choose the best solution for your specific situation. + } + + public bool TryGetValue(TKey key, out TObject item) + { + item = default; + + if (_references.TryGetValue(key, out var reference)) + return reference.TryGetTarget(out item); + + return false; + } + + public void Clear() + { + _references.Clear(); + } + + public bool Contains(TKey key) + { + return _references.ContainsKey(key); + } + + public bool Remove(TKey key) + { + return _references.TryRemove(key, out _); + } + } +} diff --git a/src/Maple.Core/Services/DataAccess/Base/BaseDataProvider.cs b/src/Maple.Core/Services/DataAccess/Base/BaseDataProvider.cs new file mode 100644 index 0000000..18b3854 --- /dev/null +++ b/src/Maple.Core/Services/DataAccess/Base/BaseDataProvider.cs @@ -0,0 +1,60 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; + +using Maple.Domain; +using Maple.Localization.Properties; + +namespace Maple.Core +{ + public abstract class BaseDataProvider : IDataProvider + where TViewModel : class + { + private readonly ICachingService _cache; + + protected BaseDataProvider(IRepository mapleRepository, ICachingService cache) + { + _cache = cache ?? throw new ArgumentNullException(nameof(cache), $"{nameof(cache)} {Resources.IsRequired}"); + } + + public async Task Chunk(IEnumerable Ids) + { + foreach (var id in Ids) + { + if (_cache.Contains(id)) + continue; + + _cache.Add(id, await InternalGet(id).ConfigureAwait(false)); + } + } + + public async Task Get(TPrimaryKeyType key) + { + if (_cache.TryGetValue(key, out var result)) + return result; + + return await InternalGet(key).ConfigureAwait(false); + } + + + private async Task InternalGet(TPrimaryKeyType key) + { + throw new NotImplementedException(); + + // check cache for entry + // ask repository for entry + // wrap result with mapper + // return result + } + + public void Clear() + { + _cache.Clear(); + } + + public void Remove(TPrimaryKeyType id) + { + _cache.Remove(id); + } + } +} diff --git a/src/Maple.Core/Services/DataAccess/Base/IDataProvider.cs b/src/Maple.Core/Services/DataAccess/Base/IDataProvider.cs new file mode 100644 index 0000000..be749d4 --- /dev/null +++ b/src/Maple.Core/Services/DataAccess/Base/IDataProvider.cs @@ -0,0 +1,15 @@ +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace Maple.Core +{ + public interface IDataProvider + { + Task Get(TPrimaryKeyType id); + + Task Chunk(IEnumerable Ids); + + void Clear(); + void Remove(TPrimaryKeyType id); + } +} diff --git a/src/Maple.Core/Services/DetailLoggingService.cs b/src/Maple.Core/Services/DetailLoggingService.cs deleted file mode 100644 index 2a40703..0000000 --- a/src/Maple.Core/Services/DetailLoggingService.cs +++ /dev/null @@ -1,81 +0,0 @@ -using System; -using Maple.Domain; -using Maple.Localization.Properties; - -namespace Maple.Core -{ - /// - /// Generates a Diagnostic report when exceptions are being thrown around - /// - public class DetailLoggingService : ILoggingService - { - private readonly ILoggingService _log; - - private bool _hasLoggedException = false; - - public DetailLoggingService(ILoggingService log) - { - _log = log ?? throw new ArgumentNullException(nameof(log), $"{nameof(log)} {Resources.IsRequired}"); - } - - public void Error(object message) - { - if (!_hasLoggedException) - _log.Error(DiagnosticReport.Generate(DiagnosticReportType.Full)); - - _log.Error(message); - - _hasLoggedException = true; - } - - public void Error(object message, Exception exception) - { - if (!_hasLoggedException) - _log.Error(DiagnosticReport.Generate(DiagnosticReportType.Full)); - - _log.Error(message, exception); - - _hasLoggedException = true; - } - - public void Fatal(object message) - { - if (!_hasLoggedException) - _log.Fatal(DiagnosticReport.Generate(DiagnosticReportType.Full)); - - _log.Fatal(message); - - _hasLoggedException = true; - } - - public void Fatal(object message, Exception exception) - { - if (!_hasLoggedException) - _log.Fatal(DiagnosticReport.Generate(DiagnosticReportType.Full)); - - _log.Fatal(message, exception); - - _hasLoggedException = true; - } - - public void Info(object message) - { - _log.Info(message); - } - - public void Info(object message, Exception exception) - { - _log.Info(message, exception); - } - - public void Warn(object message) - { - _log.Warn(message); - } - - public void Warn(object message, Exception exception) - { - _log.Warn(message, exception); - } - } -} diff --git a/src/Maple.Core/Services/Localization/LocalizationDTO.cs b/src/Maple.Core/Services/Localization/LocalizationDTO.cs index 6e762f7..019b3b4 100644 --- a/src/Maple.Core/Services/Localization/LocalizationDTO.cs +++ b/src/Maple.Core/Services/Localization/LocalizationDTO.cs @@ -1,6 +1,8 @@ using System; using System.ComponentModel; using System.Windows; + +using Maple.Domain; using Maple.Localization.Properties; namespace Maple.Core @@ -12,13 +14,13 @@ namespace Maple.Core /// /// /// - public class LocalizationDTO : ObservableObject, INotifyPropertyChanged, IDisposable + public class LocalizationDto : ObservableObject, IDisposable { private readonly string _key; private readonly ILocalizationService _service; private readonly bool _toUpper; - public LocalizationDTO(ILocalizationService service, string key, bool toUpper) + public LocalizationDto(ILocalizationService service, string key, bool toUpper) { _service = service ?? throw new ArgumentNullException(nameof(service), $"{nameof(service)} {Resources.IsRequired}"); _key = key ?? throw new ArgumentNullException(nameof(key), $"{nameof(key)} {Resources.IsRequired}"); diff --git a/src/Maple.Core/Services/Localization/LocalizationService.cs b/src/Maple.Core/Services/Localization/LocalizationService.cs index 36bd82b..63c5736 100644 --- a/src/Maple.Core/Services/Localization/LocalizationService.cs +++ b/src/Maple.Core/Services/Localization/LocalizationService.cs @@ -54,28 +54,30 @@ public string Translate(string key) return $"!{key}!"; } - public void Save() + public Task Save() { Properties.Settings.Default.StartUpCulture = CurrentLanguage; Properties.Settings.Default.Save(); + + return Task.CompletedTask; } - public void Load() + public Task Load() { _log.Info($"{Resources.Loading} {GetType().Name}"); Thread.CurrentThread.CurrentCulture = Properties.Settings.Default.StartUpCulture; + + return Task.CompletedTask; } public Task SaveAsync() { - Save(); - return Task.CompletedTask; + return Save(); } public Task LoadAsync() { - Load(); - return Task.CompletedTask; + return Load(); } } } diff --git a/src/Maple.Core/Services/LogNotifcationService.cs b/src/Maple.Core/Services/Logging/LogNotifcationService.cs similarity index 93% rename from src/Maple.Core/Services/LogNotifcationService.cs rename to src/Maple.Core/Services/Logging/LogNotifcationService.cs index e8e05c8..d586872 100644 --- a/src/Maple.Core/Services/LogNotifcationService.cs +++ b/src/Maple.Core/Services/Logging/LogNotifcationService.cs @@ -4,6 +4,9 @@ namespace Maple.Core { + /// + /// Facade to forward log messages to the UI + /// public class LoggingNotifcationService : ILoggingNotifcationService { private readonly ILoggingService _log; diff --git a/src/Maple.Core/Services/LoggingService.cs b/src/Maple.Core/Services/Logging/LoggingService.cs similarity index 98% rename from src/Maple.Core/Services/LoggingService.cs rename to src/Maple.Core/Services/Logging/LoggingService.cs index 32d04b0..b6b2914 100644 --- a/src/Maple.Core/Services/LoggingService.cs +++ b/src/Maple.Core/Services/Logging/LoggingService.cs @@ -1,11 +1,13 @@ using System; + using log4net; + using Maple.Domain; namespace Maple.Core { /// - /// + /// actual log /// /// public class LoggingService : ILoggingService @@ -85,8 +87,6 @@ public void Info(object message) /// The exception. public void Info(object message, Exception exception) { - var text = (string)message; - _log.Info(message, exception); } diff --git a/src/Maple/Utils/Mappers/Base/BaseMapper.cs b/src/Maple.Core/Services/Mapping/Base/BaseMapper.cs similarity index 97% rename from src/Maple/Utils/Mappers/Base/BaseMapper.cs rename to src/Maple.Core/Services/Mapping/Base/BaseMapper.cs index 74fa2f9..09a81cd 100644 --- a/src/Maple/Utils/Mappers/Base/BaseMapper.cs +++ b/src/Maple.Core/Services/Mapping/Base/BaseMapper.cs @@ -1,11 +1,10 @@ using System; using AutoMapper; using FluentValidation; -using Maple.Core; using Maple.Domain; using Maple.Localization.Properties; -namespace Maple +namespace Maple.Core { public abstract class BaseMapper { diff --git a/src/Maple.Core/Services/Mapping/Base/IBaseMapper.cs b/src/Maple.Core/Services/Mapping/Base/IBaseMapper.cs new file mode 100644 index 0000000..97fc5fd --- /dev/null +++ b/src/Maple.Core/Services/Mapping/Base/IBaseMapper.cs @@ -0,0 +1,11 @@ +namespace Maple.Core +{ + public interface IBaseMapper + where TVieModel : BaseDataViewModel + where TDataModel : class + { + TVieModel Get(TDataModel model); + + TDataModel GetData(TVieModel viewModel); + } +} diff --git a/src/Maple/Interfaces/IMediaItemMapper.cs b/src/Maple.Core/Services/Mapping/Base/IMediaItemMapper.cs similarity index 85% rename from src/Maple/Interfaces/IMediaItemMapper.cs rename to src/Maple.Core/Services/Mapping/Base/IMediaItemMapper.cs index f987723..ea4c5ae 100644 --- a/src/Maple/Interfaces/IMediaItemMapper.cs +++ b/src/Maple.Core/Services/Mapping/Base/IMediaItemMapper.cs @@ -1,8 +1,8 @@ using Maple.Domain; -namespace Maple +namespace Maple.Core { - public interface IMediaItemMapper : IBaseMapper + public interface IMediaItemMapper : IBaseMapper { MediaItem GetNewMediaItem(int sequence, Playlist playlist); MediaItemModel GetDataNewMediaItem(PlaylistModel playlist); diff --git a/src/Maple/Interfaces/IMediaPlayerMapper.cs b/src/Maple.Core/Services/Mapping/Base/IMediaPlayerMapper.cs similarity index 87% rename from src/Maple/Interfaces/IMediaPlayerMapper.cs rename to src/Maple.Core/Services/Mapping/Base/IMediaPlayerMapper.cs index ed7f9cb..bcf9bc3 100644 --- a/src/Maple/Interfaces/IMediaPlayerMapper.cs +++ b/src/Maple.Core/Services/Mapping/Base/IMediaPlayerMapper.cs @@ -1,8 +1,8 @@ using Maple.Domain; -namespace Maple +namespace Maple.Core { - public interface IMediaPlayerMapper : IBaseMapper + public interface IMediaPlayerMapper : IBaseMapper { MainMediaPlayer GetMain(MediaPlayerModel player, Playlist playlist); diff --git a/src/Maple/Interfaces/IPlaylistMapper.cs b/src/Maple.Core/Services/Mapping/Base/IPlaylistMapper.cs similarity index 78% rename from src/Maple/Interfaces/IPlaylistMapper.cs rename to src/Maple.Core/Services/Mapping/Base/IPlaylistMapper.cs index 014b807..daa37ca 100644 --- a/src/Maple/Interfaces/IPlaylistMapper.cs +++ b/src/Maple.Core/Services/Mapping/Base/IPlaylistMapper.cs @@ -1,8 +1,8 @@ using Maple.Domain; -namespace Maple +namespace Maple.Core { - public interface IPlaylistMapper : IBaseMapper + public interface IPlaylistMapper : IBaseMapper { Playlist GetNewPlaylist(); } diff --git a/src/Maple/Utils/Mappers/MapperExtensions.cs b/src/Maple.Core/Services/Mapping/Base/MapperExtensions.cs similarity index 97% rename from src/Maple/Utils/Mappers/MapperExtensions.cs rename to src/Maple.Core/Services/Mapping/Base/MapperExtensions.cs index 5836b58..de65f6d 100644 --- a/src/Maple/Utils/Mappers/MapperExtensions.cs +++ b/src/Maple.Core/Services/Mapping/Base/MapperExtensions.cs @@ -3,9 +3,8 @@ using System.Linq; using System.Linq.Expressions; using AutoMapper; -using Maple.Core; -namespace Maple +namespace Maple.Core { /// /// Extensions for diff --git a/src/Maple/Utils/Mappers/MediaItemMapper.cs b/src/Maple.Core/Services/Mapping/MediaItemMapper.cs similarity index 80% rename from src/Maple/Utils/Mappers/MediaItemMapper.cs rename to src/Maple.Core/Services/Mapping/MediaItemMapper.cs index d6fbc16..3fcd164 100644 --- a/src/Maple/Utils/Mappers/MediaItemMapper.cs +++ b/src/Maple.Core/Services/Mapping/MediaItemMapper.cs @@ -1,10 +1,11 @@ using AutoMapper; + using FluentValidation; -using Maple.Core; + using Maple.Domain; using Maple.Localization.Properties; -namespace Maple +namespace Maple.Core { /// /// Provides logic to map between different domain objects of the MediaItemType @@ -51,19 +52,24 @@ public MediaItemModel GetDataNewMediaItem(PlaylistModel playlist) }; } - public MediaItem Get(MediaItemModel mediaitem) + public MediaItem Get(MediaItemModel model) { - return new MediaItem(mediaitem, _validator, _messenger); + if (model == null) + { + throw new System.ArgumentNullException(nameof(model)); + } + + return new MediaItem(model, _validator, _messenger); } /// /// Gets the data. /// - /// The mediaitem. + /// The mediaitem. /// - public MediaItemModel GetData(MediaItem mediaitem) + public MediaItemModel GetData(MediaItem viewModel) { - return mediaitem.Model; + return viewModel.Model; } } } diff --git a/src/Maple/Utils/Mappers/MediaPlayerMapper.cs b/src/Maple.Core/Services/Mapping/MediaPlayerMapper.cs similarity index 94% rename from src/Maple/Utils/Mappers/MediaPlayerMapper.cs rename to src/Maple.Core/Services/Mapping/MediaPlayerMapper.cs index fdc7207..e7a6b92 100644 --- a/src/Maple/Utils/Mappers/MediaPlayerMapper.cs +++ b/src/Maple.Core/Services/Mapping/MediaPlayerMapper.cs @@ -1,11 +1,13 @@ using System; + using AutoMapper; + using FluentValidation; -using Maple.Core; + using Maple.Domain; using Maple.Localization.Properties; -namespace Maple +namespace Maple.Core { public sealed class MediaPlayerMapper : BaseMapper, IMediaPlayerMapper { @@ -23,7 +25,7 @@ public MediaPlayerMapper(ViewModelServiceContainer container, IMediaPlayer media protected override void InitializeMapper() { - var config = new MapperConfiguration(cfg => // TODO mapper configuration + var config = new MapperConfiguration(cfg => { }); diff --git a/src/Maple/Utils/Mappers/PlaylistMapper.cs b/src/Maple.Core/Services/Mapping/PlaylistMapper.cs similarity index 89% rename from src/Maple/Utils/Mappers/PlaylistMapper.cs rename to src/Maple.Core/Services/Mapping/PlaylistMapper.cs index c8d2d5d..230628f 100644 --- a/src/Maple/Utils/Mappers/PlaylistMapper.cs +++ b/src/Maple.Core/Services/Mapping/PlaylistMapper.cs @@ -1,11 +1,13 @@ using System; + using AutoMapper; + using FluentValidation; -using Maple.Core; + using Maple.Domain; using Maple.Localization.Properties; -namespace Maple +namespace Maple.Core { /// /// Provides logic to map between different domain objects of the Playlisttype @@ -57,9 +59,14 @@ public Playlist Get(PlaylistModel model) return new Playlist(_container, _validator, _dialogViewModel, _mediaItemMapper, model); } - public PlaylistModel GetData(Playlist mediaitem) + public PlaylistModel GetData(Playlist viewModel) { - return mediaitem.Model; + if (viewModel == null) + { + throw new ArgumentNullException(nameof(viewModel)); + } + + return viewModel.Model; } } } diff --git a/src/Maple/Services/SquirrelLogger.cs b/src/Maple.Core/Services/SquirrelLogger.cs similarity index 99% rename from src/Maple/Services/SquirrelLogger.cs rename to src/Maple.Core/Services/SquirrelLogger.cs index 05522d3..230c5ed 100644 --- a/src/Maple/Services/SquirrelLogger.cs +++ b/src/Maple.Core/Services/SquirrelLogger.cs @@ -1,7 +1,9 @@ using System; using System.ComponentModel; + using Maple.Domain; using Maple.Localization.Properties; + using Splat; namespace Maple @@ -13,13 +15,13 @@ public class SquirrelLogger : Splat.ILogger, ILoggingService { private readonly ILoggingService _log; - public LogLevel Level { get; set; } - public SquirrelLogger(ILoggingService log) { _log = log ?? throw new ArgumentNullException(nameof(log), $"{nameof(log)} {Resources.IsRequired}"); } + public LogLevel Level { get; set; } + public void Error(object message) { _log.Error(message); diff --git a/src/Maple/Utils/Validation/Base/BaseValidator.cs b/src/Maple.Core/Services/Validation/Base/BaseValidator.cs similarity index 90% rename from src/Maple/Utils/Validation/Base/BaseValidator.cs rename to src/Maple.Core/Services/Validation/Base/BaseValidator.cs index 66d88a9..f8729ac 100644 --- a/src/Maple/Utils/Validation/Base/BaseValidator.cs +++ b/src/Maple.Core/Services/Validation/Base/BaseValidator.cs @@ -1,11 +1,13 @@ using System; + using FluentValidation; -using Maple.Core; + +using Maple.Domain; using Maple.Localization.Properties; -namespace Maple +namespace Maple.Core { - public abstract class BaseValidator : AbstractValidator, IValidator + public abstract class BaseValidator : AbstractValidator { protected readonly ILocalizationService _translationService; diff --git a/src/Maple/Utils/Validation/MediaItemValidator.cs b/src/Maple.Core/Services/Validation/MediaItemValidator.cs similarity index 77% rename from src/Maple/Utils/Validation/MediaItemValidator.cs rename to src/Maple.Core/Services/Validation/MediaItemValidator.cs index b744c44..e32e73f 100644 --- a/src/Maple/Utils/Validation/MediaItemValidator.cs +++ b/src/Maple.Core/Services/Validation/MediaItemValidator.cs @@ -1,9 +1,10 @@ using FluentValidation; -using Maple.Core; -namespace Maple +using Maple.Domain; + +namespace Maple.Core { - public class MediaItemValidator : BaseValidator, IValidator + public class MediaItemValidator : BaseValidator { public MediaItemValidator(ILocalizationService translationService) : base(translationService) diff --git a/src/Maple/Utils/Validation/MediaPlayerValidator.cs b/src/Maple.Core/Services/Validation/MediaPlayerValidator.cs similarity index 91% rename from src/Maple/Utils/Validation/MediaPlayerValidator.cs rename to src/Maple.Core/Services/Validation/MediaPlayerValidator.cs index 764ca08..043c97b 100644 --- a/src/Maple/Utils/Validation/MediaPlayerValidator.cs +++ b/src/Maple.Core/Services/Validation/MediaPlayerValidator.cs @@ -1,9 +1,10 @@ using FluentValidation; -using Maple.Core; -namespace Maple +using Maple.Domain; + +namespace Maple.Core { - public class MediaPlayerValidator : BaseValidator, IValidator + public class MediaPlayerValidator : BaseValidator { public MediaPlayerValidator(ILocalizationService translationService) : base(translationService) diff --git a/src/Maple/Utils/Validation/PlaylistValidator.cs b/src/Maple.Core/Services/Validation/PlaylistValidator.cs similarity index 70% rename from src/Maple/Utils/Validation/PlaylistValidator.cs rename to src/Maple.Core/Services/Validation/PlaylistValidator.cs index 6a800b0..1a6612c 100644 --- a/src/Maple/Utils/Validation/PlaylistValidator.cs +++ b/src/Maple.Core/Services/Validation/PlaylistValidator.cs @@ -1,9 +1,10 @@ using FluentValidation; -using Maple.Core; -namespace Maple +using Maple.Domain; + +namespace Maple.Core { - public class PlaylistValidator : BaseValidator, IValidator + public class PlaylistValidator : BaseValidator { public PlaylistValidator(ILocalizationService translationService, IValidator mediaItemValidator) : base(translationService) @@ -16,11 +17,6 @@ public PlaylistValidator(ILocalizationService translationService, IValidator playlist.PrivacyStatus).NotNull(); - RuleFor(playlist => playlist.UpdatedBy).NotEmpty(); - RuleFor(playlist => playlist.UpdatedBy).NotEmpty(); - RuleFor(playlist => playlist.CreatedBy).NotEmpty(); - RuleFor(playlist => playlist.CreatedOn).NotEmpty(); - RuleFor(playlist => playlist.RepeatModes).NotEmpty(); RuleFor(playlist => playlist.RepeatMode).NotNull(); diff --git a/src/Maple.Core/Services/Validation/PlaylistsValidator.cs b/src/Maple.Core/Services/Validation/PlaylistsValidator.cs new file mode 100644 index 0000000..43d567f --- /dev/null +++ b/src/Maple.Core/Services/Validation/PlaylistsValidator.cs @@ -0,0 +1,17 @@ +using FluentValidation; + +using Maple.Domain; + +namespace Maple.Core +{ + public class PlaylistsValidator : BaseValidator + { + public PlaylistsValidator(ILocalizationService translationService, IValidator playlistValidator) + : base(translationService) + { + RuleFor(playlists => playlists.ReadOnlyItems) + .NotEmpty() + .SetCollectionValidator(playlistValidator); + } + } +} diff --git a/src/Maple/Services/VersionService.cs b/src/Maple.Core/Services/VersionService.cs similarity index 100% rename from src/Maple/Services/VersionService.cs rename to src/Maple.Core/Services/VersionService.cs diff --git a/src/Maple/ViewModels/Dialogs/Base/DialogBaseViewModel.cs b/src/Maple.Core/ViewModels/Dialogs/Base/DialogBaseViewModel.cs similarity index 94% rename from src/Maple/ViewModels/Dialogs/Base/DialogBaseViewModel.cs rename to src/Maple.Core/ViewModels/Dialogs/Base/DialogBaseViewModel.cs index e05fbd6..b0bbb11 100644 --- a/src/Maple/ViewModels/Dialogs/Base/DialogBaseViewModel.cs +++ b/src/Maple.Core/ViewModels/Dialogs/Base/DialogBaseViewModel.cs @@ -2,13 +2,12 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Input; -using Maple.Core; -namespace Maple +namespace Maple.Core { public abstract class DialogBaseViewModel : ViewModel { - public EventHandler DialogClosed; + private EventHandler _dialogClosed; public ExceptionContentDialogViewModel ExceptionDialogViewModel { get; protected set; } public MessageContentDialogViewModel MessageDialogViewModel { get; protected set; } @@ -67,7 +66,7 @@ protected DialogBaseViewModel(IMessenger messenger) private void OnOpenChanged() { if (!IsOpen) - DialogClosed?.Invoke(this, EventArgs.Empty); + _dialogClosed?.Invoke(this, EventArgs.Empty); } /// @@ -87,7 +86,7 @@ public void Accept() /// public bool CanAccept() { - return CanClose() && (CanAcceptFunc?.Invoke() ?? true) == true; + return CanClose() && (CanAcceptFunc?.Invoke() ?? true); } /// @@ -107,7 +106,7 @@ public void Cancel() /// public bool CanCancel() { - return CanClose() && (CanCancelFunc?.Invoke() ?? true) == true; + return CanClose() && (CanCancelFunc?.Invoke() ?? true); } public Task Open() @@ -126,13 +125,13 @@ public async Task Open(CancellationToken token) void lambda(object s, EventArgs e) => tcs.TrySetResult(null); try { - DialogClosed += lambda; + _dialogClosed += lambda; IsOpen = true; // open dialog await tcs.Task.ConfigureAwait(false); // wait for dialog to close } finally { - DialogClosed -= lambda; + _dialogClosed -= lambda; registration.Dispose(); } } diff --git a/src/Maple/ViewModels/Dialogs/Base/IDialogViewModel.cs b/src/Maple.Core/ViewModels/Dialogs/Base/IDialogViewModel.cs similarity index 96% rename from src/Maple/ViewModels/Dialogs/Base/IDialogViewModel.cs rename to src/Maple.Core/ViewModels/Dialogs/Base/IDialogViewModel.cs index e517e82..b440013 100644 --- a/src/Maple/ViewModels/Dialogs/Base/IDialogViewModel.cs +++ b/src/Maple.Core/ViewModels/Dialogs/Base/IDialogViewModel.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using Maple.Core; -namespace Maple +namespace Maple.Core { public interface IDialogViewModel { diff --git a/src/Maple/ViewModels/Dialogs/DialogContentViewModels/ExceptionContentDialogViewModel.cs b/src/Maple.Core/ViewModels/Dialogs/DialogContentViewModels/ExceptionContentDialogViewModel.cs similarity index 92% rename from src/Maple/ViewModels/Dialogs/DialogContentViewModels/ExceptionContentDialogViewModel.cs rename to src/Maple.Core/ViewModels/Dialogs/DialogContentViewModels/ExceptionContentDialogViewModel.cs index 9fbae6a..c157b60 100644 --- a/src/Maple/ViewModels/Dialogs/DialogContentViewModels/ExceptionContentDialogViewModel.cs +++ b/src/Maple.Core/ViewModels/Dialogs/DialogContentViewModels/ExceptionContentDialogViewModel.cs @@ -1,7 +1,6 @@ using System; -using Maple.Core; -namespace Maple +namespace Maple.Core { public class ExceptionContentDialogViewModel : ObservableObject { diff --git a/src/Maple/ViewModels/Dialogs/DialogContentViewModels/IO/FileBrowserContentDialogViewModel.cs b/src/Maple.Core/ViewModels/Dialogs/DialogContentViewModels/IO/FileBrowserContentDialogViewModel.cs similarity index 70% rename from src/Maple/ViewModels/Dialogs/DialogContentViewModels/IO/FileBrowserContentDialogViewModel.cs rename to src/Maple.Core/ViewModels/Dialogs/DialogContentViewModels/IO/FileBrowserContentDialogViewModel.cs index 3c9377b..e3c1788 100644 --- a/src/Maple/ViewModels/Dialogs/DialogContentViewModels/IO/FileBrowserContentDialogViewModel.cs +++ b/src/Maple.Core/ViewModels/Dialogs/DialogContentViewModels/IO/FileBrowserContentDialogViewModel.cs @@ -1,13 +1,11 @@ using System; -using Maple.Core; + using Maple.Localization.Properties; -namespace Maple +namespace Maple.Core { public class FileBrowserContentDialogViewModel : ObservableObject { - private FileSystemBrowserOptions _options; - private FileSystemViewModel _fileSystemViewModel; public FileSystemViewModel FileSystemViewModel { @@ -15,9 +13,8 @@ public FileSystemViewModel FileSystemViewModel private set { SetValue(ref _fileSystemViewModel, value); } } - public FileBrowserContentDialogViewModel(FileSystemViewModel fileSystemViewModel, FileSystemBrowserOptions options) + public FileBrowserContentDialogViewModel(FileSystemViewModel fileSystemViewModel) { - _options = options ?? throw new ArgumentNullException(nameof(options), $"{nameof(options)} {Resources.IsRequired}"); FileSystemViewModel = fileSystemViewModel ?? throw new ArgumentNullException(nameof(fileSystemViewModel), $"{nameof(fileSystemViewModel)} {Resources.IsRequired}"); } } diff --git a/src/Maple/ViewModels/Dialogs/DialogContentViewModels/IO/FileSystemBrowserOptions.cs b/src/Maple.Core/ViewModels/Dialogs/DialogContentViewModels/IO/FileSystemBrowserOptions.cs similarity index 94% rename from src/Maple/ViewModels/Dialogs/DialogContentViewModels/IO/FileSystemBrowserOptions.cs rename to src/Maple.Core/ViewModels/Dialogs/DialogContentViewModels/IO/FileSystemBrowserOptions.cs index 02f388e..15d41c5 100644 --- a/src/Maple/ViewModels/Dialogs/DialogContentViewModels/IO/FileSystemBrowserOptions.cs +++ b/src/Maple.Core/ViewModels/Dialogs/DialogContentViewModels/IO/FileSystemBrowserOptions.cs @@ -1,6 +1,4 @@ -using Maple.Core; - -namespace Maple +namespace Maple.Core { public class FileSystemBrowserOptions : ObservableObject { diff --git a/src/Maple/ViewModels/Dialogs/DialogContentViewModels/IO/FileSystemFolderBrowserOptions.cs b/src/Maple.Core/ViewModels/Dialogs/DialogContentViewModels/IO/FileSystemFolderBrowserOptions.cs similarity index 92% rename from src/Maple/ViewModels/Dialogs/DialogContentViewModels/IO/FileSystemFolderBrowserOptions.cs rename to src/Maple.Core/ViewModels/Dialogs/DialogContentViewModels/IO/FileSystemFolderBrowserOptions.cs index ce464be..a43e3ea 100644 --- a/src/Maple/ViewModels/Dialogs/DialogContentViewModels/IO/FileSystemFolderBrowserOptions.cs +++ b/src/Maple.Core/ViewModels/Dialogs/DialogContentViewModels/IO/FileSystemFolderBrowserOptions.cs @@ -1,4 +1,4 @@ -namespace Maple +namespace Maple.Core { public class FileSystemFolderBrowserOptions : FileSystemBrowserOptions { diff --git a/src/Maple/ViewModels/Dialogs/DialogContentViewModels/IO/FolderBrowserContentDialogViewModel.cs b/src/Maple.Core/ViewModels/Dialogs/DialogContentViewModels/IO/FolderBrowserContentDialogViewModel.cs similarity index 70% rename from src/Maple/ViewModels/Dialogs/DialogContentViewModels/IO/FolderBrowserContentDialogViewModel.cs rename to src/Maple.Core/ViewModels/Dialogs/DialogContentViewModels/IO/FolderBrowserContentDialogViewModel.cs index cba7ecc..f96ebee 100644 --- a/src/Maple/ViewModels/Dialogs/DialogContentViewModels/IO/FolderBrowserContentDialogViewModel.cs +++ b/src/Maple.Core/ViewModels/Dialogs/DialogContentViewModels/IO/FolderBrowserContentDialogViewModel.cs @@ -1,23 +1,20 @@ using System; -using Maple.Core; + using Maple.Localization.Properties; -namespace Maple +namespace Maple.Core { public class FolderBrowserContentDialogViewModel : ObservableObject { - private FileSystemBrowserOptions _options; private FileSystemViewModel _fileSystemViewModel; - public FileSystemViewModel FileSystemViewModel { get { return _fileSystemViewModel; } private set { SetValue(ref _fileSystemViewModel, value); } } - public FolderBrowserContentDialogViewModel(FileSystemViewModel fileSystemViewModel, FileSystemBrowserOptions options) + public FolderBrowserContentDialogViewModel(FileSystemViewModel fileSystemViewModel) { - _options = options ?? throw new ArgumentNullException(nameof(options), $"{nameof(options)} {Resources.IsRequired}"); FileSystemViewModel = fileSystemViewModel ?? throw new ArgumentNullException(nameof(fileSystemViewModel), $"{nameof(fileSystemViewModel)} {Resources.IsRequired}"); } } diff --git a/src/Maple/ViewModels/Dialogs/DialogContentViewModels/MessageContentDialogViewModel.cs b/src/Maple.Core/ViewModels/Dialogs/DialogContentViewModels/MessageContentDialogViewModel.cs similarity index 86% rename from src/Maple/ViewModels/Dialogs/DialogContentViewModels/MessageContentDialogViewModel.cs rename to src/Maple.Core/ViewModels/Dialogs/DialogContentViewModels/MessageContentDialogViewModel.cs index 02a4621..f1260db 100644 --- a/src/Maple/ViewModels/Dialogs/DialogContentViewModels/MessageContentDialogViewModel.cs +++ b/src/Maple.Core/ViewModels/Dialogs/DialogContentViewModels/MessageContentDialogViewModel.cs @@ -1,6 +1,4 @@ -using Maple.Core; - -namespace Maple +namespace Maple.Core { public class MessageContentDialogViewModel : ObservableObject { diff --git a/src/Maple/ViewModels/Dialogs/DialogContentViewModels/ProgressContentDialogViewModel.cs b/src/Maple.Core/ViewModels/Dialogs/DialogContentViewModels/ProgressContentDialogViewModel.cs similarity index 68% rename from src/Maple/ViewModels/Dialogs/DialogContentViewModels/ProgressContentDialogViewModel.cs rename to src/Maple.Core/ViewModels/Dialogs/DialogContentViewModels/ProgressContentDialogViewModel.cs index 3381bff..4cfdbbd 100644 --- a/src/Maple/ViewModels/Dialogs/DialogContentViewModels/ProgressContentDialogViewModel.cs +++ b/src/Maple.Core/ViewModels/Dialogs/DialogContentViewModels/ProgressContentDialogViewModel.cs @@ -1,6 +1,4 @@ -using Maple.Core; - -namespace Maple +namespace Maple.Core { public class ProgressContentDialogViewModel : ObservableObject { diff --git a/src/Maple/ViewModels/Dialogs/DialogViewModel.cs b/src/Maple.Core/ViewModels/Dialogs/DialogViewModel.cs similarity index 96% rename from src/Maple/ViewModels/Dialogs/DialogViewModel.cs rename to src/Maple.Core/ViewModels/Dialogs/DialogViewModel.cs index 7da5526..6f95514 100644 --- a/src/Maple/ViewModels/Dialogs/DialogViewModel.cs +++ b/src/Maple.Core/ViewModels/Dialogs/DialogViewModel.cs @@ -3,11 +3,12 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Maple.Core; + +using Maple.Domain; using Maple.Localization.Properties; using Maple.Youtube; -namespace Maple +namespace Maple.Core { public class DialogViewModel : DialogBaseViewModel, IDialogViewModel { @@ -16,8 +17,6 @@ public class DialogViewModel : DialogBaseViewModel, IDialogViewModel private readonly IMediaItemMapper _mediaItemMapper; private readonly FileSystemViewModel _fileSystemViewModel; - private readonly Func _createMediaItemFactory; - public DialogViewModel(ILocalizationService translator, IYoutubeUrlParser service, IMediaItemMapper mediaItemMapper, IMessenger messenger, FileSystemViewModel fileSystemViewModel, Func createMediaItemFactory) : base(messenger) { @@ -25,7 +24,6 @@ public DialogViewModel(ILocalizationService translator, IYoutubeUrlParser servic _service = service ?? throw new ArgumentNullException(nameof(service), $"{nameof(service)} {Resources.IsRequired}"); _mediaItemMapper = mediaItemMapper ?? throw new ArgumentNullException(nameof(mediaItemMapper), $"{nameof(mediaItemMapper)} {Resources.IsRequired}"); _fileSystemViewModel = fileSystemViewModel ?? throw new ArgumentNullException(nameof(fileSystemViewModel), $"{nameof(fileSystemViewModel)} {Resources.IsRequired}"); - _createMediaItemFactory = createMediaItemFactory ?? throw new ArgumentNullException(nameof(createMediaItemFactory), $"{nameof(createMediaItemFactory)} {Resources.IsRequired}"); CloseDialogCommand = new RelayCommand(Close, () => CanClose()); @@ -88,7 +86,7 @@ public Task ShowExceptionDialog(Exception exception) throw new InvalidOperationException(Resources.DialogOpenAlready); var tuple = default((bool Result, IList Files)); - var viewModel = new FileBrowserContentDialogViewModel(_fileSystemViewModel, options); + var viewModel = new FileBrowserContentDialogViewModel(_fileSystemViewModel); TitleDetail = string.Empty; Context = viewModel; @@ -161,7 +159,7 @@ public Task ShowExceptionDialog(Exception exception) throw new InvalidOperationException(Resources.DialogOpenAlready); var tuple = default((bool Result, IFileSystemDirectory Directory)); - var viewModel = new FileBrowserContentDialogViewModel(_fileSystemViewModel, options); + var viewModel = new FileBrowserContentDialogViewModel(_fileSystemViewModel); TitleDetail = string.Empty; Context = viewModel; diff --git a/src/Maple.Core/ViewModels/Interfaces/ICultureViewModel.cs b/src/Maple.Core/ViewModels/Interfaces/ICultureViewModel.cs new file mode 100644 index 0000000..587971d --- /dev/null +++ b/src/Maple.Core/ViewModels/Interfaces/ICultureViewModel.cs @@ -0,0 +1,6 @@ +namespace Maple.Core +{ + public interface ICultureViewModel : ILoadableViewModel + { + } +} \ No newline at end of file diff --git a/src/Maple.Core/ViewModels/Interfaces/IMediaItemsViewModel.cs b/src/Maple.Core/ViewModels/Interfaces/IMediaItemsViewModel.cs new file mode 100644 index 0000000..6c19af1 --- /dev/null +++ b/src/Maple.Core/ViewModels/Interfaces/IMediaItemsViewModel.cs @@ -0,0 +1,6 @@ +namespace Maple.Core +{ + public interface IMediaItemsViewModel : ILoadableViewModel + { + } +} \ No newline at end of file diff --git a/src/Maple.Core/ViewModels/Interfaces/IMediaPlayersViewModel.cs b/src/Maple.Core/ViewModels/Interfaces/IMediaPlayersViewModel.cs new file mode 100644 index 0000000..aaf68a6 --- /dev/null +++ b/src/Maple.Core/ViewModels/Interfaces/IMediaPlayersViewModel.cs @@ -0,0 +1,6 @@ +namespace Maple.Core +{ + public interface IMediaPlayersViewModel + { + } +} \ No newline at end of file diff --git a/src/Maple.Core/ViewModels/Interfaces/IPlaylistsViewModel.cs b/src/Maple.Core/ViewModels/Interfaces/IPlaylistsViewModel.cs new file mode 100644 index 0000000..8c6acb0 --- /dev/null +++ b/src/Maple.Core/ViewModels/Interfaces/IPlaylistsViewModel.cs @@ -0,0 +1,6 @@ +namespace Maple.Core +{ + public interface IPlaylistsViewModel + { + } +} \ No newline at end of file diff --git a/src/Maple/ViewModels/Interfaces/ISplashScreenViewModel.cs b/src/Maple.Core/ViewModels/Interfaces/ISplashScreenViewModel.cs similarity index 92% rename from src/Maple/ViewModels/Interfaces/ISplashScreenViewModel.cs rename to src/Maple.Core/ViewModels/Interfaces/ISplashScreenViewModel.cs index c17a849..5c01b0e 100644 --- a/src/Maple/ViewModels/Interfaces/ISplashScreenViewModel.cs +++ b/src/Maple.Core/ViewModels/Interfaces/ISplashScreenViewModel.cs @@ -1,7 +1,7 @@ using System; using System.Windows.Input; -namespace Maple +namespace Maple.Core { public interface ISplashScreenViewModel : IDisposable { diff --git a/src/Maple/ViewModels/Interfaces/IUIColorsViewModel.cs b/src/Maple.Core/ViewModels/Interfaces/IUIColorsViewModel.cs similarity index 68% rename from src/Maple/ViewModels/Interfaces/IUIColorsViewModel.cs rename to src/Maple.Core/ViewModels/Interfaces/IUIColorsViewModel.cs index eca7058..78e23e7 100644 --- a/src/Maple/ViewModels/Interfaces/IUIColorsViewModel.cs +++ b/src/Maple.Core/ViewModels/Interfaces/IUIColorsViewModel.cs @@ -1,9 +1,8 @@ using System.Windows.Input; -using Maple.Core; -namespace Maple +namespace Maple.Core { - public interface IUIColorsViewModel : ILoadableViewModel, ISaveableViewModel + public interface IUIColorsViewModel : ILoadableViewModel { ICommand ApplyAccentCommand { get; } ICommand ApplyPrimaryCommand { get; } diff --git a/src/Maple/ViewModels/MediaItems/CreateMediaItem.cs b/src/Maple.Core/ViewModels/MediaItems/CreateMediaItem.cs similarity index 92% rename from src/Maple/ViewModels/MediaItems/CreateMediaItem.cs rename to src/Maple.Core/ViewModels/MediaItems/CreateMediaItem.cs index 07a16b8..12093db 100644 --- a/src/Maple/ViewModels/MediaItems/CreateMediaItem.cs +++ b/src/Maple.Core/ViewModels/MediaItems/CreateMediaItem.cs @@ -1,19 +1,19 @@ using System; using System.Threading.Tasks; using System.Windows.Input; -using Maple.Core; + using Maple.Localization.Properties; using Maple.Youtube; -namespace Maple +namespace Maple.Core { /// /// viewmodel for creating mediaitem from a string (path/url) /// public class CreateMediaItem : BaseListViewModel { - private IYoutubeUrlParser _dataParsingService; - private IMediaItemMapper _mapper; + private readonly IYoutubeUrlParser _dataParsingService; + private readonly IMediaItemMapper _mapper; public ICommand ParseCommand { get; private set; } diff --git a/src/Maple/ViewModels/MediaItems/MediaItem.cs b/src/Maple.Core/ViewModels/MediaItems/MediaItem.cs similarity index 77% rename from src/Maple/ViewModels/MediaItems/MediaItem.cs rename to src/Maple.Core/ViewModels/MediaItems/MediaItem.cs index 5639dfb..adbc43d 100644 --- a/src/Maple/ViewModels/MediaItems/MediaItem.cs +++ b/src/Maple.Core/ViewModels/MediaItems/MediaItem.cs @@ -1,10 +1,9 @@ using System; using System.Diagnostics; using FluentValidation; -using Maple.Core; using Maple.Domain; -namespace Maple +namespace Maple.Core { /// /// @@ -12,7 +11,7 @@ namespace Maple /// /// [DebuggerDisplay("{Title}, {Sequence} {Location}")] - public class MediaItem : ValidableBaseDataViewModel, IMediaItem + public class MediaItem : ValidableBaseDataViewModel, IMediaItem { public bool IsNew => Model.IsNew; public bool IsDeleted => Model.IsDeleted; @@ -78,34 +77,6 @@ public bool IsSelected set { SetValue(ref _isSelected, value); } } - private string _createdBy; - public string CreatedBy - { - get { return _createdBy; } - private set { SetValue(ref _createdBy, value, OnChanged: () => Model.CreatedBy = value); } - } - - private string _updatedBy; - public string UpdatedBy - { - get { return _updatedBy; } - set { SetValue(ref _updatedBy, value, OnChanged: () => Model.UpdatedBy = value); } - } - - private DateTime _updatedOn; - public DateTime UpdatedOn - { - get { return _updatedOn; } - set { SetValue(ref _updatedOn, value, OnChanged: () => Model.UpdatedOn = value); } - } - - private DateTime _createdOn; - public DateTime CreatedOn - { - get { return _updatedOn; } - private set { SetValue(ref _updatedOn, value, OnChanged: () => Model.CreatedOn = value); } - } - private Playlist _playlist; public Playlist Playlist { @@ -135,10 +106,6 @@ public MediaItem(MediaItemModel model, IValidator validator, IMesseng _duration = TimeSpan.FromTicks(model.Duration); _privacyStatus = (PrivacyStatus)model.PrivacyStatus; _mediaItemType = (MediaItemType)model.MediaItemType; - _createdBy = model.CreatedBy; - _createdOn = model.CreatedOn; - _updatedBy = model.UpdatedBy; - _updatedOn = model.UpdatedOn; Validate(); } diff --git a/src/Maple.Core/ViewModels/MediaItems/MediaItems.cs b/src/Maple.Core/ViewModels/MediaItems/MediaItems.cs new file mode 100644 index 0000000..0c83557 --- /dev/null +++ b/src/Maple.Core/ViewModels/MediaItems/MediaItems.cs @@ -0,0 +1,12 @@ +using Maple.Domain; + +namespace Maple.Core +{ + public class MediaItems : ValidableBaseDataListViewModel + { + protected MediaItems(ViewModelServiceContainer container) + : base(container) + { + } + } +} diff --git a/src/Maple/ViewModels/MediaPlayer/AudioDevice.cs b/src/Maple.Core/ViewModels/MediaPlayer/AudioDevice.cs similarity index 95% rename from src/Maple/ViewModels/MediaPlayer/AudioDevice.cs rename to src/Maple.Core/ViewModels/MediaPlayer/AudioDevice.cs index 066b170..11d930d 100644 --- a/src/Maple/ViewModels/MediaPlayer/AudioDevice.cs +++ b/src/Maple.Core/ViewModels/MediaPlayer/AudioDevice.cs @@ -1,13 +1,10 @@ -using Maple.Core; -using Maple.Domain; +using Maple.Domain; -namespace Maple +namespace Maple.Core { public class AudioDevice : ObservableObject, IIsSelected, ISequence, IAudioDevice { private bool _isSelected; - - public bool IsSelected { get { return _isSelected; } diff --git a/src/Maple/ViewModels/MediaPlayer/AudioDevices.cs b/src/Maple.Core/ViewModels/MediaPlayer/AudioDevices.cs similarity index 50% rename from src/Maple/ViewModels/MediaPlayer/AudioDevices.cs rename to src/Maple.Core/ViewModels/MediaPlayer/AudioDevices.cs index 03afdf9..503167d 100644 --- a/src/Maple/ViewModels/MediaPlayer/AudioDevices.cs +++ b/src/Maple.Core/ViewModels/MediaPlayer/AudioDevices.cs @@ -1,19 +1,14 @@ using System.Linq; -using Maple.Core; using Maple.Domain; -namespace Maple +namespace Maple.Core { - /// - /// - /// - /// public class AudioDevices : BaseListViewModel { - public AudioDevices(ILoggingService log, IMessenger messenger) + public AudioDevices(ILoggingService log, IMessenger messenger, IPlaybackDeviceFactory factory) : base(messenger) { - AddRange(PlaybackDeviceFactory.GetAudioDevices(log).ToList()); + AddRange(factory.GetAudioDevices(log).ToList()); } } } diff --git a/src/Maple/ViewModels/MediaPlayer/Base/BasePlayer.cs b/src/Maple.Core/ViewModels/MediaPlayer/Base/BasePlayer.cs similarity index 93% rename from src/Maple/ViewModels/MediaPlayer/Base/BasePlayer.cs rename to src/Maple.Core/ViewModels/MediaPlayer/Base/BasePlayer.cs index 0a5f181..0fc3f0d 100644 --- a/src/Maple/ViewModels/MediaPlayer/Base/BasePlayer.cs +++ b/src/Maple.Core/ViewModels/MediaPlayer/Base/BasePlayer.cs @@ -1,7 +1,6 @@ -using Maple.Core; -using Maple.Domain; +using Maple.Domain; -namespace Maple +namespace Maple.Core { public abstract class BasePlayer : ViewModel, IMediaPlayer { @@ -38,7 +37,7 @@ protected BasePlayer(IMessenger messenger, AudioDevices audioDevices) { } - public abstract bool CanPlay(IMediaItem item); + public abstract bool CanPlay(IMediaItem mediaItem); public abstract bool IsPlaying { get; } diff --git a/src/Maple.Core/ViewModels/MediaPlayer/Base/IPlaybackDeviceFactory.cs b/src/Maple.Core/ViewModels/MediaPlayer/Base/IPlaybackDeviceFactory.cs new file mode 100644 index 0000000..501d7fa --- /dev/null +++ b/src/Maple.Core/ViewModels/MediaPlayer/Base/IPlaybackDeviceFactory.cs @@ -0,0 +1,10 @@ +using System.Collections.Generic; +using Maple.Domain; + +namespace Maple.Core +{ + public interface IPlaybackDeviceFactory + { + IEnumerable GetAudioDevices(ILoggingService log); + } +} \ No newline at end of file diff --git a/src/Maple/ViewModels/MediaPlayer/MainMediaPlayer.cs b/src/Maple.Core/ViewModels/MediaPlayer/MainMediaPlayer.cs similarity index 96% rename from src/Maple/ViewModels/MediaPlayer/MainMediaPlayer.cs rename to src/Maple.Core/ViewModels/MediaPlayer/MainMediaPlayer.cs index e5513ed..ddf759c 100644 --- a/src/Maple/ViewModels/MediaPlayer/MainMediaPlayer.cs +++ b/src/Maple.Core/ViewModels/MediaPlayer/MainMediaPlayer.cs @@ -1,9 +1,8 @@ using FluentValidation; -using Maple.Core; using Maple.Domain; using Maple.Localization.Properties; -namespace Maple +namespace Maple.Core { public class MainMediaPlayer : MediaPlayer { diff --git a/src/Maple/ViewModels/MediaPlayer/MediaPlayer.cs b/src/Maple.Core/ViewModels/MediaPlayer/MediaPlayer.cs similarity index 90% rename from src/Maple/ViewModels/MediaPlayer/MediaPlayer.cs rename to src/Maple.Core/ViewModels/MediaPlayer/MediaPlayer.cs index de531f3..994751d 100644 --- a/src/Maple/ViewModels/MediaPlayer/MediaPlayer.cs +++ b/src/Maple.Core/ViewModels/MediaPlayer/MediaPlayer.cs @@ -3,22 +3,22 @@ using System.Diagnostics; using System.Linq; using System.Windows.Input; + using FluentValidation; -using Maple.Core; + using Maple.Domain; using Maple.Localization.Properties; -namespace Maple +namespace Maple.Core { [DebuggerDisplay("{Name}, {Sequence}")] - public class MediaPlayer : ValidableBaseDataViewModel, IDisposable, IChangeState, ISequence + public class MediaPlayer : ValidableBaseDataViewModel, IChangeState, ISequence { protected readonly ILocalizationService _manager; public bool IsPlaying { get { return Player.IsPlaying; } } public bool IsNew => Model.IsNew; - public bool IsDeleted => Model.IsDeleted; private IMediaPlayer _player; public IMediaPlayer Player @@ -92,34 +92,6 @@ public bool IsPrimary protected set { SetValue(ref _isPrimary, value, OnChanged: () => Model.IsPrimary = value); } } - private string _createdBy; - public string CreatedBy - { - get { return _createdBy; } - set { SetValue(ref _createdBy, value, OnChanged: () => Model.CreatedBy = value); } - } - - private string _updatedBy; - public string UpdatedBy - { - get { return _updatedBy; } - set { SetValue(ref _updatedBy, value, OnChanged: () => Model.UpdatedBy = value); } - } - - private DateTime _updatedOn; - public DateTime UpdatedOn - { - get { return _updatedOn; } - set { SetValue(ref _updatedOn, value, OnChanged: () => Model.UpdatedOn = value); } - } - - private DateTime _createdOn; - public DateTime CreatedOn - { - get { return _updatedOn; } - set { SetValue(ref _updatedOn, value, OnChanged: () => Model.CreatedOn = value); } - } - public MediaPlayer(ViewModelServiceContainer container, IMediaPlayer player, IValidator validator, AudioDevices devices, Playlist playlist, MediaPlayerModel model) : base(model, validator, container.Messenger) { @@ -130,13 +102,8 @@ public MediaPlayer(ViewModelServiceContainer container, IMediaPlayer player, IVa _audioDevices = devices; _sequence = model.Sequence; - _createdBy = model.CreatedBy; - _createdOn = model.CreatedOn; - _updatedBy = model.UpdatedBy; - _updatedOn = model.UpdatedOn; - - if (AudioDevices.Items.Count > 0) - Player.AudioDevice = AudioDevices.Items.FirstOrDefault(p => p.Name == Model.DeviceName) ?? AudioDevices[0]; + if (AudioDevices.ReadOnlyItems.Count > 0) + Player.AudioDevice = AudioDevices.ReadOnlyItems.FirstOrDefault(p => p.Name == Model.DeviceName) ?? AudioDevices[0]; Playlist = playlist; diff --git a/src/Maple.Core/ViewModels/MediaPlayer/MediaPlayers.cs b/src/Maple.Core/ViewModels/MediaPlayer/MediaPlayers.cs new file mode 100644 index 0000000..0d93984 --- /dev/null +++ b/src/Maple.Core/ViewModels/MediaPlayer/MediaPlayers.cs @@ -0,0 +1,12 @@ +using Maple.Domain; + +namespace Maple.Core +{ + public class MediaPlayers : ValidableBaseDataListViewModel, IMediaPlayersViewModel + { + protected MediaPlayers(ViewModelServiceContainer container) + : base(container) + { + } + } +} diff --git a/src/Maple/ViewModels/Playlists/CreatePlaylist.cs b/src/Maple.Core/ViewModels/Playlists/CreatePlaylist.cs similarity index 98% rename from src/Maple/ViewModels/Playlists/CreatePlaylist.cs rename to src/Maple.Core/ViewModels/Playlists/CreatePlaylist.cs index 6fff809..6ac2c40 100644 --- a/src/Maple/ViewModels/Playlists/CreatePlaylist.cs +++ b/src/Maple.Core/ViewModels/Playlists/CreatePlaylist.cs @@ -1,9 +1,8 @@ using System.Threading.Tasks; using System.Windows.Input; -using Maple.Core; using Maple.Youtube; -namespace Maple +namespace Maple.Core { /// /// viewmodel for creating playlists from a input string (path/url) diff --git a/src/Maple/ViewModels/Playlists/Playlist.cs b/src/Maple.Core/ViewModels/Playlists/Playlist.cs similarity index 90% rename from src/Maple/ViewModels/Playlists/Playlist.cs rename to src/Maple.Core/ViewModels/Playlists/Playlist.cs index baa7bc1..d70e946 100644 --- a/src/Maple/ViewModels/Playlists/Playlist.cs +++ b/src/Maple.Core/ViewModels/Playlists/Playlist.cs @@ -6,23 +6,21 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using System.Windows.Data; using System.Windows.Input; + using FluentValidation; -using Maple.Core; + using Maple.Domain; using Maple.Localization.Properties; -namespace Maple +namespace Maple.Core { [DebuggerDisplay("{Title}, {Sequence}")] - public class Playlist : ValidableBaseDataViewModel, IIsSelected, ISequence, IIdentifier, IChangeState + public class Playlist : ValidableBaseDataViewModel, IIsSelected, ISequence { - private readonly IMediaItemMapper _mediaItemMapper; private readonly ISequenceService _sequenceProvider; private readonly ILocalizationService _translator; private readonly IDialogViewModel _dialogViewModel; - private readonly object _itemsLock; private readonly Stack _history; public bool IsNew => Model.IsNew; @@ -41,26 +39,6 @@ public int Id get { return Model.Id; } } - public string CreatedBy - { - get { return Model.CreatedBy; } - } - - public string UpdatedBy - { - get { return Model.UpdatedBy; } - } - - public DateTime UpdatedOn - { - get { return Model.UpdatedOn; } - } - - public DateTime CreatedOn - { - get { return Model.CreatedOn; } - } - public MediaItem this[int index] { get { return _items[index]; } @@ -182,9 +160,6 @@ public Playlist(ViewModelServiceContainer container, IValidator valida SkipChangeTracking = true; using (BusyStack.GetToken()) { - _itemsLock = new object(); - - _mediaItemMapper = mediaItemMapper ?? throw new ArgumentNullException(nameof(mediaItemMapper), $"{nameof(mediaItemMapper)} {Resources.IsRequired}"); _dialogViewModel = dialogViewModel ?? throw new ArgumentNullException(nameof(dialogViewModel), $"{nameof(dialogViewModel)} {Resources.IsRequired}"); _sequenceProvider = container.SequenceService; @@ -195,14 +170,13 @@ public Playlist(ViewModelServiceContainer container, IValidator valida _isShuffeling = model.IsShuffeling; _sequence = model.Sequence; - RepeatModes = new RangeObservableCollection(Enum.GetValues(typeof(RepeatMode)).Cast().ToList()); _history = new Stack(); + RepeatModes = new RangeObservableCollection(Enum.GetValues(typeof(RepeatMode)).Cast().ToList()); Items = new RangeObservableCollection(); _items.CollectionChanged += (o, e) => OnPropertyChanged(nameof(Count)); - BindingOperations.EnableCollectionSynchronization(Items, _itemsLock); - View = CollectionViewSource.GetDefaultView(Items); // TODO add sorting by sequence + View = new VirtualizingCollectionViewSource(container, (IList)_items); OnPropertyChanged(nameof(Count)); LoadFromFileCommand = AsyncCommand.Create(LoadFromFile, () => CanLoadFromFile()); @@ -213,12 +187,11 @@ public Playlist(ViewModelServiceContainer container, IValidator valida RemoveRangeCommand = new RelayCommand(RemoveRange, CanRemoveRange); ClearCommand = new RelayCommand(() => Clear(), CanClear); - AddRange(_mediaItemMapper.GetMany(model.MediaItems)); - MessageTokens.Add(Messenger.Subscribe(OnPlaybackItemChanged, m => m.PlaylistId == Id && _items.Contains(m.Content))); Validate(); } + SkipChangeTracking = false; } @@ -334,18 +307,13 @@ public virtual void AddRange(IEnumerable items) var added = false; var sequence = 0; var collection = items.ToList(); - var item = default(MediaItem); for (var i = 0; i < collection.Count; i++) { if (i == 0) sequence = _sequenceProvider.Get(Items.Select(p => (ISequence)p).ToList()); - item = collection[i]; - - if (item == null) - throw new ArgumentNullException(nameof(item), $"{nameof(item)} {Resources.IsRequired}"); - + var item = collection[i]; item.Sequence = sequence; AddInternal(item); sequence++; @@ -413,8 +381,7 @@ public virtual bool CanRemove(object item) if (Items == null || Items.Count == 0) return false; - var mediaItem = item as MediaItem; - if (mediaItem == null) + if (!(item is MediaItem mediaItem)) return false; return Items.Contains(mediaItem) && !IsBusy; @@ -427,7 +394,7 @@ protected virtual bool CanRemoveRange(IEnumerable items) protected virtual bool CanRemoveRange(IList items) { - return items == null ? false : CanRemoveRange(items.Cast()); + return (items != null) && CanRemoveRange(items.Cast()); } /// @@ -472,7 +439,7 @@ private MediaItem NextRepeatNone() if (nextPossibleItems?.Any() == true) // try to find items after the current one { Items.ToList().ForEach(p => p.IsSelected = false); - var foundItem = nextPossibleItems.Where(q => q.Sequence == nextPossibleItems.Select(p => p.Sequence).Min()).First(); + var foundItem = nextPossibleItems.First(q => q.Sequence == nextPossibleItems.Select(p => p.Sequence).Min()); foundItem.IsSelected = true; return foundItem; } @@ -505,7 +472,7 @@ private MediaItem NextRepeatAll() if (nextPossibleItems.Any()) // try to find items after the current one { Items.ToList().ForEach(p => p.IsSelected = false); - var foundItem = nextPossibleItems.Where(q => q.Sequence == nextPossibleItems.Select(p => p.Sequence).Min()).First(); + var foundItem = nextPossibleItems.First(q => q.Sequence == nextPossibleItems.Select(p => p.Sequence).Min()); foundItem.IsSelected = true; return foundItem; } @@ -547,9 +514,6 @@ public virtual MediaItem Previous() { var previous = _history.Pop(); - //if (previous == SelectedItem?.Sequence) // the most recent item in the history, is the just played item, so we wanna skip that - // continue; - if (previous > -1) { var previousItems = Items.Where(p => p.Sequence == previous); // try to get the last played item diff --git a/src/Maple.Core/ViewModels/Playlists/Playlists.cs b/src/Maple.Core/ViewModels/Playlists/Playlists.cs new file mode 100644 index 0000000..9d5239b --- /dev/null +++ b/src/Maple.Core/ViewModels/Playlists/Playlists.cs @@ -0,0 +1,12 @@ +using Maple.Domain; + +namespace Maple.Core +{ + public class Playlists : ValidableBaseDataListViewModel, IPlaylistsViewModel + { + protected Playlists(ViewModelServiceContainer container) + : base(container) + { + } + } +} diff --git a/src/Maple/ViewModels/Settings/Culture.cs b/src/Maple.Core/ViewModels/Settings/Culture.cs similarity index 89% rename from src/Maple/ViewModels/Settings/Culture.cs rename to src/Maple.Core/ViewModels/Settings/Culture.cs index 9b502f0..004b6d1 100644 --- a/src/Maple/ViewModels/Settings/Culture.cs +++ b/src/Maple.Core/ViewModels/Settings/Culture.cs @@ -1,7 +1,6 @@ using System.Globalization; -using Maple.Core; -namespace Maple +namespace Maple.Core { public class Culture : BaseViewModel { diff --git a/src/Maple/ViewModels/Settings/Cultures.cs b/src/Maple.Core/ViewModels/Settings/Cultures.cs similarity index 68% rename from src/Maple/ViewModels/Settings/Cultures.cs rename to src/Maple.Core/ViewModels/Settings/Cultures.cs index b48b499..dc14a26 100644 --- a/src/Maple/ViewModels/Settings/Cultures.cs +++ b/src/Maple.Core/ViewModels/Settings/Cultures.cs @@ -1,20 +1,33 @@ using System.Linq; using System.Threading.Tasks; -using System.Windows.Input; -using Maple.Core; + using Maple.Domain; using Maple.Localization.Properties; -namespace Maple +namespace Maple.Core { public class Cultures : BaseListViewModel, ICultureViewModel { private readonly ILocalizationService _manager; private readonly ILoggingService _log; - public ICommand RefreshCommand => AsyncCommand.Create(LoadAsync); - public ICommand LoadCommand => AsyncCommand.Create(LoadAsync, () => !IsLoaded); - public ICommand SaveCommand => new RelayCommand(Save); + public IAsyncCommand RefreshCommand => AsyncCommand.Create(GetCountAsync); + public IAsyncCommand LoadCommand => AsyncCommand.Create(GetCountAsync, () => !IsLoaded); + public IAsyncCommand SaveCommand => AsyncCommand.Create(Save); + + private bool _isLoaded; + /// + /// Indicates whether the LoadCommand/ the Load Method has been executed yet + /// + public bool IsLoaded + { + get { return _isLoaded; } + protected set + { + if (value) + SetValue(ref _isLoaded, value, OnChanged: () => Messenger.Publish(new LoadedMessage(this, this))); + } + } public Cultures(ViewModelServiceContainer container) : base(container.Messenger) @@ -25,15 +38,12 @@ public Cultures(ViewModelServiceContainer container) MessageTokens.Add(Messenger.Subscribe>(UpdateCulture)); } - private void SyncCulture() - { - _manager.CurrentLanguage = SelectedItem.Model; - } - - public void Save() + public Task Save() { _log.Info($"{Resources.Saving} {Resources.Options}"); _manager.Save(); + + return Task.CompletedTask; } public Task SaveAsync() @@ -42,11 +52,10 @@ public Task SaveAsync() { _log.Info($"{Resources.Saving} {Resources.Options}"); _manager.Save(); - }); } - public async Task LoadAsync() + public async Task GetCountAsync() { _log.Info($"{Resources.Loading} {Resources.Options}"); await _manager.LoadAsync().ConfigureAwait(true); diff --git a/src/Maple/ViewModels/Settings/OptionsViewModel.cs b/src/Maple.Core/ViewModels/Settings/OptionsViewModel.cs similarity index 96% rename from src/Maple/ViewModels/Settings/OptionsViewModel.cs rename to src/Maple.Core/ViewModels/Settings/OptionsViewModel.cs index 14d51f7..d16318a 100644 --- a/src/Maple/ViewModels/Settings/OptionsViewModel.cs +++ b/src/Maple.Core/ViewModels/Settings/OptionsViewModel.cs @@ -1,8 +1,7 @@ using System; -using Maple.Core; using Maple.Localization.Properties; -namespace Maple +namespace Maple.Core { public class OptionsViewModel : ObservableObject { diff --git a/src/Maple/ViewModels/SplashScreenViewModel.cs b/src/Maple.Core/ViewModels/SplashScreenViewModel.cs similarity index 91% rename from src/Maple/ViewModels/SplashScreenViewModel.cs rename to src/Maple.Core/ViewModels/SplashScreenViewModel.cs index 5609d0a..f65871a 100644 --- a/src/Maple/ViewModels/SplashScreenViewModel.cs +++ b/src/Maple.Core/ViewModels/SplashScreenViewModel.cs @@ -1,14 +1,15 @@ using System; using System.Collections.Generic; using System.Windows.Input; -using Maple.Core; + using Maple.Domain; using Maple.Localization.Properties; -namespace Maple +namespace Maple.Core { public class SplashScreenViewModel : ObservableObject, ISplashScreenViewModel { + private readonly SubscriptionToken _subscriptionToken; private readonly IMessenger _messenger; private readonly Queue _queue; private System.Timers.Timer _timer; @@ -53,7 +54,7 @@ private SplashScreenViewModel() private SplashScreenViewModel(IMessenger messenger) : this() { _messenger = messenger ?? throw new ArgumentNullException(nameof(messenger), $"{nameof(messenger)} {Resources.IsRequired}"); - _messenger.Subscribe(LogMessageReceived); + _subscriptionToken = messenger.Subscribe(e => _queue.Enqueue(e.Content)); } public SplashScreenViewModel(IMessenger messenger, IVersionService version) : this(messenger) @@ -87,11 +88,6 @@ private bool CanLoad() return !IsDisposed; } - private void LogMessageReceived(LogMessageReceivedMessage e) - { - _queue.Enqueue(e.Content); - } - public void Dispose() { Dispose(true); @@ -112,6 +108,8 @@ protected virtual void Dispose(bool disposing) _timer.Dispose(); _timer = null; } + + _messenger.Unsubscribe(_subscriptionToken); // Free any other managed objects here. } diff --git a/src/Maple/ViewModels/StatusbarViewModel.cs b/src/Maple.Core/ViewModels/StatusbarViewModel.cs similarity index 98% rename from src/Maple/ViewModels/StatusbarViewModel.cs rename to src/Maple.Core/ViewModels/StatusbarViewModel.cs index f91b8bc..75c4deb 100644 --- a/src/Maple/ViewModels/StatusbarViewModel.cs +++ b/src/Maple.Core/ViewModels/StatusbarViewModel.cs @@ -1,9 +1,9 @@ using System; -using Maple.Core; + using Maple.Domain; using Maple.Localization.Properties; -namespace Maple +namespace Maple.Core { public class StatusbarViewModel : ViewModel { diff --git a/src/Maple.Core/Services/ViewModelServiceContainer.cs b/src/Maple.Core/ViewModels/ViewModelServiceContainer.cs similarity index 57% rename from src/Maple.Core/Services/ViewModelServiceContainer.cs rename to src/Maple.Core/ViewModels/ViewModelServiceContainer.cs index 8612b20..694f811 100644 --- a/src/Maple.Core/Services/ViewModelServiceContainer.cs +++ b/src/Maple.Core/ViewModels/ViewModelServiceContainer.cs @@ -1,4 +1,6 @@ using System; +using System.Runtime.Caching; + using Maple.Domain; using Maple.Localization.Properties; @@ -11,14 +13,22 @@ public class ViewModelServiceContainer public ISequenceService SequenceService { get; } public IMessenger Messenger { get; } public ILoggingService Log { get; } + public MemoryCache Cache { get; } + public CacheItemPolicy CacheItemPolicy { get; } + public IRepository Repository { get; } - public ViewModelServiceContainer(ILoggingService log, ILoggingNotifcationService notificationService, ILocalizationService localizationService, IMessenger messenger, ISequenceService sequenceService) + public ViewModelServiceContainer(ILoggingService log, IRepository repository, + ILoggingNotifcationService notificationService, ILocalizationService localizationService, + IMessenger messenger, ISequenceService sequenceService, MemoryCache cache, CacheItemPolicy itemPolicy) { + Repository = repository ?? throw new ArgumentNullException(nameof(repository), $"{nameof(repository)} {Resources.IsRequired}"); Log = log ?? throw new ArgumentNullException(nameof(log), $"{nameof(log)} {Resources.IsRequired}"); LocalizationService = localizationService ?? throw new ArgumentNullException(nameof(localizationService), $"{nameof(localizationService)} {Resources.IsRequired}"); SequenceService = sequenceService ?? throw new ArgumentNullException(nameof(sequenceService), $"{nameof(sequenceService)} {Resources.IsRequired}"); Messenger = messenger ?? throw new ArgumentNullException(nameof(messenger), $"{nameof(messenger)} {Resources.IsRequired}"); NotificationService = notificationService ?? throw new ArgumentNullException(nameof(notificationService), $"{nameof(notificationService)} {Resources.IsRequired}"); + Cache = cache ?? throw new ArgumentNullException(nameof(cache), $"{nameof(cache)} {Resources.IsRequired}"); + CacheItemPolicy = itemPolicy ?? throw new ArgumentNullException(nameof(itemPolicy), $"{nameof(itemPolicy)} {Resources.IsRequired}"); } } } diff --git a/src/Maple.Data/DB/CreateSeedDatabaseIfNotExists.cs b/src/Maple.Data/DB/CreateSeedDatabaseIfNotExists.cs index e19a43f..f5d37fe 100644 --- a/src/Maple.Data/DB/CreateSeedDatabaseIfNotExists.cs +++ b/src/Maple.Data/DB/CreateSeedDatabaseIfNotExists.cs @@ -2,16 +2,15 @@ using System.Collections.Generic; using System.Data.Entity; using System.Diagnostics; + using Maple.Domain; + using SQLite.CodeFirst; namespace Maple.Data { - public class CreateSeedDatabaseIfNotExists : SqliteDropCreateDatabaseWhenModelChanges - where TContext : PlaylistContext + public class CreateSeedDatabaseIfNotExists : SqliteDropCreateDatabaseWhenModelChanges { - private const int saveThresHold = 100; - private readonly List _playlistTitles = new List() { "Memories Of A Time To Come", @@ -69,7 +68,7 @@ public CreateSeedDatabaseIfNotExists(DbModelBuilder modelBuilder, Type historyEn { } - protected override void Seed(TContext context) + protected override void Seed(MapleContext context) { if (!Debugger.IsAttached) { @@ -85,7 +84,7 @@ protected override void Seed(TContext context) context.SaveChanges(); } - private void SeedTestData(TContext context) + private void SeedTestData(MapleContext context) { context.Playlists .Add(new PlaylistModel @@ -161,15 +160,12 @@ private void SeedTestData(TContext context) UpdatedOn = DateTime.UtcNow, }); index++; - - if (index % saveThresHold == 0) - context.SaveChanges(); } } } - private void SeedMediaPlayers(TContext context) + private void SeedMediaPlayers(MapleContext context) { if (context.Mediaplayers.Find(1) == null) context.Mediaplayers @@ -186,100 +182,5 @@ private void SeedMediaPlayers(TContext context) UpdatedOn = DateTime.UtcNow, }); } - - private void SeedOptions(TContext context) - { - if (context.Options.Find(1) == null) - context.Options - .Add(new OptionModel - { - Id = 1, - Key = "SelectedPlaylist", - Sequence = 0, - Type = (int)OptionType.Playlist, - Value = "1", - CreatedBy = "SYSTEM", - UpdatedBy = "SYSTEM", - CreatedOn = DateTime.UtcNow, - UpdatedOn = DateTime.UtcNow, - }); - - if (context.Options.Find(2) == null) - context.Options - .Add(new OptionModel - { - Id = 2, - Key = "SelectedMediaItem", - Sequence = 10, - Type = (int)OptionType.MediaItem, - Value = "", - CreatedBy = "SYSTEM", - UpdatedBy = "SYSTEM", - CreatedOn = DateTime.UtcNow, - UpdatedOn = DateTime.UtcNow, - }); - - if (context.Options.Find(3) == null) - context.Options - .Add(new OptionModel - { - Id = 3, - Key = "SelectedMediaPlayer", - Sequence = 20, - Type = (int)OptionType.MediaPlayer, - Value = "1", - CreatedBy = "SYSTEM", - UpdatedBy = "SYSTEM", - CreatedOn = DateTime.UtcNow, - UpdatedOn = DateTime.UtcNow, - }); - - // 4 - - if (context.Options.Find(5) == null) - context.Options - .Add(new OptionModel - { - Id = 5, - Key = "SelectedPrimary", - Sequence = 40, - Type = (int)OptionType.ColorProfile, - Value = "", - CreatedBy = "SYSTEM", - UpdatedBy = "SYSTEM", - CreatedOn = DateTime.UtcNow, - UpdatedOn = DateTime.UtcNow, - }); - - if (context.Options.Find(6) == null) - context.Options - .Add(new OptionModel - { - Id = 6, - Key = "SelectedAccent", - Sequence = 50, - Type = (int)OptionType.ColorProfile, - Value = "", - CreatedBy = "SYSTEM", - UpdatedBy = "SYSTEM", - CreatedOn = DateTime.UtcNow, - UpdatedOn = DateTime.UtcNow, - }); - - if (context.Options.Find(7) == null) - context.Options - .Add(new OptionModel - { - Id = 7, - Key = "SelectedScene", - Sequence = 60, - Type = (int)OptionType.Scene, - Value = "", - CreatedBy = "SYSTEM", - UpdatedBy = "SYSTEM", - CreatedOn = DateTime.UtcNow, - UpdatedOn = DateTime.UtcNow, - }); - } } } diff --git a/src/Maple.Data/DB/PlaylistContext.cs b/src/Maple.Data/DB/MapleContext.cs similarity index 65% rename from src/Maple.Data/DB/PlaylistContext.cs rename to src/Maple.Data/DB/MapleContext.cs index c5425f2..d6761aa 100644 --- a/src/Maple.Data/DB/PlaylistContext.cs +++ b/src/Maple.Data/DB/MapleContext.cs @@ -1,17 +1,16 @@ using System.Data.Entity; + using Maple.Domain; namespace Maple.Data { - public class PlaylistContext : DbContext + public sealed class MapleContext : DbContext { public DbSet Playlists { get; set; } public DbSet MediaItems { get; set; } public DbSet Mediaplayers { get; set; } - public DbSet Options { get; set; } - public DbSet Data { get; set; } - public PlaylistContext() + public MapleContext() : base("Main") { Configuration.ProxyCreationEnabled = false; @@ -21,12 +20,7 @@ public PlaylistContext() protected override void OnModelCreating(DbModelBuilder modelBuilder) { ModelConfiguration.Configure(modelBuilder); - Database.SetInitializer(new CreateSeedDatabaseIfNotExists(modelBuilder)); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); + Database.SetInitializer(new CreateSeedDatabaseIfNotExists(modelBuilder)); } } } diff --git a/src/Maple.Data/Maple.Data.csproj b/src/Maple.Data/Maple.Data.csproj index bea4727..56b1334 100644 --- a/src/Maple.Data/Maple.Data.csproj +++ b/src/Maple.Data/Maple.Data.csproj @@ -39,6 +39,7 @@ 4 AnyCPU false + 7.2 pdbonly @@ -50,11 +51,14 @@ - - - - - + + 7.1.0.5212 + + + + + + @@ -73,17 +77,14 @@ Properties\SharedAssemblyInfo.cs + - - - - - - - - + + + + diff --git a/src/Maple.Data/Repository/Base/EntityFrameworkReadOnlyRepository.cs b/src/Maple.Data/Repository/Base/EntityFrameworkReadOnlyRepository.cs new file mode 100644 index 0000000..674e89d --- /dev/null +++ b/src/Maple.Data/Repository/Base/EntityFrameworkReadOnlyRepository.cs @@ -0,0 +1,167 @@ +using System; +using System.Collections.Generic; +using System.Data.Entity; +using System.Linq; +using System.Linq.Expressions; +using System.Threading.Tasks; + +using Maple.Domain; + +namespace Maple.Data +{ + public abstract class EntityFrameworkReadOnlyRepository : IReadOnlyRepository + where TContext : DbContext + { + protected readonly TContext context; + + protected EntityFrameworkReadOnlyRepository(TContext context) + { + this.context = context ?? throw new ArgumentNullException(nameof(context)); + } + + protected virtual IQueryable GetQueryable( + Expression> filter = null, + Func, IOrderedQueryable> orderBy = null, + string includeProperties = null, int? skip = null, int? take = null) + where TEntity : class, IEntity + { + includeProperties = includeProperties ?? string.Empty; + IQueryable query = context.Set(); + + if (filter != null) + query = query.Where(filter); + + foreach (var includeProperty in includeProperties.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)) + query = query.Include(includeProperty); + + if (orderBy != null) + query = orderBy(query); + + if (skip.HasValue) + query = query.Skip(skip.Value); + + if (take.HasValue) + query = query.Take(take.Value); + + return query; + } + + public virtual IEnumerable GetAll( + Func, IOrderedQueryable> orderBy = null, + string includeProperties = null, + int? skip = null, + int? take = null) + where TEntity : class, IEntity + { + return GetQueryable(null, orderBy, includeProperties, skip, take).ToList(); + } + + public virtual async Task> GetAllAsync( + Func, IOrderedQueryable> orderBy = null, + string includeProperties = null, + int? skip = null, + int? take = null) + where TEntity : class, IEntity + { + return await GetQueryable(null, orderBy, includeProperties, skip, take).ToListAsync(); + } + + public virtual IEnumerable Get( + Expression> filter = null, + Func, IOrderedQueryable> orderBy = null, + string includeProperties = null, + int? skip = null, + int? take = null) + where TEntity : class, IEntity + { + return GetQueryable(filter, orderBy, includeProperties, skip, take).ToList(); + } + + public virtual async Task> GetAsync( + Expression> filter = null, + Func, IOrderedQueryable> orderBy = null, + string includeProperties = null, + int? skip = null, + int? take = null) + where TEntity : class, IEntity + { + return await GetQueryable(filter, orderBy, includeProperties, skip, take).ToListAsync(); + } + + public virtual TEntity GetOne( + Expression> filter = null, + string includeProperties = default) + where TEntity : class, IEntity + { + return GetQueryable(filter, null, includeProperties).SingleOrDefault(); + } + + public virtual async Task GetOneAsync( + Expression> filter = null, + string includeProperties = null) + where TEntity : class, IEntity + { + return await GetQueryable(filter, null, includeProperties).SingleOrDefaultAsync(); + } + + public virtual TEntity GetFirst( + Expression> filter = null, + Func, IOrderedQueryable> orderBy = null, + string includeProperties = default) + where TEntity : class, IEntity + { + return GetQueryable(filter, orderBy, includeProperties).FirstOrDefault(); + } + + public virtual async Task GetFirstAsync( + Expression> filter = null, + Func, IOrderedQueryable> orderBy = null, + string includeProperties = null) + where TEntity : class, IEntity + { + return await GetQueryable(filter, orderBy, includeProperties).FirstOrDefaultAsync(); + } + + public virtual TEntity GetById(object id) + where TEntity : class, IEntity + { + return context.Set().Find(id); + } + + public virtual Task GetByIdAsync(object id) + where TEntity : class, IEntity + { + return context.Set().FindAsync(id); + } + + public Task> GetByIdsAsync(ICollection ids) + where TEntity : class, IEntity + { + return GetQueryable(p => ids.Contains(p.Id)).ToListAsync(); + } + + public virtual int GetCount(Expression> filter = null) + where TEntity : class, IEntity + { + return GetQueryable(filter).Count(); + } + + public virtual Task GetCountAsync(Expression> filter = null) + where TEntity : class, IEntity + { + return GetQueryable(filter).CountAsync(); + } + + public virtual bool GetExists(Expression> filter = null) + where TEntity : class, IEntity + { + return GetQueryable(filter).Any(); + } + + public virtual Task GetExistsAsync(Expression> filter = null) + where TEntity : class, IEntity + { + return GetQueryable(filter).AnyAsync(); + } + } +} \ No newline at end of file diff --git a/src/Maple.Data/Repository/Base/EntityFrameworkRepository.cs b/src/Maple.Data/Repository/Base/EntityFrameworkRepository.cs new file mode 100644 index 0000000..4d0cb6f --- /dev/null +++ b/src/Maple.Data/Repository/Base/EntityFrameworkRepository.cs @@ -0,0 +1,65 @@ +using System; +using System.Data.Entity; +using System.Data.Entity.Validation; +using System.Linq; + +using Maple.Domain; + +namespace Maple.Data +{ + public abstract class EntityFrameworkRepository : EntityFrameworkReadOnlyRepository, IRepository + where TContext : DbContext + { + protected EntityFrameworkRepository(TContext context) + : base(context) + { + } + + public virtual void Create(TEntity entity, string createdBy = null) + where TEntity : class, IEntity + { + entity.CreatedOn = DateTime.UtcNow; + entity.CreatedBy = createdBy; + context.Set().Add(entity); + } + + public virtual void Update(TEntity entity, string modifiedBy = null) + where TEntity : class, IEntity + { + entity.UpdatedOn = DateTime.UtcNow; + entity.UpdatedBy = modifiedBy; + context.Set().Attach(entity); + context.Entry(entity).State = EntityState.Modified; + } + + public virtual void Delete(object id) + where TEntity : class, IEntity + { + var entity = context.Set().Find(id); + Delete(entity); + } + + public virtual void Delete(TEntity entity) + where TEntity : class, IEntity + { + var dbSet = context.Set(); + if (context.Entry(entity).State == EntityState.Detached) + { + dbSet.Attach(entity); + } + dbSet.Remove(entity); + } + + protected virtual void ThrowEnhancedValidationException(DbEntityValidationException e) + { + var errorMessages = e.EntityValidationErrors + .SelectMany(x => x.ValidationErrors) + .Select(x => x.ErrorMessage); + + var fullErrorMessage = string.Join("; ", errorMessages); + var exceptionMessage = string.Concat(e.Message, " The validation errors are: ", fullErrorMessage); + + throw new DbEntityValidationException(exceptionMessage, e.EntityValidationErrors); + } + } +} \ No newline at end of file diff --git a/src/Maple.Data/Repository/Base/IMediaItemRepository.cs b/src/Maple.Data/Repository/Base/IMediaItemRepository.cs deleted file mode 100644 index fa4f713..0000000 --- a/src/Maple.Data/Repository/Base/IMediaItemRepository.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Threading.Tasks; -using Maple.Domain; - -namespace Maple.Data -{ - public interface IMediaItemRepository : IMapleRepository - { - Task GetMediaItemByPlaylistIdAsync(int id); - } -} \ No newline at end of file diff --git a/src/Maple.Data/Repository/Base/IMediaPlayerRepository.cs b/src/Maple.Data/Repository/Base/IMediaPlayerRepository.cs deleted file mode 100644 index bdc5e88..0000000 --- a/src/Maple.Data/Repository/Base/IMediaPlayerRepository.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using Maple.Domain; - -namespace Maple.Data -{ - public interface IMediaPlayerRepository : IMapleRepository - { - Task GetMainMediaPlayerAsync(); - Task> GetOptionalMediaPlayersAsync(); - } -} \ No newline at end of file diff --git a/src/Maple.Data/Repository/Base/IPlaylistRepository.cs b/src/Maple.Data/Repository/Base/IPlaylistRepository.cs deleted file mode 100644 index 0b5d03b..0000000 --- a/src/Maple.Data/Repository/Base/IPlaylistRepository.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Maple.Domain; - -namespace Maple.Data -{ - public interface IPlaylistRepository : IMapleRepository - { - } -} \ No newline at end of file diff --git a/src/Maple.Data/Repository/Base/MaplePlaylistRepository.cs b/src/Maple.Data/Repository/Base/MaplePlaylistRepository.cs deleted file mode 100644 index a17b0ed..0000000 --- a/src/Maple.Data/Repository/Base/MaplePlaylistRepository.cs +++ /dev/null @@ -1,95 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data.Entity; -using System.Diagnostics; -using System.Linq; -using System.Threading.Tasks; -using Maple.Domain; - -namespace Maple.Data -{ - public abstract class MaplePlaylistRepository : IMapleRepository - where T : class, IBaseObject - { - public void Save(T item) - { - using (var context = new PlaylistContext()) - SaveInternal(item, context); - } - - protected abstract DbSet GetEntities(PlaylistContext context); - - protected virtual void SaveInternal(T item, PlaylistContext context) - { - if (item.IsNew) - Create(item, context); - else - { - if (item.IsDeleted) - { - context.Database.Log = (message) => Debug.WriteLine(message); - Delete(item, context); - } - else - Update(item, context); - } - - context.SaveChanges(); - } - - protected virtual void Delete(T item, PlaylistContext context) - { - context.Set().Remove(item); - } - - protected virtual void Create(T item, PlaylistContext context) - { - item.CreatedBy = System.Security.Principal.WindowsIdentity.GetCurrent().User.Value; - item.CreatedOn = DateTime.UtcNow; - - context.Set().Add(item); - } - - protected virtual void Update(T item, PlaylistContext context) - { - var entity = GetEntities(context).Find(item.Id); - - if (entity == null) - return; - - item.UpdatedOn = DateTime.UtcNow; - item.UpdatedBy = System.Security.Principal.WindowsIdentity.GetCurrent().User.Value; - - - context.Entry(entity).CurrentValues.SetValues(item); - } - - public Task GetByIdAsync(int Id) - { - return Task.Run(() => - { - using (var context = new PlaylistContext()) - return GetByIdInternalAsync(Id, context); - }); - } - - protected virtual T GetByIdInternalAsync(int id, PlaylistContext context) - { - return GetEntities(context).FirstOrDefault(p => p.Id == id); - } - - public Task> GetAsync() - { - return Task.Run(() => - { - using (var context = new PlaylistContext()) - return GetInternalAsync(context); - }); - } - - protected virtual IReadOnlyCollection GetInternalAsync(PlaylistContext context) - { - return GetEntities(context).ToList(); - } - } -} \ No newline at end of file diff --git a/src/Maple.Data/Repository/Base/UnitOfWork.cs b/src/Maple.Data/Repository/Base/UnitOfWork.cs new file mode 100644 index 0000000..8124c7a --- /dev/null +++ b/src/Maple.Data/Repository/Base/UnitOfWork.cs @@ -0,0 +1,81 @@ +using System; +using System.Linq; +using System.Threading.Tasks; + +using Maple.Domain; + +namespace Maple.Data +{ + public sealed class UnitOfWork : IUnitOfWork + { + private bool _disposed; + + private MapleContext _context; + + public UnitOfWork() + : this(new MapleContext()) + { + + } + + public UnitOfWork(MapleContext context) + { + _context = context ?? throw new ArgumentNullException(nameof(context)); + } + + public void Commit() + { + _context.SaveChanges(); + } + + public async Task CommitAsync() + { + await _context.SaveChangesAsync().ConfigureAwait(false); + } + + public void Rollback() + { + _context + .ChangeTracker + .Entries() + .ToList() + .ForEach(x => x.Reload()); + } + + public void Dispose() + { + Dispose(true); + GC.SuppressFinalize(this); + } + + private void Dispose(bool disposing) + { + // Check to see if Dispose has already been called. + if (!_disposed) + { + // If disposing equals true, dispose all managed + // and unmanaged resources. + if (disposing) + { + // Dispose managed resources. +#pragma warning disable S1066 // Collapsible "if" statements should be merged + if (_context != null) +#pragma warning restore S1066 // Collapsible "if" statements should be merged + { + _context.Dispose(); + _context = null; + } + } + + // Call the appropriate methods to clean up + // unmanaged resources here. + // If disposing is false, + // only the following code is executed. + + + // Note disposing has been done. + _disposed = true; + } + } + } +} diff --git a/src/Maple.Data/Repository/MapleRepository.cs b/src/Maple.Data/Repository/MapleRepository.cs new file mode 100644 index 0000000..1b10ad7 --- /dev/null +++ b/src/Maple.Data/Repository/MapleRepository.cs @@ -0,0 +1,10 @@ +namespace Maple.Data +{ + public sealed class MapleRepository : EntityFrameworkRepository + { + public MapleRepository(MapleContext context) + : base(context) + { + } + } +} diff --git a/src/Maple.Data/Repository/MediaItemRepository.cs b/src/Maple.Data/Repository/MediaItemRepository.cs deleted file mode 100644 index 1bf662c..0000000 --- a/src/Maple.Data/Repository/MediaItemRepository.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Data.Entity; -using System.Linq; -using System.Threading.Tasks; -using Maple.Domain; - -namespace Maple.Data -{ - public class MediaItemRepository : MaplePlaylistRepository, IMediaItemRepository - { - public Task GetMediaItemByPlaylistIdAsync(int id) - { - return Task.Run(() => - { - using (var context = new PlaylistContext()) - return GetMediaItemByPlaylistIdInternalAsync(id, context); - }); - } - - protected override DbSet GetEntities(PlaylistContext context) - { - return context.MediaItems; - } - - private MediaItemModel GetMediaItemByPlaylistIdInternalAsync(int id, PlaylistContext context) - { - return context.MediaItems.FirstOrDefault(p => p.Playlist.Id == id); - } - } -} diff --git a/src/Maple.Data/Repository/MediaPlayerRepository.cs b/src/Maple.Data/Repository/MediaPlayerRepository.cs deleted file mode 100644 index 70ebbee..0000000 --- a/src/Maple.Data/Repository/MediaPlayerRepository.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System.Collections.Generic; -using System.Data.Entity; -using System.Linq; -using System.Threading.Tasks; -using Maple.Domain; - -namespace Maple.Data -{ - public class MediaPlayerRepository : MaplePlaylistRepository, IMediaPlayerRepository - { - public Task GetMainMediaPlayerAsync() - { - return Task.Run(() => - { - using (var context = new PlaylistContext()) - return GetMainMediaPlayerInternal(context); - }); - } - - private MediaPlayerModel GetMainMediaPlayerInternal(PlaylistContext context) - { - return GetEntities(context).Include(p => p.Playlist) - .Include(p => p.Playlist.MediaItems) - .FirstOrDefault(p => p.IsPrimary); - } - - public Task> GetOptionalMediaPlayersAsync() - { - return Task.Run(() => - { - using (var context = new PlaylistContext()) - return GetOptionalMediaPlayersInternal(context); - }); - } - - private IReadOnlyCollection GetOptionalMediaPlayersInternal(PlaylistContext context) - { - return GetEntities(context).Include(p => p.Playlist) - .Where(p => !p.IsPrimary) - .ToList(); - } - - protected override IReadOnlyCollection GetInternalAsync(PlaylistContext context) - { - return GetEntities(context).Include(p => p.Playlist).ToList(); - } - - protected override DbSet GetEntities(PlaylistContext context) - { - return context.Mediaplayers; - } - } -} diff --git a/src/Maple.Data/Repository/PlaylistRepository.cs b/src/Maple.Data/Repository/PlaylistRepository.cs deleted file mode 100644 index bfad325..0000000 --- a/src/Maple.Data/Repository/PlaylistRepository.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Collections.Generic; -using System.Data.Entity; -using System.Linq; -using Maple.Domain; - -namespace Maple.Data -{ - public class PlaylistRepository : MaplePlaylistRepository, IPlaylistRepository - { - protected override DbSet GetEntities(PlaylistContext context) - { - return context.Playlists; - } - - protected override IReadOnlyCollection GetInternalAsync(PlaylistContext context) - { - return GetEntities(context).Include(p => p.MediaItems).ToList(); - } - } -} diff --git a/src/Maple.Domain/Enums/PlaybackState.cs b/src/Maple.Domain/Enums/PlaybackState.cs index f80b49b..457ef7d 100644 --- a/src/Maple.Domain/Enums/PlaybackState.cs +++ b/src/Maple.Domain/Enums/PlaybackState.cs @@ -5,7 +5,7 @@ namespace Maple.Domain [Flags] public enum PlaybackState { - Stopped = 0, + None = 0, Playing = 1 << 0, Paused = 1 << 1, } diff --git a/src/Maple.Domain/Enums/RepeatMode.cs b/src/Maple.Domain/Enums/RepeatMode.cs index a2638d4..8e49b95 100644 --- a/src/Maple.Domain/Enums/RepeatMode.cs +++ b/src/Maple.Domain/Enums/RepeatMode.cs @@ -1,7 +1,8 @@ namespace Maple.Domain { /// - /// defines what happens when the last of is and the is requested + /// defines what happens when the last of is and the is requested /// public enum RepeatMode { diff --git a/src/Maple.Domain/Interfaces/DataAccessLayer/IChangeState.cs b/src/Maple.Domain/Interfaces/DataAccessLayer/IChangeState.cs new file mode 100644 index 0000000..43df652 --- /dev/null +++ b/src/Maple.Domain/Interfaces/DataAccessLayer/IChangeState.cs @@ -0,0 +1,11 @@ +namespace Maple.Domain +{ + public interface IChangeState + { + /// + /// Gets a value indicating whether this instance is new. + /// + /// true if this instance is new; otherwise, false. + bool IsNew { get; } + } +} diff --git a/src/Maple.Domain/Interfaces/DataAccessLayer/IEntity.cs b/src/Maple.Domain/Interfaces/DataAccessLayer/IEntity.cs new file mode 100644 index 0000000..cba2c3d --- /dev/null +++ b/src/Maple.Domain/Interfaces/DataAccessLayer/IEntity.cs @@ -0,0 +1,19 @@ +using System; + +namespace Maple.Domain +{ + public interface IEntity : IChangeState, ISequence + { + object Id { get; } + DateTime CreatedOn { get; set; } + DateTime? UpdatedOn { get; set; } + string CreatedBy { get; set; } + string UpdatedBy { get; set; } + byte[] Version { get; set; } + } + + public interface IEntity : IEntity + { + new T Id { get; set; } + } +} diff --git a/src/Maple.Domain/Interfaces/DataAccessLayer/IReadOnlyRepository.cs b/src/Maple.Domain/Interfaces/DataAccessLayer/IReadOnlyRepository.cs new file mode 100644 index 0000000..45bead2 --- /dev/null +++ b/src/Maple.Domain/Interfaces/DataAccessLayer/IReadOnlyRepository.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Threading.Tasks; + +namespace Maple.Domain +{ + public interface IReadOnlyRepository + { + IEnumerable GetAll( + Func, IOrderedQueryable> orderBy = null, + string includeProperties = null, + int? skip = null, + int? take = null) + where TEntity : class, IEntity; + + Task> GetAllAsync( + Func, IOrderedQueryable> orderBy = null, + string includeProperties = null, + int? skip = null, + int? take = null) + where TEntity : class, IEntity; + + IEnumerable Get( + Expression> filter = null, + Func, IOrderedQueryable> orderBy = null, + string includeProperties = null, + int? skip = null, + int? take = null) + where TEntity : class, IEntity; + + Task> GetAsync( + Expression> filter = null, + Func, IOrderedQueryable> orderBy = null, + string includeProperties = null, + int? skip = null, + int? take = null) + where TEntity : class, IEntity; + + TEntity GetOne( + Expression> filter = null, + string includeProperties = null) + where TEntity : class, IEntity; + + Task GetOneAsync( + Expression> filter = null, + string includeProperties = null) + where TEntity : class, IEntity; + + TEntity GetFirst( + Expression> filter = null, + Func, IOrderedQueryable> orderBy = null, + string includeProperties = null) + where TEntity : class, IEntity; + + Task GetFirstAsync( + Expression> filter = null, + Func, IOrderedQueryable> orderBy = null, + string includeProperties = null) + where TEntity : class, IEntity; + + TEntity GetById(object id) + where TEntity : class, IEntity; + + Task GetByIdAsync(object id) + where TEntity : class, IEntity; + + Task> GetByIdsAsync(ICollection ids) + where TEntity : class, IEntity; + + int GetCount(Expression> filter = null) + where TEntity : class, IEntity; + + Task GetCountAsync(Expression> filter = null) + where TEntity : class, IEntity; + + bool GetExists(Expression> filter = null) + where TEntity : class, IEntity; + + Task GetExistsAsync(Expression> filter = null) + where TEntity : class, IEntity; + } +} diff --git a/src/Maple.Domain/Interfaces/DataAccessLayer/IRepository.cs b/src/Maple.Domain/Interfaces/DataAccessLayer/IRepository.cs new file mode 100644 index 0000000..0c89b36 --- /dev/null +++ b/src/Maple.Domain/Interfaces/DataAccessLayer/IRepository.cs @@ -0,0 +1,17 @@ +namespace Maple.Domain +{ + public interface IRepository : IReadOnlyRepository + { + void Create(TEntity entity, string createdBy = null) + where TEntity : class, IEntity; + + void Update(TEntity entity, string modifiedBy = null) + where TEntity : class, IEntity; + + void Delete(object id) + where TEntity : class, IEntity; + + void Delete(TEntity entity) + where TEntity : class, IEntity; + } +} diff --git a/src/Maple.Domain/Interfaces/ISequence.cs b/src/Maple.Domain/Interfaces/DataAccessLayer/ISequence.cs similarity index 100% rename from src/Maple.Domain/Interfaces/ISequence.cs rename to src/Maple.Domain/Interfaces/DataAccessLayer/ISequence.cs diff --git a/src/Maple.Domain/Interfaces/DataAccessLayer/IUnitOfWork.cs b/src/Maple.Domain/Interfaces/DataAccessLayer/IUnitOfWork.cs new file mode 100644 index 0000000..8f69f6a --- /dev/null +++ b/src/Maple.Domain/Interfaces/DataAccessLayer/IUnitOfWork.cs @@ -0,0 +1,14 @@ +using System; +using System.Threading.Tasks; + +namespace Maple.Domain +{ + public interface IUnitOfWork : IDisposable + { + void Commit(); + + Task CommitAsync(); + + void Rollback(); + } +} diff --git a/src/Maple.Domain/Interfaces/IAudioDevice.cs b/src/Maple.Domain/Interfaces/IAudioDevice.cs index 10ca374..878abdf 100644 --- a/src/Maple.Domain/Interfaces/IAudioDevice.cs +++ b/src/Maple.Domain/Interfaces/IAudioDevice.cs @@ -11,4 +11,4 @@ public interface IAudioDevice : INotifyPropertyChanged string ToString(); } -} \ No newline at end of file +} diff --git a/src/Maple.Domain/Interfaces/IBaseObject.cs b/src/Maple.Domain/Interfaces/IBaseObject.cs deleted file mode 100644 index c1740cb..0000000 --- a/src/Maple.Domain/Interfaces/IBaseObject.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; - -namespace Maple.Domain -{ - public interface IBaseObject - { - string CreatedBy { get; set; } - DateTime CreatedOn { get; set; } - int Id { get; set; } - bool IsDeleted { get; set; } - bool IsNew { get; } - byte[] RowVersion { get; set; } - int Sequence { get; set; } - string UpdatedBy { get; set; } - DateTime UpdatedOn { get; set; } - } -} \ No newline at end of file diff --git a/src/Maple.Domain/Interfaces/IChangeState.cs b/src/Maple.Domain/Interfaces/IChangeState.cs deleted file mode 100644 index bc36a0f..0000000 --- a/src/Maple.Domain/Interfaces/IChangeState.cs +++ /dev/null @@ -1,20 +0,0 @@ -namespace Maple.Domain -{ - public interface IChangeState - { - /// - /// Gets a value indicating whether this instance is new. - /// - /// - /// true if this instance is new; otherwise, false. - /// - bool IsNew { get; } - /// - /// Gets a value indicating whether this instance is deleted. - /// - /// - /// true if this instance is deleted; otherwise, false. - /// - bool IsDeleted { get; } - } -} diff --git a/src/Maple.Domain/Interfaces/IIdentifier.cs b/src/Maple.Domain/Interfaces/IIdentifier.cs deleted file mode 100644 index 1c62518..0000000 --- a/src/Maple.Domain/Interfaces/IIdentifier.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Maple.Domain -{ - public interface IIdentifier - { - int Id { get; } - } -} diff --git a/src/Maple.Domain/Interfaces/ILoggingService.cs b/src/Maple.Domain/Interfaces/ILoggingService.cs deleted file mode 100644 index d5d3c25..0000000 --- a/src/Maple.Domain/Interfaces/ILoggingService.cs +++ /dev/null @@ -1,183 +0,0 @@ -using System; - -namespace Maple.Domain -{ - public interface ILoggingService - { - // - // Summary: - // Logs a message object with the log4net.Core.Level.Error level. - // - // Parameters: - // message: - // The message object to log. - // - // Remarks: - // This method first checks if this logger is ERROR enabled by comparing the level - // of this logger with the log4net.Core.Level.Error level. If this logger is ERROR - // enabled, then it converts the message object (passed as parameter) to a string - // by invoking the appropriate log4net.ObjectRenderer.IObjectRenderer. It then proceeds - // to call all the registered appenders in this logger and also higher in the hierarchy - // depending on the value of the additivity flag. - // WARNING Note that passing an System.Exception to this method will print the name - // of the System.Exception but no stack trace. To print a stack trace use the Error(object,Exception) - // form instead. - /// - /// Errors the specified message. - /// - /// The message. - void Error(object message); - // - // Summary: - // Log a message object with the log4net.Core.Level.Error level including the stack - // trace of the System.Exception passed as a parameter. - // - // Parameters: - // message: - // The message object to log. - // - // exception: - // The exception to log, including its stack trace. - // - // Remarks: - // See the Error(object) form for more detailed information. - /// - /// Errors the specified message. - /// - /// The message. - /// The exception. - void Error(object message, Exception exception); - - // - // Summary: - // Log a message object with the log4net.Core.Level.Fatal level. - // - // Parameters: - // message: - // The message object to log. - // - // Remarks: - // This method first checks if this logger is FATAL enabled by comparing the level - // of this logger with the log4net.Core.Level.Fatal level. If this logger is FATAL - // enabled, then it converts the message object (passed as parameter) to a string - // by invoking the appropriate log4net.ObjectRenderer.IObjectRenderer. It then proceeds - // to call all the registered appenders in this logger and also higher in the hierarchy - // depending on the value of the additivity flag. - // WARNING Note that passing an System.Exception to this method will print the name - // of the System.Exception but no stack trace. To print a stack trace use the Fatal(object,Exception) - // form instead. - /// - /// Fatals the specified message. - /// - /// The message. - void Fatal(object message); - // - // Summary: - // Log a message object with the log4net.Core.Level.Fatal level including the stack - // trace of the System.Exception passed as a parameter. - // - // Parameters: - // message: - // The message object to log. - // - // exception: - // The exception to log, including its stack trace. - // - // Remarks: - // See the Fatal(object) form for more detailed information. - /// - /// Fatals the specified message. - /// - /// The message. - /// The exception. - void Fatal(object message, Exception exception); - - // - // Summary: - // Logs a message object with the log4net.Core.Level.Info level. - // - // Parameters: - // message: - // The message object to log. - // - // Remarks: - // This method first checks if this logger is INFO enabled by comparing the level - // of this logger with the log4net.Core.Level.Info level. If this logger is INFO - // enabled, then it converts the message object (passed as parameter) to a string - // by invoking the appropriate log4net.ObjectRenderer.IObjectRenderer. It then proceeds - // to call all the registered appenders in this logger and also higher in the hierarchy - // depending on the value of the additivity flag. - // WARNING Note that passing an System.Exception to this method will print the name - // of the System.Exception but no stack trace. To print a stack trace use the Info(object,Exception) - // form instead. - /// - /// Informations the specified message. - /// - /// The message. - void Info(object message); - // - // Summary: - // Logs a message object with the INFO level including the stack trace of the System.Exception - // passed as a parameter. - // - // Parameters: - // message: - // The message object to log. - // - // exception: - // The exception to log, including its stack trace. - // - // Remarks: - // See the Info(object) form for more detailed information. - /// - /// Informations the specified message. - /// - /// The message. - /// The exception. - void Info(object message, Exception exception); - - // - // Summary: - // Log a message object with the log4net.Core.Level.Warn level. - // - // Parameters: - // message: - // The message object to log. - // - // Remarks: - // This method first checks if this logger is WARN enabled by comparing the level - // of this logger with the log4net.Core.Level.Warn level. If this logger is WARN - // enabled, then it converts the message object (passed as parameter) to a string - // by invoking the appropriate log4net.ObjectRenderer.IObjectRenderer. It then proceeds - // to call all the registered appenders in this logger and also higher in the hierarchy - // depending on the value of the additivity flag. - // WARNING Note that passing an System.Exception to this method will print the name - // of the System.Exception but no stack trace. To print a stack trace use the Warn(object,Exception) - // form instead. - /// - /// Warns the specified message. - /// - /// The message. - void Warn(object message); - // - // Summary: - // Log a message object with the log4net.Core.Level.Warn level including the stack - // trace of the System.Exception passed as a parameter. - // - // Parameters: - // message: - // The message object to log. - // - // exception: - // The exception to log, including its stack trace. - // - // Remarks: - // See the Warn(object) form for more detailed information. - /// - /// Warns the specified message. - /// - /// The message. - /// The exception. - void Warn(object message, Exception exception); - } -} diff --git a/src/Maple.Domain/Interfaces/IMapleRepository.cs b/src/Maple.Domain/Interfaces/IMapleRepository.cs deleted file mode 100644 index e5a4434..0000000 --- a/src/Maple.Domain/Interfaces/IMapleRepository.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace Maple.Domain -{ - public interface IMapleRepository - where T : class, IBaseObject - { - Task> GetAsync(); - Task GetByIdAsync(int Id); - void Save(T item); - } -} \ No newline at end of file diff --git a/src/Maple.Domain/Interfaces/IMediaItem.cs b/src/Maple.Domain/Interfaces/IMediaItem.cs index 342288d..0c4d1a7 100644 --- a/src/Maple.Domain/Interfaces/IMediaItem.cs +++ b/src/Maple.Domain/Interfaces/IMediaItem.cs @@ -2,7 +2,7 @@ namespace Maple.Domain { - public interface IMediaItem : IIsSelected, ISequence, IIdentifier, IChangeState + public interface IMediaItem : IIsSelected, ISequence { string Title { get; } string Location { get; } diff --git a/src/Maple.Domain/Interfaces/IMediaPlayer.cs b/src/Maple.Domain/Interfaces/IMediaPlayer.cs index 69eb616..10adfa0 100644 --- a/src/Maple.Domain/Interfaces/IMediaPlayer.cs +++ b/src/Maple.Domain/Interfaces/IMediaPlayer.cs @@ -7,20 +7,20 @@ public interface IMediaPlayer : IDisposable /// /// Gets a value indicating whether this instance is playing. /// - /// - /// true if this instance is playing; otherwise, false. - /// + /// true if this instance is playing; otherwise, false. bool IsPlaying { get; } /// /// Plays the specified item. /// /// The item. - bool Play(IMediaItem item); + bool Play(IMediaItem mediaItem); + /// /// Pauses this instance. /// void Pause(); + /// /// Stops this instance. /// @@ -29,53 +29,44 @@ public interface IMediaPlayer : IDisposable /// /// Determines whether this instance can stop. /// - /// - /// true if this instance can stop; otherwise, false. - /// + /// true if this instance can stop; otherwise, false. bool CanStop(); + /// /// Determines whether this instance can pause. /// - /// - /// true if this instance can pause; otherwise, false. - /// + /// true if this instance can pause; otherwise, false. bool CanPause(); + /// /// Determines whether this instance can play the specified item. /// /// The item. - /// - /// true if this instance can play the specified item; otherwise, false. - /// - bool CanPlay(IMediaItem item); + /// true if this instance can play the specified item; otherwise, false. + bool CanPlay(IMediaItem mediaItem); /// /// Gets or sets the volume. /// - /// - /// The volume. - /// + /// The volume. int Volume { get; set; } + /// /// Gets the volume maximum. /// - /// - /// The volume maximum. - /// + /// The volume maximum. int VolumeMax { get; } + /// /// Gets the volume minimum. /// - /// - /// The volume minimum. - /// + /// The volume minimum. int VolumeMin { get; } + /// /// Gets or sets the audio device. /// - /// - /// The audio device. - /// + /// The audio device. IAudioDevice AudioDevice { get; set; } } } diff --git a/src/Maple.Domain/Interfaces/IRangeObservableCollection.cs b/src/Maple.Domain/Interfaces/IRangeObservableCollection.cs index fc425b8..b4830be 100644 --- a/src/Maple.Domain/Interfaces/IRangeObservableCollection.cs +++ b/src/Maple.Domain/Interfaces/IRangeObservableCollection.cs @@ -5,10 +5,12 @@ namespace Maple.Domain { - public interface IRangeObservableCollection : IEnumerable, ICollection, INotifyPropertyChanged, IList, INotifyCollectionChanged + public interface IRangeObservableCollection : INotifyPropertyChanged, IList, INotifyCollectionChanged { void AddRange(IEnumerable items); + void OnPropertyChanged([CallerMemberName] string propertyName = null); + void RemoveRange(IEnumerable items); } -} \ No newline at end of file +} diff --git a/src/Maple.Domain/Interfaces/IRefreshable.cs b/src/Maple.Domain/Interfaces/IRefreshable.cs deleted file mode 100644 index fdb721b..0000000 --- a/src/Maple.Domain/Interfaces/IRefreshable.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Threading.Tasks; - -namespace Maple.Domain -{ - public interface IRefreshable - { - void Save(); - Task LoadAsync(); - } -} diff --git a/src/Maple.Domain/Interfaces/ITranslationProvider.cs b/src/Maple.Domain/Interfaces/Providers/ITranslationProvider.cs similarity index 100% rename from src/Maple.Domain/Interfaces/ITranslationProvider.cs rename to src/Maple.Domain/Interfaces/Providers/ITranslationProvider.cs diff --git a/src/Maple.Core/Interfaces/ILocalizationService.cs b/src/Maple.Domain/Interfaces/Services/ILocalizationService.cs similarity index 90% rename from src/Maple.Core/Interfaces/ILocalizationService.cs rename to src/Maple.Domain/Interfaces/Services/ILocalizationService.cs index 987ad62..077f71e 100644 --- a/src/Maple.Core/Interfaces/ILocalizationService.cs +++ b/src/Maple.Domain/Interfaces/Services/ILocalizationService.cs @@ -1,16 +1,16 @@ using System.Collections.Generic; using System.ComponentModel; using System.Globalization; -using Maple.Domain; +using System.Threading.Tasks; -namespace Maple.Core +namespace Maple.Domain { /// /// /// /// /// - public interface ILocalizationService : INotifyPropertyChanged, IRefreshable + public interface ILocalizationService : INotifyPropertyChanged { /// /// Gets or sets the current language. @@ -32,5 +32,8 @@ public interface ILocalizationService : INotifyPropertyChanged, IRefreshable /// The key. /// string Translate(string key); + + Task Save(); + Task LoadAsync(); } } diff --git a/src/Maple.Domain/Interfaces/ILoggingNotifcationService.cs b/src/Maple.Domain/Interfaces/Services/ILoggingNotifcationService.cs similarity index 92% rename from src/Maple.Domain/Interfaces/ILoggingNotifcationService.cs rename to src/Maple.Domain/Interfaces/Services/ILoggingNotifcationService.cs index 806f4b0..9d0e4c1 100644 --- a/src/Maple.Domain/Interfaces/ILoggingNotifcationService.cs +++ b/src/Maple.Domain/Interfaces/Services/ILoggingNotifcationService.cs @@ -5,12 +5,15 @@ namespace Maple.Domain /// /// forwards user friendly messages to the UI and to a /// - /// + /// public interface ILoggingNotifcationService { void Info(object message); + void Warn(object message); + void Error(object message, Exception exception); + void Fatal(object message, Exception exception); } -} \ No newline at end of file +} diff --git a/src/Maple.Domain/Interfaces/Services/ILoggingService.cs b/src/Maple.Domain/Interfaces/Services/ILoggingService.cs new file mode 100644 index 0000000..4df1abb --- /dev/null +++ b/src/Maple.Domain/Interfaces/Services/ILoggingService.cs @@ -0,0 +1,139 @@ +using System; + +namespace Maple.Domain +{ + public interface ILoggingService + { + // Summary: Logs a message object with the log4net.Core.Level.Error level. + // + // Parameters: message: The message object to log. + // + // Remarks: This method first checks if this logger is ERROR enabled by comparing the level + // of this logger with the log4net.Core.Level.Error level. If this logger is ERROR enabled, + // then it converts the message object (passed as parameter) to a string by invoking the + // appropriate log4net.ObjectRenderer.IObjectRenderer. It then proceeds to call all the + // registered appenders in this logger and also higher in the hierarchy depending on the + // value of the additivity flag. WARNING Note that passing an System.Exception to this method + // will print the name of the System.Exception but no stack trace. To print a stack trace use + // the Error(object,Exception) form instead. + /// + /// Errors the specified message. + /// + /// The message. + void Error(object message); + + // Summary: Log a message object with the log4net.Core.Level.Error level including the stack + // trace of the System.Exception passed as a parameter. + // + // Parameters: message: The message object to log. + // + // exception: The exception to log, including its stack trace. + // + // Remarks: See the Error(object) form for more detailed information. + /// + /// Errors the specified message. + /// + /// The message. + /// The exception. + void Error(object message, Exception exception); + + // Summary: Log a message object with the log4net.Core.Level.Fatal level. + // + // Parameters: message: The message object to log. + // + // Remarks: This method first checks if this logger is FATAL enabled by comparing the level + // of this logger with the log4net.Core.Level.Fatal level. If this logger is FATAL enabled, + // then it converts the message object (passed as parameter) to a string by invoking the + // appropriate log4net.ObjectRenderer.IObjectRenderer. It then proceeds to call all the + // registered appenders in this logger and also higher in the hierarchy depending on the + // value of the additivity flag. WARNING Note that passing an System.Exception to this method + // will print the name of the System.Exception but no stack trace. To print a stack trace use + // the Fatal(object,Exception) form instead. + /// + /// Fatals the specified message. + /// + /// The message. + void Fatal(object message); + + // Summary: Log a message object with the log4net.Core.Level.Fatal level including the stack + // trace of the System.Exception passed as a parameter. + // + // Parameters: message: The message object to log. + // + // exception: The exception to log, including its stack trace. + // + // Remarks: See the Fatal(object) form for more detailed information. + /// + /// Fatals the specified message. + /// + /// The message. + /// The exception. + void Fatal(object message, Exception exception); + + // Summary: Logs a message object with the log4net.Core.Level.Info level. + // + // Parameters: message: The message object to log. + // + // Remarks: This method first checks if this logger is INFO enabled by comparing the level of + // this logger with the log4net.Core.Level.Info level. If this logger is INFO enabled, then + // it converts the message object (passed as parameter) to a string by invoking the + // appropriate log4net.ObjectRenderer.IObjectRenderer. It then proceeds to call all the + // registered appenders in this logger and also higher in the hierarchy depending on the + // value of the additivity flag. WARNING Note that passing an System.Exception to this method + // will print the name of the System.Exception but no stack trace. To print a stack trace use + // the Info(object,Exception) form instead. + /// + /// Informations the specified message. + /// + /// The message. + void Info(object message); + + // Summary: Logs a message object with the INFO level including the stack trace of the + // System.Exception passed as a parameter. + // + // Parameters: message: The message object to log. + // + // exception: The exception to log, including its stack trace. + // + // Remarks: See the Info(object) form for more detailed information. + /// + /// Informations the specified message. + /// + /// The message. + /// The exception. + void Info(object message, Exception exception); + + // Summary: Log a message object with the log4net.Core.Level.Warn level. + // + // Parameters: message: The message object to log. + // + // Remarks: This method first checks if this logger is WARN enabled by comparing the level of + // this logger with the log4net.Core.Level.Warn level. If this logger is WARN enabled, then + // it converts the message object (passed as parameter) to a string by invoking the + // appropriate log4net.ObjectRenderer.IObjectRenderer. It then proceeds to call all the + // registered appenders in this logger and also higher in the hierarchy depending on the + // value of the additivity flag. WARNING Note that passing an System.Exception to this method + // will print the name of the System.Exception but no stack trace. To print a stack trace use + // the Warn(object,Exception) form instead. + /// + /// Warns the specified message. + /// + /// The message. + void Warn(object message); + + // Summary: Log a message object with the log4net.Core.Level.Warn level including the stack + // trace of the System.Exception passed as a parameter. + // + // Parameters: message: The message object to log. + // + // exception: The exception to log, including its stack trace. + // + // Remarks: See the Warn(object) form for more detailed information. + /// + /// Warns the specified message. + /// + /// The message. + /// The exception. + void Warn(object message, Exception exception); + } +} diff --git a/src/Maple.Domain/Interfaces/ISequenceService.cs b/src/Maple.Domain/Interfaces/Services/ISequenceService.cs similarity index 100% rename from src/Maple.Domain/Interfaces/ISequenceService.cs rename to src/Maple.Domain/Interfaces/Services/ISequenceService.cs diff --git a/src/Maple.Domain/Interfaces/IVersionService.cs b/src/Maple.Domain/Interfaces/Services/IVersionService.cs similarity index 98% rename from src/Maple.Domain/Interfaces/IVersionService.cs rename to src/Maple.Domain/Interfaces/Services/IVersionService.cs index b6a4bd1..8e69375 100644 --- a/src/Maple.Domain/Interfaces/IVersionService.cs +++ b/src/Maple.Domain/Interfaces/Services/IVersionService.cs @@ -4,4 +4,4 @@ public interface IVersionService { string Get(); } -} \ No newline at end of file +} diff --git a/src/Maple.Domain/Maple.Domain.csproj b/src/Maple.Domain/Maple.Domain.csproj index 2050693..1410265 100644 --- a/src/Maple.Domain/Maple.Domain.csproj +++ b/src/Maple.Domain/Maple.Domain.csproj @@ -21,6 +21,7 @@ prompt 4 false + 7.2 pdbonly @@ -53,29 +54,33 @@ + + + + + - - - + + - - - + + - - - - - - + + + + - - + + + 7.1.0.5212 + + \ No newline at end of file diff --git a/src/Maple.Domain/Models/Base/BaseObject.cs b/src/Maple.Domain/Models/Base/BaseObject.cs deleted file mode 100644 index 84b225c..0000000 --- a/src/Maple.Domain/Models/Base/BaseObject.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace Maple.Domain -{ - public abstract class BaseObject : IBaseObject - { - [Key] - [Column(Order = 1)] - public int Id { get; set; } - [Column(Order = 2)] - public int Sequence { get; set; } - - public DateTime CreatedOn { get; set; } - public string CreatedBy { get; set; } - - public DateTime UpdatedOn { get; set; } - public string UpdatedBy { get; set; } - - [Timestamp] - public byte[] RowVersion { get; set; } - - [NotMapped] - public bool IsDeleted { get; set; } - - [NotMapped] - public bool IsNew => Id == 0; - } -} diff --git a/src/Maple.Domain/Models/Base/Entity.cs b/src/Maple.Domain/Models/Base/Entity.cs new file mode 100644 index 0000000..41032a5 --- /dev/null +++ b/src/Maple.Domain/Models/Base/Entity.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Maple.Domain +{ + public abstract class Entity : IEntity + { + [Key] + [Column(Order = 1)] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + public T Id { get; set; } + + object IEntity.Id => Id; + + private DateTime? createdDate; + [DataType(DataType.DateTime)] + public DateTime CreatedOn + { + get { return createdDate ?? DateTime.UtcNow; } + set { createdDate = value; } + } + + [DataType(DataType.DateTime)] + public DateTime? UpdatedOn { get; set; } + + public string CreatedBy { get; set; } + + public string UpdatedBy { get; set; } + + [Column(Order = 2)] + public int Sequence { get; set; } + + [Timestamp] + public byte[] Version { get; set; } + + [NotMapped] + public bool IsNew => EqualityComparer.Default.Equals(Id, default); + + [NotMapped] + public bool IsDeleted { get; set; } + } +} diff --git a/src/Maple.Domain/Models/MediaItemModel.cs b/src/Maple.Domain/Models/MediaItemModel.cs index 92d84e0..00ab215 100644 --- a/src/Maple.Domain/Models/MediaItemModel.cs +++ b/src/Maple.Domain/Models/MediaItemModel.cs @@ -5,18 +5,17 @@ namespace Maple.Domain { [DebuggerDisplay("{Title}, {Sequence}")] - public class MediaItemModel : BaseObject + public class MediaItemModel : Entity { public int PlaylistId { get; set; } [ForeignKey(nameof(PlaylistId))] public PlaylistModel Playlist { get; set; } - public RawModel Raw { get; set; } - /// /// Ticks /// public long Duration { get; set; } + public int PrivacyStatus { get; set; } public int MediaItemType { get; set; } public string Description { get; set; } @@ -24,6 +23,7 @@ public class MediaItemModel : BaseObject [Required] [MaxLength(50)] public string Title { get; set; } + [Required] [MaxLength(2048)] public string Location { get; set; } diff --git a/src/Maple.Domain/Models/MediaPlayerModel.cs b/src/Maple.Domain/Models/MediaPlayerModel.cs index 4775b57..06b4b08 100644 --- a/src/Maple.Domain/Models/MediaPlayerModel.cs +++ b/src/Maple.Domain/Models/MediaPlayerModel.cs @@ -5,7 +5,7 @@ namespace Maple.Domain { [DebuggerDisplay("{Name}, {DeviceName}, {Sequence}")] - public class MediaPlayerModel : BaseObject + public class MediaPlayerModel : Entity { public int PlaylistId { get; set; } [ForeignKey(nameof(PlaylistId))] @@ -13,6 +13,7 @@ public class MediaPlayerModel : BaseObject [MaxLength(100)] public string DeviceName { get; set; } + public bool IsPrimary { get; set; } [Required] diff --git a/src/Maple.Domain/Models/OptionModel.cs b/src/Maple.Domain/Models/OptionModel.cs deleted file mode 100644 index ec27dc4..0000000 --- a/src/Maple.Domain/Models/OptionModel.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using System.Diagnostics; - -namespace Maple.Domain -{ - [DebuggerDisplay("{Key}, {Value}, {Type}")] - public class OptionModel : BaseObject - { - public string Value { get; set; } - public int Type { get; set; } - - - [Required] - public string Key { get; set; } - } -} diff --git a/src/Maple.Domain/Models/PlaylistModel.cs b/src/Maple.Domain/Models/PlaylistModel.cs index 8d96ad8..82d9228 100644 --- a/src/Maple.Domain/Models/PlaylistModel.cs +++ b/src/Maple.Domain/Models/PlaylistModel.cs @@ -7,7 +7,7 @@ namespace Maple.Domain // tutorial http://www.entityframeworktutorial.net/code-first/configure-one-to-many-relationship-in-code-first.aspx [DebuggerDisplay("{Title}, {SelectedItem}, {Sequence}")] - public class PlaylistModel : BaseObject + public class PlaylistModel : Entity { private ICollection _mediaItems; public virtual ICollection MediaItems @@ -18,6 +18,7 @@ public virtual ICollection MediaItems [MaxLength(100)] public string Description { get; set; } + public string Location { get; set; } public bool IsShuffeling { get; set; } public int PrivacyStatus { get; set; } @@ -26,6 +27,5 @@ public virtual ICollection MediaItems [Required] [MaxLength(50)] public string Title { get; set; } - } } diff --git a/src/Maple.Domain/Models/RawModel.cs b/src/Maple.Domain/Models/RawModel.cs deleted file mode 100644 index 182e8cf..0000000 --- a/src/Maple.Domain/Models/RawModel.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Maple.Domain -{ - public class RawModel : BaseObject - { - public byte[] Data { get; set; } - } -} diff --git a/src/Maple.Domain/Properties/AssemblyInfo.cs b/src/Maple.Domain/Properties/AssemblyInfo.cs index 405721d..e01a489 100644 --- a/src/Maple.Domain/Properties/AssemblyInfo.cs +++ b/src/Maple.Domain/Properties/AssemblyInfo.cs @@ -1,9 +1,7 @@ using System.Reflection; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. +// General Information about an assembly is controlled through the following set of attributes. +// Change these attribute values to modify the information associated with an assembly. [assembly: AssemblyTitle("Maple.Interfaces")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] - diff --git a/src/Maple.Localization/Maple.Localization.csproj b/src/Maple.Localization/Maple.Localization.csproj index 32f1b99..8a75543 100644 --- a/src/Maple.Localization/Maple.Localization.csproj +++ b/src/Maple.Localization/Maple.Localization.csproj @@ -24,6 +24,7 @@ 4 AnyCPU false + 7.2 pdbonly @@ -73,6 +74,10 @@ Resources.Designer.cs - + + + 7.1.0.5212 + + \ No newline at end of file diff --git a/src/Maple.Localization/Properties/Resources.Designer.cs b/src/Maple.Localization/Properties/Resources.Designer.cs index fbdb378..53dc171 100644 --- a/src/Maple.Localization/Properties/Resources.Designer.cs +++ b/src/Maple.Localization/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace Maple.Localization.Properties { - using System; - - +namespace Maple.Localization.Properties +{ + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -23,15 +23,15 @@ namespace Maple.Localization.Properties { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resources { - + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// @@ -45,7 +45,7 @@ internal Resources() { return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. @@ -59,7 +59,7 @@ internal Resources() { resourceCulture = value; } } - + /// /// Looks up a localized string similar to Ok. /// @@ -68,7 +68,7 @@ public static string Accept { return ResourceManager.GetString("Accept", resourceCulture); } } - + /// /// Looks up a localized string similar to Hinzufügen. /// @@ -77,7 +77,7 @@ public static string Add { return ResourceManager.GetString("Add", resourceCulture); } } - + /// /// Looks up a localized string similar to Anwendung wird gestartet. /// @@ -86,7 +86,7 @@ public static string AppStart { return ResourceManager.GetString("AppStart", resourceCulture); } } - + /// /// Looks up a localized string similar to Wiedergabegerät. /// @@ -95,7 +95,7 @@ public static string AudioDevice { return ResourceManager.GetString("AudioDevice", resourceCulture); } } - + /// /// Looks up a localized string similar to Abbrechen. /// @@ -104,7 +104,7 @@ public static string Cancel { return ResourceManager.GetString("Cancel", resourceCulture); } } - + /// /// Looks up a localized string similar to Leeren. /// @@ -113,7 +113,7 @@ public static string Clear { return ResourceManager.GetString("Clear", resourceCulture); } } - + /// /// Looks up a localized string similar to Schließen. /// @@ -122,7 +122,7 @@ public static string Close { return ResourceManager.GetString("Close", resourceCulture); } } - + /// /// Looks up a localized string similar to Zu den Farbprofilen wechseln. /// @@ -131,7 +131,7 @@ public static string ColorOptionsCommand { return ResourceManager.GetString("ColorOptionsCommand", resourceCulture); } } - + /// /// Looks up a localized string similar to Anzahl. /// @@ -140,7 +140,7 @@ public static string Count { return ResourceManager.GetString("Count", resourceCulture); } } - + /// /// Looks up a localized string similar to Löschen. /// @@ -149,7 +149,7 @@ public static string Delete { return ResourceManager.GetString("Delete", resourceCulture); } } - + /// /// Looks up a localized string similar to Beschreibung. /// @@ -158,7 +158,7 @@ public static string Description { return ResourceManager.GetString("Description", resourceCulture); } } - + /// /// Looks up a localized string similar to Es ist bereits ein Dialog geöffnet. Es kann kein Weiterer geöffnet werden. /// @@ -167,7 +167,7 @@ public static string DialogOpenAlready { return ResourceManager.GetString("DialogOpenAlready", resourceCulture); } } - + /// /// Looks up a localized string similar to Dirigent. /// @@ -176,7 +176,7 @@ public static string Director { return ResourceManager.GetString("Director", resourceCulture); } } - + /// /// Looks up a localized string similar to Speichert geleert. /// @@ -185,7 +185,7 @@ public static string DisposedState { return ResourceManager.GetString("DisposedState", resourceCulture); } } - + /// /// Looks up a localized string similar to Speicher wird geleert. /// @@ -194,7 +194,7 @@ public static string DisposingState { return ResourceManager.GetString("DisposingState", resourceCulture); } } - + /// /// Looks up a localized string similar to Dauer. /// @@ -203,7 +203,7 @@ public static string Duration { return ResourceManager.GetString("Duration", resourceCulture); } } - + /// /// Looks up a localized string similar to Ändern. /// @@ -212,7 +212,7 @@ public static string Edit { return ResourceManager.GetString("Edit", resourceCulture); } } - + /// /// Looks up a localized string similar to Sprache ändern. /// @@ -221,7 +221,7 @@ public static string EditLanguage { return ResourceManager.GetString("EditLanguage", resourceCulture); } } - + /// /// Looks up a localized string similar to Liste darf nicht null oder leer sein.. /// @@ -230,7 +230,7 @@ public static string ExceptionMessageCollectionNullOrEmpty { return ResourceManager.GetString("ExceptionMessageCollectionNullOrEmpty", resourceCulture); } } - + /// /// Looks up a localized string similar to Werte müssen gleich sein.. /// @@ -239,7 +239,7 @@ public static string ExceptionMessageEqualValues { return ResourceManager.GetString("ExceptionMessageEqualValues", resourceCulture); } } - + /// /// Looks up a localized string similar to Die angegebene Bedingung ist falsch.. /// @@ -248,7 +248,7 @@ public static string ExceptionMessageFalseCondition { return ResourceManager.GetString("ExceptionMessageFalseCondition", resourceCulture); } } - + /// /// Looks up a localized string similar to Folgendes Verzeichnis wurde nicht gefunden:. /// @@ -257,7 +257,7 @@ public static string ExceptionMessageMissingDirectory { return ResourceManager.GetString("ExceptionMessageMissingDirectory", resourceCulture); } } - + /// /// Looks up a localized string similar to Folgende Datei wurde nicht gefunden:. /// @@ -266,7 +266,7 @@ public static string ExceptionMessageMissingFile { return ResourceManager.GetString("ExceptionMessageMissingFile", resourceCulture); } } - + /// /// Looks up a localized string similar to Werte dürfen nicht gleich sein.. /// @@ -275,7 +275,7 @@ public static string ExceptionMessageNotEqualValues { return ResourceManager.GetString("ExceptionMessageNotEqualValues", resourceCulture); } } - + /// /// Looks up a localized string similar to String darf nicht null, leer oder nur Leerraum enthalten.. /// @@ -284,7 +284,7 @@ public static string ExceptionMessageStringNullEmpyOrWhiteSpace { return ResourceManager.GetString("ExceptionMessageStringNullEmpyOrWhiteSpace", resourceCulture); } } - + /// /// Looks up a localized string similar to Die angegebene Bedingung ist wahr.. /// @@ -293,7 +293,7 @@ public static string ExceptionMessageTrueCondition { return ResourceManager.GetString("ExceptionMessageTrueCondition", resourceCulture); } } - + /// /// Looks up a localized string similar to Ein unerwarteter Fehler ist aufgetreten.. /// @@ -302,7 +302,7 @@ public static string ExceptionMessageUnhandled { return ResourceManager.GetString("ExceptionMessageUnhandled", resourceCulture); } } - + /// /// Looks up a localized string similar to Eine Wiedergabeliste aus einer Datei importieren. /// @@ -311,7 +311,7 @@ public static string FilePlaylistImport { return ResourceManager.GetString("FilePlaylistImport", resourceCulture); } } - + /// /// Looks up a localized string similar to Filter. /// @@ -320,7 +320,7 @@ public static string Filter { return ResourceManager.GetString("Filter", resourceCulture); } } - + /// /// Looks up a localized string similar to Eine Wiedergabeliste anhand eines Ordners aus dem Dateisystem generieren und importieren. /// @@ -329,7 +329,7 @@ public static string FolderPlaylistImport { return ResourceManager.GetString("FolderPlaylistImport", resourceCulture); } } - + /// /// Looks up a localized string similar to Projektseite auf GitHub.com öffnen. /// @@ -338,7 +338,7 @@ public static string GithubPageCommand { return ResourceManager.GetString("GithubPageCommand", resourceCulture); } } - + /// /// Looks up a localized string similar to https://github.com/Insire/InsireBot-V2. /// @@ -347,7 +347,7 @@ public static string GithubProjectLink { return ResourceManager.GetString("GithubProjectLink", resourceCulture); } } - + /// /// Looks up a localized string similar to Auf der Datenbank befinden sich eine ungültige Anzahl an Einträgen für den Standardmediaplayer. /// @@ -356,7 +356,7 @@ public static string InvalidMediaplayerCountOnDBException { return ResourceManager.GetString("InvalidMediaplayerCountOnDBException", resourceCulture); } } - + /// /// Looks up a localized string similar to darf nicht leer sein. /// @@ -365,7 +365,7 @@ public static string IsRequired { return ResourceManager.GetString("IsRequired", resourceCulture); } } - + /// /// Looks up a localized string similar to Sprachen. /// @@ -374,7 +374,7 @@ public static string Languages { return ResourceManager.GetString("Languages", resourceCulture); } } - + /// /// Looks up a localized string similar to Lade. /// @@ -383,7 +383,7 @@ public static string Loading { return ResourceManager.GetString("Loading", resourceCulture); } } - + /// /// Looks up a localized string similar to Ort. /// @@ -392,7 +392,7 @@ public static string Location { return ResourceManager.GetString("Location", resourceCulture); } } - + /// /// Looks up a localized string similar to Standardmediaplayer. /// @@ -401,7 +401,7 @@ public static string MainMediaplayer { return ResourceManager.GetString("MainMediaplayer", resourceCulture); } } - + /// /// Looks up a localized string similar to Es können keine weiteren Wiedergabelisten angelegt werden, da die maximale Anzahl erreicht wurde. /// @@ -410,7 +410,7 @@ public static string MaxPlaylistCountReachedException { return ResourceManager.GetString("MaxPlaylistCountReachedException", resourceCulture); } } - + /// /// Looks up a localized string similar to Wiedergabetitel. /// @@ -419,7 +419,7 @@ public static string MediaItem { return ResourceManager.GetString("MediaItem", resourceCulture); } } - + /// /// Looks up a localized string similar to Wiedergabetitel. /// @@ -428,7 +428,7 @@ public static string MediaItems { return ResourceManager.GetString("MediaItems", resourceCulture); } } - + /// /// Looks up a localized string similar to Zur Wiedergabeliste wechseln. /// @@ -437,7 +437,7 @@ public static string MediaPlayerCommand { return ResourceManager.GetString("MediaPlayerCommand", resourceCulture); } } - + /// /// Looks up a localized string similar to Mediaplayers. /// @@ -446,7 +446,7 @@ public static string MediaPlayers { return ResourceManager.GetString("MediaPlayers", resourceCulture); } } - + /// /// Looks up a localized string similar to Navigation wird geladen. /// @@ -455,7 +455,7 @@ public static string NavigationLoad { return ResourceManager.GetString("NavigationLoad", resourceCulture); } } - + /// /// Looks up a localized string similar to Navigation geladen. /// @@ -464,7 +464,7 @@ public static string NavigationLoaded { return ResourceManager.GetString("NavigationLoaded", resourceCulture); } } - + /// /// Looks up a localized string similar to Neu. /// @@ -473,7 +473,7 @@ public static string New { return ResourceManager.GetString("New", resourceCulture); } } - + /// /// Looks up a localized string similar to Weiter. /// @@ -482,7 +482,7 @@ public static string Next { return ResourceManager.GetString("Next", resourceCulture); } } - + /// /// Looks up a localized string similar to Einstellungen. /// @@ -491,7 +491,7 @@ public static string Options { return ResourceManager.GetString("Options", resourceCulture); } } - + /// /// Looks up a localized string similar to Zu den Einstellungen wechseln. /// @@ -500,7 +500,7 @@ public static string OptionsCommand { return ResourceManager.GetString("OptionsCommand", resourceCulture); } } - + /// /// Looks up a localized string similar to Analysieren. /// @@ -509,7 +509,7 @@ public static string Parse { return ResourceManager.GetString("Parse", resourceCulture); } } - + /// /// Looks up a localized string similar to Wiedergabe. /// @@ -518,7 +518,7 @@ public static string Playback { return ResourceManager.GetString("Playback", resourceCulture); } } - + /// /// Looks up a localized string similar to Wiedergabemodus. /// @@ -527,7 +527,7 @@ public static string PlaybackMode { return ResourceManager.GetString("PlaybackMode", resourceCulture); } } - + /// /// Looks up a localized string similar to Alle Titel wiederholen. /// @@ -536,7 +536,7 @@ public static string PlaybackModeAll { return ResourceManager.GetString("PlaybackModeAll", resourceCulture); } } - + /// /// Looks up a localized string similar to Keinen Titel wiederholen. /// @@ -545,7 +545,7 @@ public static string PlaybackModeNone { return ResourceManager.GetString("PlaybackModeNone", resourceCulture); } } - + /// /// Looks up a localized string similar to Einen Titel wiederholen. /// @@ -554,7 +554,7 @@ public static string PlaybackModeOne { return ResourceManager.GetString("PlaybackModeOne", resourceCulture); } } - + /// /// Looks up a localized string similar to Zufällige Wiedergabe. /// @@ -563,7 +563,7 @@ public static string PlaybackShuffle { return ResourceManager.GetString("PlaybackShuffle", resourceCulture); } } - + /// /// Looks up a localized string similar to Wiedergabeliste. /// @@ -572,7 +572,7 @@ public static string Playlist { return ResourceManager.GetString("Playlist", resourceCulture); } } - + /// /// Looks up a localized string similar to Wiedergabeliste hinzufügen. /// @@ -581,7 +581,7 @@ public static string PlaylistAdd { return ResourceManager.GetString("PlaylistAdd", resourceCulture); } } - + /// /// Looks up a localized string similar to Aktuelle Wiedergabeliste. /// @@ -590,7 +590,7 @@ public static string PlaylistCurrent { return ResourceManager.GetString("PlaylistCurrent", resourceCulture); } } - + /// /// Looks up a localized string similar to Wiedergabelisten. /// @@ -599,7 +599,7 @@ public static string Playlists { return ResourceManager.GetString("Playlists", resourceCulture); } } - + /// /// Looks up a localized string similar to Zurück. /// @@ -608,7 +608,7 @@ public static string Previous { return ResourceManager.GetString("Previous", resourceCulture); } } - + /// /// Looks up a localized string similar to Aktualisieren. /// @@ -617,7 +617,7 @@ public static string Refresh { return ResourceManager.GetString("Refresh", resourceCulture); } } - + /// /// Looks up a localized string similar to Entfernen. /// @@ -626,7 +626,7 @@ public static string Remove { return ResourceManager.GetString("Remove", resourceCulture); } } - + /// /// Looks up a localized string similar to Keine Beschränkung. /// @@ -635,7 +635,7 @@ public static string ResctrictionNone { return ResourceManager.GetString("ResctrictionNone", resourceCulture); } } - + /// /// Looks up a localized string similar to Zugriffsbeschränkung. /// @@ -644,7 +644,7 @@ public static string Restriction { return ResourceManager.GetString("Restriction", resourceCulture); } } - + /// /// Looks up a localized string similar to Kein Zugriff. /// @@ -653,7 +653,7 @@ public static string RestrictionRestricted { return ResourceManager.GetString("RestrictionRestricted", resourceCulture); } } - + /// /// Looks up a localized string similar to Änderungen gespeichert. /// @@ -662,7 +662,7 @@ public static string SavedState { return ResourceManager.GetString("SavedState", resourceCulture); } } - + /// /// Looks up a localized string similar to Speichere. /// @@ -671,7 +671,7 @@ public static string Saving { return ResourceManager.GetString("Saving", resourceCulture); } } - + /// /// Looks up a localized string similar to Änderungen werden gespeichert. /// @@ -680,7 +680,7 @@ public static string SavingState { return ResourceManager.GetString("SavingState", resourceCulture); } } - + /// /// Looks up a localized string similar to Auswählen. /// @@ -689,7 +689,7 @@ public static string Select { return ResourceManager.GetString("Select", resourceCulture); } } - + /// /// Looks up a localized string similar to Dateiauswahl. /// @@ -698,7 +698,7 @@ public static string SelectFiles { return ResourceManager.GetString("SelectFiles", resourceCulture); } } - + /// /// Looks up a localized string similar to Ordnerauswahl. /// @@ -707,7 +707,7 @@ public static string SelectFolder { return ResourceManager.GetString("SelectFolder", resourceCulture); } } - + /// /// Looks up a localized string similar to Maple. /// @@ -716,7 +716,7 @@ public static string ShellTitle { return ResourceManager.GetString("ShellTitle", resourceCulture); } } - + /// /// Looks up a localized string similar to Farbprofile. /// @@ -725,7 +725,7 @@ public static string Themes { return ResourceManager.GetString("Themes", resourceCulture); } } - + /// /// Looks up a localized string similar to Titel. /// @@ -734,7 +734,7 @@ public static string Title { return ResourceManager.GetString("Title", resourceCulture); } } - + /// /// Looks up a localized string similar to Video hinzufügen. /// @@ -743,7 +743,7 @@ public static string VideoAdd { return ResourceManager.GetString("VideoAdd", resourceCulture); } } - + /// /// Looks up a localized string similar to Lautstärke. /// @@ -752,7 +752,7 @@ public static string Volume { return ResourceManager.GetString("Volume", resourceCulture); } } - + /// /// Looks up a localized string similar to Youtubeservice wird geladen. /// @@ -761,7 +761,7 @@ public static string YoutubeLoad { return ResourceManager.GetString("YoutubeLoad", resourceCulture); } } - + /// /// Looks up a localized string similar to Youtubeservice geladen. /// @@ -770,7 +770,7 @@ public static string YoutubeLoaded { return ResourceManager.GetString("YoutubeLoaded", resourceCulture); } } - + /// /// Looks up a localized string similar to Eine Widergabeliste von Youtube importieren. /// diff --git a/src/Maple.Test/DependencyInjectionFactoryTests.cs b/src/Maple.Test/DependencyInjectionFactoryTests.cs index a168d9c..e0891af 100644 --- a/src/Maple.Test/DependencyInjectionFactoryTests.cs +++ b/src/Maple.Test/DependencyInjectionFactoryTests.cs @@ -16,6 +16,8 @@ public sealed class DependencyInjectionFactoryTests public async Task SanityMapleGetContainerTest() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); + container.VerifyResolutions(); } @@ -23,6 +25,7 @@ public async Task SanityMapleGetContainerTest() public async Task ResolveMessengerTest() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var messenger = Substitute.For(); container.UseInstance(typeof(IMessenger), messenger, IfAlreadyRegistered: IfAlreadyRegistered.Replace); @@ -34,9 +37,7 @@ public async Task ResolveMessengerTest() public async Task ResolveLoadablesAsList() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); - - var factory = Substitute.For(); - container.UseInstance(factory); + container = container.ConfigureForTesting(); var loadables = container.Resolve>(); @@ -48,9 +49,7 @@ public async Task ResolveLoadablesAsList() public async Task ResolveManyLoadablesAsList() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); - - var factory = Substitute.For(); - container.UseInstance(factory); + container = container.ConfigureForTesting(); var loadables = container.ResolveMany().ToList(); diff --git a/src/Maple.Test/DiagnosticReportTests.cs b/src/Maple.Test/DiagnosticReportTests.cs deleted file mode 100644 index bac4fa6..0000000 --- a/src/Maple.Test/DiagnosticReportTests.cs +++ /dev/null @@ -1,269 +0,0 @@ -using Maple.Core; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Shouldly; - -namespace Maple.Test -{ - [TestClass] - public sealed class DiagnosticReportTests - { - [TestMethod, Ignore("can only be run on system with EN OS")] - public void When_generating_full_report() - { - var report = DiagnosticReport.Generate(); - report.ShouldNotBeNull(); - report.Length.ShouldBeGreaterThan(1000); - - report.ShouldStartWith("/\r\n|Diagnostic Report generated at:"); - report.ShouldContain("\r\n|\r\n|System|..."); - report.ShouldContain("\r\n|\r\n|Process|..."); - report.ShouldContain("\r\n|\r\n|Drives|..."); - report.ShouldContain("\r\n|\r\n|Assemblies|..."); - report.ShouldContain("\r\n|\r\n|Networking|..."); - report.ShouldContain("|\r\n|\t. Windows IP Configuration\r\n|"); - report.ShouldEndWith("\\"); - } - - [TestMethod, Ignore("can only be run on system with EN OS")] - public void When_generating_full_report_with_flag() - { - // ReSharper disable once RedundantArgumentDefaultValue - var report = DiagnosticReport.Generate(DiagnosticReportType.Full); - report.ShouldNotBeNull(); - report.Length.ShouldBeGreaterThan(1000); - - report.ShouldStartWith("/\r\n|Diagnostic Report generated at:"); - report.ShouldContain("\r\n|\r\n|System|..."); - report.ShouldContain("\r\n|\r\n|Process|..."); - report.ShouldContain("\r\n|\r\n|Drives|..."); - report.ShouldContain("\r\n|\r\n|Assemblies|..."); - report.ShouldContain("\r\n|\r\n|Networking|..."); - report.ShouldContain("|\r\n|\t. Windows IP Configuration\r\n|"); - report.ShouldEndWith("\\"); - } - - [TestMethod] - public void When_generating_system_report_with_flag() - { - var report = DiagnosticReport.Generate(DiagnosticReportType.System); - report.ShouldNotBeNull(); - report.Length.ShouldBeGreaterThan(100); - - report.ShouldStartWith("/\r\n|Diagnostic Report generated at:"); - report.ShouldContain("\r\n|\r\n|System|..."); - report.ShouldNotContain("\r\n|\r\n|Process|..."); - report.ShouldNotContain("\r\n|\r\n|Drives|..."); - report.ShouldNotContain("\r\n|\r\n|Assemblies|..."); - report.ShouldNotContain("\r\n|\r\n|Networking|..."); - report.ShouldNotContain("|\r\n|\t. Windows IP Configuration\r\n|"); - report.ShouldEndWith("\\"); - } - - [TestMethod] - public void When_generating_process_report_with_flag() - { - var report = DiagnosticReport.Generate(DiagnosticReportType.Process); - report.ShouldNotBeNull(); - report.Length.ShouldBeGreaterThan(100); - - report.ShouldStartWith("/\r\n|Diagnostic Report generated at:"); - report.ShouldNotContain("\r\n|\r\n|System|..."); - report.ShouldContain("\r\n|\r\n|Process|..."); - report.ShouldNotContain("\r\n|\r\n|Drives|..."); - report.ShouldNotContain("\r\n|\r\n|Assemblies|..."); - report.ShouldNotContain("\r\n|\r\n|Networking|..."); - report.ShouldNotContain("|\r\n|\t. Windows IP Configuration\r\n|"); - report.ShouldEndWith("\\"); - } - - [TestMethod] - public void When_generating_drives_report_with_flag() - { - var report = DiagnosticReport.Generate(DiagnosticReportType.Drives); - report.ShouldNotBeNull(); - report.Length.ShouldBeGreaterThan(100); - - report.ShouldStartWith("/\r\n|Diagnostic Report generated at:"); - report.ShouldNotContain("\r\n|\r\n|System|..."); - report.ShouldNotContain("\r\n|\r\n|Process|..."); - report.ShouldContain("\r\n|\r\n|Drives|..."); - report.ShouldNotContain("\r\n|\r\n|Assemblies|..."); - report.ShouldNotContain("\r\n|\r\n|Networking|..."); - report.ShouldNotContain("|\r\n|\t. Windows IP Configuration\r\n|"); - report.ShouldEndWith("\\"); - } - - [TestMethod] - public void When_generating_assemblies_report_with_flag() - { - var report = DiagnosticReport.Generate(DiagnosticReportType.Assemblies); - report.ShouldNotBeNull(); - report.Length.ShouldBeGreaterThan(100); - - report.ShouldStartWith("/\r\n|Diagnostic Report generated at:"); - report.ShouldNotContain("\r\n|\r\n|System|..."); - report.ShouldNotContain("\r\n|\r\n|Process|..."); - report.ShouldNotContain("\r\n|\r\n|Drives|..."); - report.ShouldContain("\r\n|\r\n|Assemblies|..."); - report.ShouldNotContain("\r\n|\r\n|Networking|..."); - report.ShouldNotContain("|\r\n|\t. Windows IP Configuration\r\n|"); - report.ShouldEndWith("\\"); - } - - [TestMethod, Ignore("can only be run on system with EN OS")] - public void When_generating_networking_report_with_flag() - { - var report = DiagnosticReport.Generate(DiagnosticReportType.Networking); - report.ShouldNotBeNull(); - report.Length.ShouldBeGreaterThan(100); - - report.ShouldStartWith("/\r\n|Diagnostic Report generated at:"); - report.ShouldNotContain("\r\n|\r\n|System|..."); - report.ShouldNotContain("\r\n|\r\n|Process|..."); - report.ShouldNotContain("\r\n|\r\n|Drives|..."); - report.ShouldNotContain("\r\n|\r\n|Assemblies|..."); - report.ShouldContain("\r\n|\r\n|Networking|..."); - report.ShouldContain("|\r\n|\t. Windows IP Configuration\r\n|"); - report.ShouldEndWith("\\"); - } - - [TestMethod] - public void When_generating_system_and_process_report() - { - var flags = DiagnosticReportType.System | DiagnosticReportType.Process; - var report = DiagnosticReport.Generate(flags); - report.ShouldNotBeNull(); - report.Length.ShouldBeGreaterThan(100); - - report.ShouldStartWith("/\r\n|Diagnostic Report generated at:"); - report.ShouldContain("\r\n|\r\n|System|..."); - report.ShouldContain("\r\n|\r\n|Process|..."); - report.ShouldNotContain("\r\n|\r\n|Drives|..."); - report.ShouldNotContain("\r\n|\r\n|Assemblies|..."); - report.ShouldNotContain("\r\n|\r\n|Networking|..."); - report.ShouldNotContain("|\r\n|\t. Windows IP Configuration\r\n|"); - report.ShouldEndWith("\\"); - } - - [TestMethod] - public void When_generating_system_and_drives_report() - { - var flags = DiagnosticReportType.System | DiagnosticReportType.Drives; - var report = DiagnosticReport.Generate(flags); - report.ShouldNotBeNull(); - report.Length.ShouldBeGreaterThan(100); - - report.ShouldStartWith("/\r\n|Diagnostic Report generated at:"); - report.ShouldContain("\r\n|\r\n|System|..."); - report.ShouldNotContain("\r\n|\r\n|Process|..."); - report.ShouldContain("\r\n|\r\n|Drives|..."); - report.ShouldNotContain("\r\n|\r\n|Assemblies|..."); - report.ShouldNotContain("\r\n|\r\n|Networking|..."); - report.ShouldNotContain("|\r\n|\t. Windows IP Configuration\r\n|"); - report.ShouldEndWith("\\"); - } - - [TestMethod] - public void When_generating_system_and_assemblies_report() - { - var flags = DiagnosticReportType.System | DiagnosticReportType.Assemblies; - var report = DiagnosticReport.Generate(flags); - report.ShouldNotBeNull(); - report.Length.ShouldBeGreaterThan(100); - - report.ShouldStartWith("/\r\n|Diagnostic Report generated at:"); - report.ShouldContain("\r\n|\r\n|System|..."); - report.ShouldNotContain("\r\n|\r\n|Process|..."); - report.ShouldNotContain("\r\n|\r\n|Drives|..."); - report.ShouldContain("\r\n|\r\n|Assemblies|..."); - report.ShouldNotContain("\r\n|\r\n|Networking|..."); - report.ShouldNotContain("|\r\n|\t. Windows IP Configuration\r\n|"); - report.ShouldEndWith("\\"); - } - - [TestMethod, Ignore("can only be run on system with EN OS")] - public void When_generating_system_and_networking_report() - { - var flags = DiagnosticReportType.System | DiagnosticReportType.Networking; - var report = DiagnosticReport.Generate(flags); - report.ShouldNotBeNull(); - report.Length.ShouldBeGreaterThan(100); - - report.ShouldStartWith("/\r\n|Diagnostic Report generated at:"); - report.ShouldContain("\r\n|\r\n|System|..."); - report.ShouldNotContain("\r\n|\r\n|Process|..."); - report.ShouldNotContain("\r\n|\r\n|Drives|..."); - report.ShouldNotContain("\r\n|\r\n|Assemblies|..."); - report.ShouldContain("\r\n|\r\n|Networking|..."); - report.ShouldContain("|\r\n|\t. Windows IP Configuration\r\n|"); - report.ShouldEndWith("\\"); - } - - - [TestMethod, Ignore("can only be run on system with EN OS")] - public void When_generating_system_and_process_and_drives_and_assemblies_and_environment_variables_and_networking_report() - { - var flags = DiagnosticReportType.System - | DiagnosticReportType.Process - | DiagnosticReportType.Drives - | DiagnosticReportType.Assemblies - | DiagnosticReportType.Networking; - - var report = DiagnosticReport.Generate(flags); - report.ShouldNotBeNull(); - report.Length.ShouldBeGreaterThan(1000); - - report.ShouldStartWith("/\r\n|Diagnostic Report generated at:"); - report.ShouldContain("\r\n|\r\n|System|..."); - report.ShouldContain("\r\n|\r\n|Process|..."); - report.ShouldContain("\r\n|\r\n|Drives|..."); - report.ShouldContain("\r\n|\r\n|Assemblies|..."); - report.ShouldContain("\r\n|\r\n|Networking|..."); - report.ShouldContain("|\r\n|\t. Windows IP Configuration\r\n|"); - report.ShouldEndWith("\\"); - } - - [TestMethod, Ignore("can only be run on system with EN OS")] - public void When_generating_process_and_assemblies_and_networking_report() - { - var flags = DiagnosticReportType.Process - | DiagnosticReportType.Assemblies - | DiagnosticReportType.Networking; - - var report = DiagnosticReport.Generate(flags); - report.ShouldNotBeNull(); - report.Length.ShouldBeGreaterThan(500); - - report.ShouldStartWith("/\r\n|Diagnostic Report generated at:"); - report.ShouldNotContain("\r\n|\r\n|System|..."); - report.ShouldContain("\r\n|\r\n|Process|..."); - report.ShouldNotContain("\r\n|\r\n|Drives|..."); - report.ShouldContain("\r\n|\r\n|Assemblies|..."); - report.ShouldContain("\r\n|\r\n|Networking|..."); - report.ShouldContain("|\r\n|\t. Windows IP Configuration\r\n|"); - report.ShouldEndWith("\\"); - } - - [TestMethod, Ignore("can only be run on system with EN OS")] - public void When_generating_process_and_assemblies_and_networking_and_full_report() - { - var flags = DiagnosticReportType.Process - | DiagnosticReportType.Assemblies - | DiagnosticReportType.Networking - | DiagnosticReportType.Full; - - var report = DiagnosticReport.Generate(flags); - report.ShouldNotBeNull(); - report.Length.ShouldBeGreaterThan(1000); - - report.ShouldStartWith("/\r\n|Diagnostic Report generated at:"); - report.ShouldContain("\r\n|\r\n|System|..."); - report.ShouldContain("\r\n|\r\n|Process|..."); - report.ShouldContain("\r\n|\r\n|Drives|..."); - report.ShouldContain("\r\n|\r\n|Assemblies|..."); - report.ShouldContain("\r\n|\r\n|Networking|..."); - report.ShouldContain("|\r\n|\t. Windows IP Configuration\r\n|"); - report.ShouldEndWith("\\"); - } - } -} \ No newline at end of file diff --git a/src/Maple.Test/DynamicDictionaryTests.cs b/src/Maple.Test/DynamicDictionaryTests.cs deleted file mode 100644 index ac76e9a..0000000 --- a/src/Maple.Test/DynamicDictionaryTests.cs +++ /dev/null @@ -1,267 +0,0 @@ -using System; -using System.Collections.Generic; -using Maple.Core; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Shouldly; - -namespace Maple.Test -{ - [TestClass] - public sealed class DynamicDictionaryTests - { - [TestMethod] - public void When_testing_as_concrete_type() - { - var dic = new DynamicDictionary(); - dic.Count.ShouldBe(0); - - dic["A"] = "A"; - dic["B"] = "B"; - dic["C"] = "C"; - dic["D"] = 1; - - dic.Count.ShouldBe(4); - dic["A"].ShouldBe("A"); - dic["a"].ShouldBe("A"); - dic["B"].ShouldBe("B"); - dic["b"].ShouldBe("B"); - dic["C"].ShouldBe("C"); - dic["c"].ShouldBe("C"); - dic["D"].ShouldBe(1); - dic["d"].ShouldBe(1); - - dic.Keys.ShouldBe(new[] { "A", "B", "C", "D" }); - dic.Values.ShouldBe(new object[] { "A", "B", "C", 1 }); - - dic["non-existent"].ShouldBeNull(); - } - - [TestMethod] - public void When_testing_as_dynamic_type() - { - dynamic dic = new DynamicDictionary(); - ((int)dic.Count).ShouldBe(0); - - dic["A"] = "A"; - dic["B"] = "B"; - dic["C"] = "C"; - dic["D"] = 1; - -#pragma warning disable IDE0039 // Use local function - Func someFunc = () => 1234; -#pragma warning restore IDE0039 // Use local function - dic.action = someFunc; - - ((int)dic.Count).ShouldBe(5); - ((string)dic["A"]).ShouldBe("A"); - ((string)dic["a"]).ShouldBe("A"); - ((string)dic["B"]).ShouldBe("B"); - ((string)dic["b"]).ShouldBe("B"); - ((string)dic["C"]).ShouldBe("C"); - ((string)dic["c"]).ShouldBe("C"); - ((int)dic["D"]).ShouldBe(1); - ((int)dic["d"]).ShouldBe(1); - - ((int)dic.action()).ShouldBe(1234); - ((int)dic.ACTION()).ShouldBe(1234); - - ((string)dic.A).ShouldBe("A"); - ((string)dic.a).ShouldBe("A"); - ((int)dic.D).ShouldBe(1); - ((int)dic.d).ShouldBe(1); - - ((ICollection)dic.Keys).ShouldBe(new[] { "A", "B", "C", "D", "action" }); - ((ICollection)dic.Values).ShouldBe(new object[] { "A", "B", "C", 1, someFunc }); - - ((string)dic["non-existent"]).ShouldBeNull(); - - dic.foo = "foo"; - ((string)dic["foo"]).ShouldBe("foo"); - ((string)dic["Foo"]).ShouldBe("foo"); - } - - [TestMethod] - public void When_testing_case_sensitivity() - { - var caseSensetiveDic = new DynamicDictionary(false) - { - ["A"] = 1, - ["Id"] = 66 - }; - - caseSensetiveDic["A"].ShouldBe(1); - caseSensetiveDic["Id"].ShouldBe(66); - - caseSensetiveDic["a"].ShouldBeNull(); - caseSensetiveDic["ID"].ShouldBeNull(); - caseSensetiveDic["iD"].ShouldBeNull(); - - dynamic dynCaseSensetiveDic = caseSensetiveDic; - dynCaseSensetiveDic.A = "sample"; - ((string)dynCaseSensetiveDic.A).ShouldBe("sample"); - ((int)dynCaseSensetiveDic.Id).ShouldBe(66); - - ((string)dynCaseSensetiveDic.a).ShouldBeNull(); - ((string)dynCaseSensetiveDic.ID).ShouldBeNull(); - - var caseInSensetiveDic = new DynamicDictionary() - { - ["A"] = 1, - ["Id"] = 66 - }; - - caseInSensetiveDic["A"].ShouldBe(1); - caseInSensetiveDic["Id"].ShouldBe(66); - - caseInSensetiveDic["a"].ShouldBe(1); - caseInSensetiveDic["ID"].ShouldBe(66); - caseInSensetiveDic["iD"].ShouldBe(66); - - dynamic dynCaseInSensetiveDic = caseInSensetiveDic; - dynCaseInSensetiveDic.A = "sample"; - ((string)dynCaseInSensetiveDic.A).ShouldBe("sample"); - ((string)dynCaseInSensetiveDic.a).ShouldBe("sample"); - - ((int)dynCaseInSensetiveDic.Id).ShouldBe(66); - ((int)dynCaseInSensetiveDic.ID).ShouldBe(66); - ((int)dynCaseInSensetiveDic.id).ShouldBe(66); - } - - [TestMethod] - public void When_enumerating_as_dynamic() - { - dynamic dic = new DynamicDictionary(); - ((int)dic.Count).ShouldBe(0); - - dic["A"] = "1"; - dic["B"] = "2"; - dic["C"] = "3"; - dic["D"] = 66; - - foreach (KeyValuePair pair in dic) - { - pair.Key.ShouldBeOfType(); - - if (pair.Key == "A") - { - pair.Value.ShouldBeOfType(); - pair.Value.ShouldBe("1"); - } - - if (pair.Key == "B") - { - pair.Value.ShouldBeOfType(); - pair.Value.ShouldBe("2"); - } - - if (pair.Key == "C") - { - pair.Value.ShouldBeOfType(); - pair.Value.ShouldBe("3"); - } - - if (pair.Key == "D") - { - pair.Value.ShouldBeOfType(); - pair.Value.ShouldBe(66); - } - } - } - - [TestMethod] - public void When_enumerating_as_original_type() - { - var dic = new DynamicDictionary(); - dic.Count.ShouldBe(0); - - dic["A"] = "1"; - dic["B"] = "2"; - dic["C"] = "3"; - dic["D"] = 66; - - foreach (var pair in dic) - { - pair.Key.ShouldBeOfType(); - - if (pair.Key == "A") - { - pair.Value.ShouldBeOfType(); - pair.Value.ShouldBe("1"); - } - - if (pair.Key == "B") - { - pair.Value.ShouldBeOfType(); - pair.Value.ShouldBe("2"); - } - - if (pair.Key == "C") - { - pair.Value.ShouldBeOfType(); - pair.Value.ShouldBe("3"); - } - - if (pair.Key == "D") - { - pair.Value.ShouldBeOfType(); - pair.Value.ShouldBe(66); - } - } - } - - [TestMethod] - public void When_getting_a_model_as_dynamic_dictionary() - { - var model = new Child { Name = "Foo", Age = 10 }; - var dicWithInherittedProp = model.ToDynamic(); - - dicWithInherittedProp.ShouldNotBeNull(); - dicWithInherittedProp.Count.ShouldBe(3); - dicWithInherittedProp["OriginalName"].ShouldBe("PaPa"); - dicWithInherittedProp["Name"].ShouldBe("Foo"); - dicWithInherittedProp["Age"].ShouldBe(10); - - var dicWithDeclaredProp = model.ToDynamic(false); - - dicWithDeclaredProp.ShouldNotBeNull(); - dicWithDeclaredProp.Count.ShouldBe(2); - dicWithDeclaredProp["OriginalName"].ShouldBeNull(); - dicWithDeclaredProp["Name"].ShouldBe("Foo"); - dicWithDeclaredProp["Age"].ShouldBe(10); - } - - [TestMethod] - public void When_getting_a_model_as_dynamic() - { - var model = new Child { Name = "Foo", Age = 10 }; - dynamic dicWithInherittedProp = model.ToDynamic(); - - ((DynamicDictionary)dicWithInherittedProp).ShouldNotBeNull(); - ((DynamicDictionary)dicWithInherittedProp).Count.ShouldBe(3); - - ((string)dicWithInherittedProp["OriginalName"]).ShouldBe("PaPa"); - ((string)dicWithInherittedProp["Name"]).ShouldBe("Foo"); - ((int)dicWithInherittedProp["Age"]).ShouldBe(10); - - dynamic dicWithDeclaredProp = model.ToDynamic(false); - - ((DynamicDictionary)dicWithDeclaredProp).ShouldNotBeNull(); - ((DynamicDictionary)dicWithDeclaredProp).Count.ShouldBe(2); - - ((string)dicWithDeclaredProp["OriginalName"]).ShouldBeNull(); - ((string)dicWithDeclaredProp["Name"]).ShouldBe("Foo"); - ((int)dicWithDeclaredProp["Age"]).ShouldBe(10); - } - - private class Base - { - public string OriginalName => "PaPa"; - } - - private sealed class Child : Base - { - public string Name { get; set; } - public int Age { get; set; } - } - } -} diff --git a/src/Maple.Test/Maple.Test.csproj b/src/Maple.Test/Maple.Test.csproj index eb633d0..8ed122e 100644 --- a/src/Maple.Test/Maple.Test.csproj +++ b/src/Maple.Test/Maple.Test.csproj @@ -48,7 +48,6 @@ Properties\SharedAssemblyInfo.cs - @@ -59,7 +58,6 @@ - @@ -112,7 +110,7 @@ - 2.12.5 + 2.12.6 1.2.0 @@ -126,6 +124,9 @@ 2.8.3 + + 7.1.0.5212 + diff --git a/src/Maple.Test/TestUtils/ContainerContextExtensions.cs b/src/Maple.Test/TestUtils/ContainerContextExtensions.cs index 283d43c..4ac9339 100644 --- a/src/Maple.Test/TestUtils/ContainerContextExtensions.cs +++ b/src/Maple.Test/TestUtils/ContainerContextExtensions.cs @@ -1,12 +1,23 @@ using DryIoc; + using Maple.Core; +using Maple.Data; using Maple.Domain; + using NSubstitute; namespace Maple.Test { public static class ContainerContextExtensions { + public static IContainer ConfigureForTesting(this IContainer container) + { + container.UseInstance(CreatePlaybackDeviceFactory()); + container.UseInstance(CreateWavePlayerFactory()); + + return container; + } + public static Playlists CreatePlaylists(this IContainer container) { return new Playlists(container.CreateViewModelServiceContainer(), container.Resolve(), () => container.Resolve()); @@ -29,6 +40,36 @@ public static MediaItem CreateMediaItem(this IContainer container, MediaItemMode return mapper.Get(model); } + public static IPlaybackDeviceFactory CreatePlaybackDeviceFactory() + { + var factory = Substitute.For(); + + factory.GetAudioDevices(default(ILoggingService)).ReturnsForAnyArgs( + new[] + { + new AudioDevice() + { + Channels= 2, + IsSelected = true, + Name = "TestDevice", + Sequence = 1, + } + }); + + return factory; + } + + // should not be used as default replacement in the container, since some tests rely on the messenger relaying message in the class to be tested + public static IMessenger CreateMessenger() + { + return Substitute.For(); + } + + public static IWavePlayerFactory CreateWavePlayerFactory() + { + return Substitute.For(); + } + public static ISequenceService CreateSequenceService() { return Substitute.For(); @@ -54,7 +95,7 @@ public static IDialogViewModel CreateDialogViewModel() return Substitute.For(); } - public static IMediaRepository CreateRepository() + public static MapleRepository CreateRepository() { return Substitute.For(); } diff --git a/src/Maple.Test/ViewModels/Playlists/PlaylistTests.cs b/src/Maple.Test/ViewModels/Playlists/PlaylistTests.cs index cd433c5..94439bd 100644 --- a/src/Maple.Test/ViewModels/Playlists/PlaylistTests.cs +++ b/src/Maple.Test/ViewModels/Playlists/PlaylistTests.cs @@ -31,11 +31,10 @@ public static void ClassInitialize(TestContext context) public async Task Playlist_ShouldRunConstructorWithoutErrors() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var model = _context.CreateModelPlaylist(); var playlist = container.CreatePlaylist(model); - Assert.AreEqual(_context.FullyQualifiedTestClassName, playlist.CreatedBy); - Assert.AreEqual(_context.FullyQualifiedTestClassName, playlist.UpdatedBy); Assert.AreEqual(4, playlist.Count); Assert.AreEqual($"Description for {_context.FullyQualifiedTestClassName} Playlist", playlist.Description); Assert.AreEqual(false, playlist.HasErrors); @@ -67,6 +66,7 @@ public async Task Playlist_ShouldRunConstructorWithoutErrors() public async Task Playlist_ShouldThrowForEmptyModel() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); Assert.ThrowsException(() => container.CreatePlaylist(default(PlaylistModel))); } @@ -74,6 +74,7 @@ public async Task Playlist_ShouldThrowForEmptyModel() public async Task Playlist_ShouldThrowForEmptyContainer() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); Assert.ThrowsException(() => new Playlist(null, container.Resolve>(), container.Resolve(), container.Resolve(), _context.CreateModelPlaylist())); } @@ -81,6 +82,7 @@ public async Task Playlist_ShouldThrowForEmptyContainer() public async Task Playlist_ShouldThrowForEmptyValidator() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); Assert.ThrowsException(() => new Playlist(container.Resolve(), null, container.Resolve(), container.Resolve(), _context.CreateModelPlaylist())); } @@ -88,6 +90,7 @@ public async Task Playlist_ShouldThrowForEmptyValidator() public async Task Playlist_ShouldThrowForEmptyViewModel() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); Assert.ThrowsException(() => new Playlist(container.Resolve(), container.Resolve>(), null, container.Resolve(), _context.CreateModelPlaylist())); } @@ -95,6 +98,7 @@ public async Task Playlist_ShouldThrowForEmptyViewModel() public async Task Playlist_ShouldThrowForEmptyMediaItemMapper() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); Assert.ThrowsException(() => new Playlist(container.Resolve(), container.Resolve>(), container.Resolve(), null, _context.CreateModelPlaylist())); } @@ -102,6 +106,7 @@ public async Task Playlist_ShouldThrowForEmptyMediaItemMapper() public async Task Playlist_ShouldRunClear() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var playlist = container.CreatePlaylist(_context.CreateModelPlaylist()); Assert.AreEqual(4, playlist.Count); @@ -115,6 +120,7 @@ public async Task Playlist_ShouldRunClear() public async Task Playlist_ShouldAdd() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var mediaItem = container.CreateMediaItem(_context.CreateModelMediaItem()); var playlist = container.CreatePlaylist(_context.CreateModelPlaylist()); @@ -129,6 +135,7 @@ public async Task Playlist_ShouldAdd() public async Task Playlist_ShouldThrowAddForNull() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var playlist = container.CreatePlaylist(_context.CreateModelPlaylist()); Assert.ThrowsException(() => playlist.Add(null)); @@ -138,6 +145,7 @@ public async Task Playlist_ShouldThrowAddForNull() public async Task Playlist_ShouldAddRange() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var mediaItems = new[] { container.CreateMediaItem(_context.CreateModelMediaItem()), @@ -157,6 +165,7 @@ public async Task Playlist_ShouldAddRange() public async Task Playlist_ShouldHandleAddRangeForEmptyCollection() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var mediaItems = new List(); var playlist = container.CreatePlaylist(_context.CreateModelPlaylist()); @@ -171,6 +180,7 @@ public async Task Playlist_ShouldHandleAddRangeForEmptyCollection() public async Task Playlist_ShouldThrowAddRangeForNull() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var playlist = container.CreatePlaylist(_context.CreateModelPlaylist()); Assert.AreEqual(4, playlist.Count); @@ -182,6 +192,7 @@ public async Task Playlist_ShouldThrowAddRangeForNull() public async Task Playlist_ShouldHandleAddRangeForDuplicateEntries() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var mediaItem = container.CreateMediaItem(_context.CreateModelMediaItem()); var mediaItems = new[] { @@ -202,6 +213,7 @@ public async Task Playlist_ShouldHandleAddRangeForDuplicateEntries() public async Task Playlist_ShouldRemove() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var playlist = container.CreatePlaylist(_context.CreateModelPlaylist()); Assert.AreEqual(4, playlist.Count); @@ -215,6 +227,7 @@ public async Task Playlist_ShouldRemove() public async Task Playlist_ShouldThrowRemoveForNull() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var playlist = container.CreatePlaylist(_context.CreateModelPlaylist()); Assert.ThrowsException(() => playlist.Remove(null)); @@ -224,6 +237,7 @@ public async Task Playlist_ShouldThrowRemoveForNull() public async Task Playlist_ShouldRemoveRange() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var playlist = container.CreatePlaylist(_context.CreateModelPlaylist()); var mediaItems = new[] { @@ -243,6 +257,7 @@ public async Task Playlist_ShouldRemoveRange() public async Task Playlist_ShouldThrowRemoveRangeForNull() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var playlist = container.CreatePlaylist(_context.CreateModelPlaylist()); Assert.ThrowsException(() => playlist.RemoveRange(null)); @@ -252,6 +267,7 @@ public async Task Playlist_ShouldThrowRemoveRangeForNull() public async Task Playlist_ShouldHandleRemoveRangeForSameItem() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var playlist = container.CreatePlaylist(_context.CreateModelPlaylist()); var mediaItems = new[] { @@ -271,6 +287,7 @@ public async Task Playlist_ShouldHandleRemoveRangeForSameItem() public async Task Playlist_ShouldHandleRemoveRangeForUnknownItem() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var playlist = container.CreatePlaylist(_context.CreateModelPlaylist()); var mediaItems = new List() { @@ -288,6 +305,7 @@ public async Task Playlist_ShouldHandleRemoveRangeForUnknownItem() public async Task Playlist_ShouldHandleRemoveRangeForUnknownItems() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var playlist = container.CreatePlaylist(_context.CreateModelPlaylist()); var mediaItems = new[] { @@ -307,6 +325,7 @@ public async Task Playlist_ShouldHandleRemoveRangeForUnknownItems() public async Task Playlist_ShouldHandleRemoveRangeForEmptyCollection() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var playlist = container.CreatePlaylist(_context.CreateModelPlaylist()); var mediaItems = new List(); @@ -321,6 +340,7 @@ public async Task Playlist_ShouldHandleRemoveRangeForEmptyCollection() public async Task Playlist_ShouldRunNext() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var playlist = container.CreatePlaylist(_context.CreateModelPlaylist()); playlist.RepeatMode = RepeatMode.None; var mediaItem = playlist.Next(); @@ -334,6 +354,7 @@ public async Task Playlist_ShouldRunNext() public async Task Playlist_ShouldRunNextWithRepeatModeNone() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var playlist = container.CreatePlaylist(_context.CreateModelPlaylist()); playlist.RepeatMode = RepeatMode.None; playlist.SelectedItem = playlist[3]; @@ -347,6 +368,7 @@ public async Task Playlist_ShouldRunNextWithRepeatModeNone() public async Task Playlist_ShouldRunNextWithRepeatModeAll() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var playlist = container.CreatePlaylist(_context.CreateModelPlaylist()); playlist.RepeatMode = RepeatMode.All; playlist.SelectedItem = playlist[3]; @@ -361,6 +383,7 @@ public async Task Playlist_ShouldRunNextWithRepeatModeAll() public async Task Playlist_ShouldRunNextWithRepeatModeAllWhileShuffeling() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var playlist = container.CreatePlaylist(_context.CreateModelPlaylist()); playlist.RepeatMode = RepeatMode.All; playlist.IsShuffeling = true; @@ -376,6 +399,7 @@ public async Task Playlist_ShouldRunNextWithRepeatModeAllWhileShuffeling() public async Task Playlist_ShouldRunNextWithRepeatModeNoneWhileShuffeling() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var playlist = container.CreatePlaylist(_context.CreateModelPlaylist()); playlist.RepeatMode = RepeatMode.None; playlist.IsShuffeling = true; @@ -391,6 +415,7 @@ public async Task Playlist_ShouldRunNextWithRepeatModeNoneWhileShuffeling() public async Task Playlist_ShouldRunNextWithRepeatModeSingleWhileShuffeling() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var playlist = container.CreatePlaylist(_context.CreateModelPlaylist()); playlist.RepeatMode = RepeatMode.Single; playlist.IsShuffeling = true; @@ -406,6 +431,7 @@ public async Task Playlist_ShouldRunNextWithRepeatModeSingleWhileShuffeling() public async Task Playlist_ShouldRunNextWithRepeatModeSingle() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var playlist = container.CreatePlaylist(_context.CreateModelPlaylist()); playlist.RepeatMode = RepeatMode.Single; @@ -420,6 +446,7 @@ public async Task Playlist_ShouldRunNextWithRepeatModeSingle() public async Task Playlist_ShouldRunPrevious() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var playlist = container.CreatePlaylist(_context.CreateModelPlaylist()); var messenger = container.Resolve(); @@ -455,6 +482,7 @@ public async Task Playlist_ShouldRunPrevious() public async Task Playlist_ShouldRaiseSelectionChanging() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var messenger = Substitute.For(); container.UseInstance(typeof(IMessenger), messenger, IfAlreadyRegistered: IfAlreadyRegistered.Replace); @@ -472,6 +500,7 @@ public async Task Playlist_ShouldRaiseSelectionChanging() public async Task Playlist_ShouldRaiseSelectionChanged() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var messenger = Substitute.For(); container.UseInstance(typeof(IMessenger), messenger, IfAlreadyRegistered: IfAlreadyRegistered.Replace); @@ -489,6 +518,7 @@ public async Task Playlist_ShouldRaiseSelectionChanged() public async Task Playlist_ShouldSynchronizeItemsWithModelWhenRemovingSelectedItem() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var model = _context.CreateModelPlaylist(); var playlist = container.CreatePlaylist(model); var selectedModel = playlist.SelectedItem.Model; @@ -507,6 +537,7 @@ public async Task Playlist_ShouldSynchronizeItemsWithModelWhenRemovingSelectedIt public async Task Playlist_ShouldSynchronizeItemsWithModelWhenRemoving() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var model = _context.CreateModelPlaylist(); var playlist = container.CreatePlaylist(model); var mediaItem1 = playlist[1]; @@ -532,6 +563,7 @@ public async Task Playlist_ShouldAddItemsFromFileDialog() { var tokenSource = new CancellationTokenSource(1000); var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var mediaItems = new[] { container.CreateMediaItem(new MediaItemModel()), @@ -558,6 +590,7 @@ public async Task Playlist_ShouldAddItemsFromFolderDialog() { var tokenSource = new CancellationTokenSource(1000); var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var mediaItems = new[] { container.CreateMediaItem(new MediaItemModel()), @@ -584,6 +617,7 @@ public async Task Playlist_ShouldAddItemsFromUrlDialog() { var tokenSource = new CancellationTokenSource(1000); var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var mediaItems = new[] { container.CreateMediaItem(new MediaItemModel()), diff --git a/src/Maple.Test/ViewModels/Playlists/PlaylistsTests.cs b/src/Maple.Test/ViewModels/Playlists/PlaylistsTests.cs index f887c96..0f8bd7e 100644 --- a/src/Maple.Test/ViewModels/Playlists/PlaylistsTests.cs +++ b/src/Maple.Test/ViewModels/Playlists/PlaylistsTests.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Threading.Tasks; using DryIoc; +using Maple.Core; using Maple.Domain; using Microsoft.VisualStudio.TestTools.UnitTesting; using NSubstitute; @@ -23,6 +24,7 @@ public static void ClassInitialize(TestContext context) public async Task Playlists_ShouldRunConstructorWithErrors() { var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); + container = container.ConfigureForTesting(); var playlists = container.CreatePlaylists(); @@ -49,6 +51,7 @@ public async Task Playlists_ShouldAdd() var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); var sequenceProvider = ContainerContextExtensions.CreateSequenceService(); sequenceProvider.Get(default(List)).ReturnsForAnyArgs(5); + container = container.ConfigureForTesting(); container.UseInstance(sequenceProvider); var playlists = (Playlists)container.Resolve(); @@ -70,6 +73,7 @@ public async Task Playlists_ShouldAddWithExplicitValue() var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); var sequenceProvider = ContainerContextExtensions.CreateSequenceService(); sequenceProvider.Get(default(List)).ReturnsForAnyArgs(5); + container = container.ConfigureForTesting(); container.UseInstance(sequenceProvider); var playlist = container.CreatePlaylist(_context.CreateModelPlaylist()); @@ -93,14 +97,15 @@ public async Task Playlists_ShouldSave() var container = await DependencyInjectionFactory.Get().ConfigureAwait(false); var repository = ContainerContextExtensions.CreateRepository(); + container = container.ConfigureForTesting(); container.UseInstance(repository); var playlists = container.Resolve(); repository.ClearReceivedCalls(); - playlists.Save(); + await playlists.SaveAsync().ConfigureAwait(false); - repository.Received(1).Save(NSubstitute.Arg.Any()); + await repository.Received(1).SaveAsync(NSubstitute.Arg.Any()).ConfigureAwait(false); repository.Received(1).Dispose(); } @@ -114,12 +119,13 @@ public async Task Playlists_ShouldLoad() }; var repository = ContainerContextExtensions.CreateRepository(); repository.GetPlaylistsAsync().ReturnsForAnyArgs(dummyPlaylists); + container = container.ConfigureForTesting(); container.UseInstance(repository); var playlists = (Playlists)container.Resolve(); repository.ClearReceivedCalls(); - await playlists.LoadAsync().ConfigureAwait(false); + await playlists.GetCountAsync().ConfigureAwait(false); await repository.Received(1).GetPlaylistsAsync().ConfigureAwait(false); repository.Received(1).Dispose(); diff --git a/src/Maple.Youtube/Maple.Youtube.csproj b/src/Maple.Youtube/Maple.Youtube.csproj index 7343835..3fad06a 100644 --- a/src/Maple.Youtube/Maple.Youtube.csproj +++ b/src/Maple.Youtube/Maple.Youtube.csproj @@ -34,9 +34,15 @@ - 1.31.1.1063 + 1.33.0.1215 + + + + 7.1.0.5212 + + + 0.10.11 - @@ -56,6 +62,7 @@ + @@ -68,10 +75,6 @@ - - {21fa5854-0692-42e2-924e-a38cf3c7ff71} - Maple.Core - {9d7d05a6-8271-4836-a7bb-5b2abeccbd81} Maple.Domain diff --git a/src/Maple.Core/Services/MrlExtractionService.cs b/src/Maple.Youtube/MrlExtractionService.cs similarity index 100% rename from src/Maple.Core/Services/MrlExtractionService.cs rename to src/Maple.Youtube/MrlExtractionService.cs diff --git a/src/Maple.Youtube/YoutubeApi.cs b/src/Maple.Youtube/YoutubeApi.cs index 09b9b9b..a900048 100644 --- a/src/Maple.Youtube/YoutubeApi.cs +++ b/src/Maple.Youtube/YoutubeApi.cs @@ -5,11 +5,13 @@ using System.Threading.Tasks; using System.Web; using System.Xml; + using Google.Apis.Auth.OAuth2; using Google.Apis.Services; using Google.Apis.Util.Store; using Google.Apis.YouTube.v3; using Google.Apis.YouTube.v3.Data; + using Maple.Domain; using Maple.Localization.Properties; @@ -17,17 +19,17 @@ namespace Maple.Youtube { public class YoutubeApi : IYoutubeApi { +#pragma warning disable S1075 // URIs should not be hardcoded private const string _videoBaseUrl = @"https://www.youtube.com/watch?v="; private const string _playListBaseUrl = @"https://www.youtube.com/playlist?list="; +#pragma warning restore S1075 // URIs should not be hardcoded private volatile YouTubeService _service; private readonly ILoggingService _log; - private readonly object _syncRoot; public YoutubeApi(ILoggingService log) { _log = log ?? throw new ArgumentNullException(nameof(log), $"{nameof(log)} {Resources.IsRequired}"); - _syncRoot = new object(); } private async Task GetService() @@ -109,7 +111,7 @@ public async Task CreatePlaylist(PlaylistModel playlist, bool publicPlaylist = t }, Status = new PlaylistStatus { - PrivacyStatus = publicPlaylist == true ? "public" : "private" + PrivacyStatus = publicPlaylist ? "public" : "private" } }; newPlaylist = await youtubeService.Playlists.Insert(newPlaylist, "snippet,status") @@ -129,7 +131,7 @@ public async Task CreatePlaylist(PlaylistModel playlist, bool publicPlaylist = t }; newVideo.Snippet.ResourceId.Kind = "youtube#video"; newVideo.Snippet.ResourceId.VideoId = GetVideoId(item); - newVideo = await youtubeService.PlaylistItems.Insert(newVideo, "snippet") + await youtubeService.PlaylistItems.Insert(newVideo, "snippet") .ExecuteAsync() .ConfigureAwait(false); } diff --git a/src/Maple/App.xaml.cs b/src/Maple/App.xaml.cs index 2854ef7..59fd81a 100644 --- a/src/Maple/App.xaml.cs +++ b/src/Maple/App.xaml.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using System.Linq; using System.Net; using System.Threading; using System.Threading.Tasks; @@ -54,7 +55,7 @@ private async void App_DispatcherUnhandledException(object sender, DispatcherUnh protected override void OnExit(ExitEventArgs e) { - SaveState(); + SaveState().Wait(); DisposeResources(); _backgroundUpdate.Wait(); @@ -158,22 +159,14 @@ private async Task LoadUpdates(ILoggingService log) private IList LoadApplicationData() { - var tasks = new List(); - - foreach (var item in _container.Resolve>()) - tasks.Add(item.LoadAsync()); - - return tasks; + //return new List((_container.Resolve>()).ToArray().Select(p => p.GetCountAsync())); } - private void SaveState() + private async Task SaveState() { var log = _container.Resolve(); log.Info(Localization.Properties.Resources.SavingState); - foreach (var item in _container.Resolve>()) - item.Save(); - log.Info(Localization.Properties.Resources.SavedState); } diff --git a/src/Maple/Utils/DependencyInjectionFactory.cs b/src/Maple/DependencyInjectionFactory.cs similarity index 86% rename from src/Maple/Utils/DependencyInjectionFactory.cs rename to src/Maple/DependencyInjectionFactory.cs index b0c7e3e..22ea503 100644 --- a/src/Maple/Utils/DependencyInjectionFactory.cs +++ b/src/Maple/DependencyInjectionFactory.cs @@ -1,6 +1,9 @@ using System.Threading.Tasks; + using DryIoc; + using FluentValidation; + using Maple.Core; using Maple.Data; using Maple.Domain; @@ -27,9 +30,6 @@ IContainer InitializeContainer() c.Resolve().LoadAsync(); - //if (Debugger.IsAttached) - // Debugging(); - return c; } @@ -68,14 +68,11 @@ void RegisterServices() { c.Register(setup: Setup.With(allowDisposableTransient: true)); c.Register(Reuse.Singleton); - c.Register(Reuse.Singleton, setup: Setup.With(allowDisposableTransient: true)); + c.Register(Reuse.Singleton, setup: Setup.With(allowDisposableTransient: true)); + c.Register(Reuse.Singleton); c.Register(Reuse.Singleton); - c.Register(Reuse.Transient, setup: Setup.With(allowDisposableTransient: true)); - - c.Register(Reuse.Singleton); - c.Register(Reuse.Singleton); - c.Register(Reuse.Singleton); + c.Register(Reuse.Transient, setup: Setup.With(allowDisposableTransient: true)); c.Register(); c.Register(); @@ -92,8 +89,7 @@ void RegisterServices() c.Register(Reuse.Singleton); c.Register(Reuse.Singleton); - c.Register(setup: Setup.DecoratorWith(order: 1)); - c.Register(setup: Setup.DecoratorWith(order: 2)); + c.Register(setup: Setup.DecoratorWith(order: 1)); } void RegisterValidation() diff --git a/src/Maple/Interfaces/IBaseMapper.cs b/src/Maple/Interfaces/IBaseMapper.cs deleted file mode 100644 index 6288c78..0000000 --- a/src/Maple/Interfaces/IBaseMapper.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Maple.Core; -using Maple.Domain; - -namespace Maple -{ - public interface IBaseMapper - where TVieModel : BaseDataViewModel - where TDataModel : class, IBaseObject - { - TVieModel Get(TDataModel model); - - TDataModel GetData(TVieModel viewModel); - } -} diff --git a/src/Maple/Interfaces/IMediaRepository.cs b/src/Maple/Interfaces/IMediaRepository.cs deleted file mode 100644 index 5eb7ffa..0000000 --- a/src/Maple/Interfaces/IMediaRepository.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace Maple -{ - public interface IMediaRepository : IDisposable - { - bool IsBusy { get; } - - void Save(MediaItem viewModel); - void Save(MediaItems viewModel); - Task GetMediaItemByIdAsync(int id); - Task> GetMediaItemsAsync(); - Task GetMediaItemByPlaylistIdAsync(int id); - - - void Save(Playlist viewModel); - void Save(Playlists viewModel); - Task GetPlaylistByIdAsync(int id); - Task> GetPlaylistsAsync(); - - void Save(MediaPlayer viewModel); - void Save(MediaPlayers viewModel); - Task GetMainMediaPlayerAsync(); - Task GetMediaPlayerByIdAsync(int id); - Task> GetAllOptionalMediaPlayersAsync(); - } -} \ No newline at end of file diff --git a/src/Maple/Maple.csproj b/src/Maple/Maple.csproj index c6b270b..6c35a79 100644 --- a/src/Maple/Maple.csproj +++ b/src/Maple/Maple.csproj @@ -60,36 +60,24 @@ ..\Resources\Images\logo.ico - - 2.12.5 + 2.12.6 - - - + - - 2.2.0 - - - 2.2.0 - - + - + + 7.1.0.5212 + 1.7.8 - - - - - @@ -120,12 +108,17 @@ Properties\SharedAssemblyInfo.cs - - - - - - + + + + + + + + + + + @@ -146,8 +139,6 @@ - - SplashScreen.xaml @@ -156,53 +147,12 @@ - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - MediaPlayerPage.xaml @@ -215,17 +165,10 @@ ColorOptionsPage.xaml - - - - - - - - - - - + + MSBuild:Compile + Designer + Designer MSBuild:Compile @@ -254,10 +197,6 @@ Designer MSBuild:Compile - - Designer - MSBuild:Compile - MSBuild:Compile Designer @@ -293,7 +232,7 @@ ResXFileCodeGenerator Resources.Designer.cs - + Resources\client_secret.json PreserveNewest @@ -315,16 +254,6 @@ false - - - Resources\logo.ico - - - - - Resources\logo_withoutbackground.png - - @@ -351,10 +280,16 @@ - + Resources\Art_Of_Escapism_-_Universe_Words.mp3 PreserveNewest + + Resources\logo_withoutbackground.png + + + Resources\logo.ico + diff --git a/src/Maple/Properties/AssemblyInfo.cs b/src/Maple/Properties/AssemblyInfo.cs index 09980fb..277b25e 100644 --- a/src/Maple/Properties/AssemblyInfo.cs +++ b/src/Maple/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ -using System.Runtime.InteropServices; -using System.Reflection; +using System.Reflection; using System.Windows; [assembly: AssemblyTitle("Maple")] diff --git a/src/Maple/Resources/Style.xaml b/src/Maple/Resources/Style.xaml index 2c2b839..a8578a7 100644 --- a/src/Maple/Resources/Style.xaml +++ b/src/Maple/Resources/Style.xaml @@ -966,7 +966,7 @@ - + @@ -986,7 +986,7 @@ - + @@ -1006,18 +1006,18 @@ - + - + - + - + @@ -1109,7 +1109,7 @@ - + @@ -1153,7 +1153,7 @@ - + @@ -1193,14 +1193,14 @@ - + - + diff --git a/src/Maple/Services/MediaRepository.cs b/src/Maple/Services/MediaRepository.cs deleted file mode 100644 index 1a7504a..0000000 --- a/src/Maple/Services/MediaRepository.cs +++ /dev/null @@ -1,208 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Threading.Tasks; -using Maple.Core; -using Maple.Data; -using Maple.Localization.Properties; - -namespace Maple -{ - // helpful: https://blog.oneunicorn.com/2012/03/10/secrets-of-detectchanges-part-1-what-does-detectchanges-do/ - /// - /// Provides a way to access all playback related data on the DAL - /// - /// - public class MediaRepository : IMediaRepository - { - private const int _saveThreshold = 100; - - private readonly IMediaItemRepository _mediaItemRepository; - private readonly IMediaPlayerRepository _mediaPlayerRepository; - private readonly IPlaylistRepository _playlistRepository; - - private readonly IPlaylistMapper _playlistMapper; - private readonly IMediaPlayerMapper _mediaPlayerMapper; - private readonly IMediaItemMapper _mediaItemMapper; - - private readonly BusyStack _busyStack; - - private bool _disposed = false; - - public bool IsBusy { get; private set; } - - public MediaRepository(IPlaylistMapper playlistMapper, - IMediaItemMapper mediaItemMapper, - IMediaPlayerMapper mediaPlayerMapper, - IMediaItemRepository mediaItemRepository, - IMediaPlayerRepository mediaPlayerRepository, - IPlaylistRepository playlistRepository) - { - _mediaItemMapper = mediaItemMapper ?? throw new ArgumentNullException(nameof(mediaItemMapper), $"{nameof(mediaItemMapper)} {Resources.IsRequired}"); - _playlistMapper = playlistMapper ?? throw new ArgumentNullException(nameof(playlistMapper), $"{nameof(playlistMapper)} {Resources.IsRequired}"); - _mediaPlayerMapper = mediaPlayerMapper ?? throw new ArgumentNullException(nameof(mediaPlayerMapper), $"{nameof(mediaPlayerMapper)} {Resources.IsRequired}"); - - _mediaItemRepository = mediaItemRepository ?? throw new ArgumentNullException(nameof(mediaItemRepository), $"{nameof(mediaItemRepository)} {Resources.IsRequired}"); - _mediaPlayerRepository = mediaPlayerRepository ?? throw new ArgumentNullException(nameof(mediaPlayerRepository), $"{nameof(mediaPlayerRepository)} {Resources.IsRequired}"); - _playlistRepository = playlistRepository ?? throw new ArgumentNullException(nameof(playlistRepository), $"{nameof(playlistRepository)} {Resources.IsRequired}"); - - _busyStack = new BusyStack(); - _busyStack.OnChanged += (hasItems) => { IsBusy = hasItems; }; - } - - public void Save(MediaItem viewModel) - { - using (_busyStack.GetToken()) - _mediaItemRepository.Save(viewModel.Model); - } - - public void Save(MediaItems viewModel) - { - using (_busyStack.GetToken()) - { - foreach (var item in viewModel.Items) - Save(item); - } - } - - public async Task GetMediaItemByIdAsync(int id) - { - using (_busyStack.GetToken()) - { - var item = await _mediaItemRepository.GetByIdAsync(id) - .ConfigureAwait(true); - return _mediaItemMapper.Get(item); - } - } - - public async Task> GetMediaItemsAsync() - { - using (_busyStack.GetToken()) - { - var items = await _mediaItemRepository.GetAsync() - .ConfigureAwait(true); - return items.Select(p => _mediaItemMapper.Get(p)) - .ToList(); - } - } - - public async Task GetMediaItemByPlaylistIdAsync(int id) - { - using (_busyStack.GetToken()) - { - var item = await _mediaItemRepository.GetMediaItemByPlaylistIdAsync(id) - .ConfigureAwait(true); - return _mediaItemMapper.Get(item); - } - } - - public void Save(Playlist viewModel) - { - if (!viewModel.IsChanged) - return; - - using (_busyStack.GetToken()) - _playlistRepository.Save(viewModel.Model); - } - - public void Save(Playlists viewModel) - { - using (_busyStack.GetToken()) - { - foreach (var item in viewModel.Items) - Save(item); - } - } - - public async Task GetPlaylistByIdAsync(int id) - { - using (_busyStack.GetToken()) - { - var item = await _playlistRepository.GetByIdAsync(id) - .ConfigureAwait(true); - return _playlistMapper.Get(item); - } - } - - public async Task> GetPlaylistsAsync() - { - using (_busyStack.GetToken()) - { - var items = await _playlistRepository.GetAsync() - .ConfigureAwait(true); - return items.Select(p => _playlistMapper.Get(p)) - .ToList(); - } - } - - public void Save(MediaPlayer viewModel) - { - using (_busyStack.GetToken()) - _mediaPlayerRepository.Save(viewModel.Model); - } - - public void Save(MediaPlayers viewModel) - { - using (_busyStack.GetToken()) - { - foreach (var item in viewModel.Items) - Save(item); - } - } - - public async Task GetMainMediaPlayerAsync() - { - using (_busyStack.GetToken()) - { - var item = await _mediaPlayerRepository.GetMainMediaPlayerAsync() - .ConfigureAwait(true); - return _mediaPlayerMapper.GetMain(item, _playlistMapper.Get(item.Playlist)); - } - } - - public async Task GetMediaPlayerByIdAsync(int id) - { - using (_busyStack.GetToken()) - { - var item = await _mediaPlayerRepository.GetByIdAsync(id) - .ConfigureAwait(true); - return _mediaPlayerMapper.Get(item); - } - } - - public async Task> GetAllOptionalMediaPlayersAsync() - { - using (_busyStack.GetToken()) - { - var items = await _mediaPlayerRepository.GetOptionalMediaPlayersAsync() - .ConfigureAwait(true); - return items.Select(p => _mediaPlayerMapper.Get(p)) - .ToList(); - } - } - - [DebuggerStepThrough] - public void Dispose() - { - Dispose(true); - GC.SuppressFinalize(this); - } - - // Protected implementation of Dispose pattern. - protected virtual void Dispose(bool disposing) - { - if (_disposed) - return; - - if (disposing) - { - - // Free any other managed objects here. - } - - // Free any unmanaged objects here. - _disposed = true; - } - } -} diff --git a/src/Maple/Shell.xaml.cs b/src/Maple/Shell.xaml.cs index 5a1e6bc..a60acb0 100644 --- a/src/Maple/Shell.xaml.cs +++ b/src/Maple/Shell.xaml.cs @@ -1,6 +1,8 @@ using System; using System.Windows.Input; + using Maple.Core; +using Maple.Domain; namespace Maple { diff --git a/src/Maple/SplashScreen.xaml.cs b/src/Maple/SplashScreen.xaml.cs index b6793c2..ca1ce62 100644 --- a/src/Maple/SplashScreen.xaml.cs +++ b/src/Maple/SplashScreen.xaml.cs @@ -1,11 +1,14 @@ using System; + using Maple.Core; +using Maple.Domain; namespace Maple { public partial class SplashScreen : IoCWindow { - public SplashScreen(ILocalizationService manager, IMessenger messenger, ISplashScreenViewModel datacontext) : base(manager, messenger) + public SplashScreen(ILocalizationService manager, IMessenger messenger, ISplashScreenViewModel datacontext) + : base(manager, messenger) { DataContext = datacontext ?? throw new ArgumentNullException(nameof(datacontext), $"{nameof(datacontext)} {Localization.Properties.Resources.IsRequired}"); diff --git a/src/Maple/UI/Base/ConfigurableWindow.cs b/src/Maple/UI/Base/ConfigurableWindow.cs index 6fac2f1..ccf4a68 100644 --- a/src/Maple/UI/Base/ConfigurableWindow.cs +++ b/src/Maple/UI/Base/ConfigurableWindow.cs @@ -3,7 +3,6 @@ using System.Windows; using System.Windows.Threading; using MahApps.Metro.Controls; -using Maple.Core; namespace Maple { diff --git a/src/Maple/UI/Base/ConfigurableWindowSettings.cs b/src/Maple/UI/Base/ConfigurableWindowSettings.cs index 68a9497..5a352ce 100644 --- a/src/Maple/UI/Base/ConfigurableWindowSettings.cs +++ b/src/Maple/UI/Base/ConfigurableWindowSettings.cs @@ -1,6 +1,5 @@ using System.Configuration; using System.Windows; -using Maple.Core; namespace Maple { diff --git a/src/Maple.Core/Interfaces/IConfigurableWindowSettings.cs b/src/Maple/UI/Base/IConfigurableWindowSettings.cs similarity index 94% rename from src/Maple.Core/Interfaces/IConfigurableWindowSettings.cs rename to src/Maple/UI/Base/IConfigurableWindowSettings.cs index bf370d0..7242770 100644 --- a/src/Maple.Core/Interfaces/IConfigurableWindowSettings.cs +++ b/src/Maple/UI/Base/IConfigurableWindowSettings.cs @@ -1,10 +1,7 @@ using System.Windows; -namespace Maple.Core +namespace Maple { - /// - /// - /// public interface IConfigurableWindowSettings { /// diff --git a/src/Maple/UI/Base/IIocFrameworkElement.cs b/src/Maple/UI/Base/IIocFrameworkElement.cs new file mode 100644 index 0000000..bc2bef2 --- /dev/null +++ b/src/Maple/UI/Base/IIocFrameworkElement.cs @@ -0,0 +1,9 @@ +using Maple.Domain; + +namespace Maple.Core +{ + public interface IIocFrameworkElement + { + ILocalizationService TranslationManager { get; } + } +} diff --git a/src/Maple/UI/Base/IocUserControl.cs b/src/Maple/UI/Base/IocUserControl.cs index b32b157..96a02d4 100644 --- a/src/Maple/UI/Base/IocUserControl.cs +++ b/src/Maple/UI/Base/IocUserControl.cs @@ -1,6 +1,8 @@ using System.Diagnostics; using System.Windows.Controls; + using Maple.Core; +using Maple.Domain; namespace Maple { diff --git a/src/Maple/UI/Base/SharedResourceDictionary.cs b/src/Maple/UI/Base/SharedResourceDictionary.cs index b4b8e84..29a4358 100644 --- a/src/Maple/UI/Base/SharedResourceDictionary.cs +++ b/src/Maple/UI/Base/SharedResourceDictionary.cs @@ -1,5 +1,7 @@ using System; using System.Collections.Generic; +using System.ComponentModel; +using System.Runtime.CompilerServices; using System.Windows; namespace Maple @@ -11,7 +13,7 @@ namespace Maple /// is created, it only merges the resources from the cache. /// /// - public class SharedResourceDictionary : ResourceDictionary + public class SharedResourceDictionary : ResourceDictionary, INotifyPropertyChanged { /// /// Internal cache of loaded dictionaries @@ -23,6 +25,8 @@ public class SharedResourceDictionary : ResourceDictionary /// private Uri _sourceUri; + public event PropertyChangedEventHandler PropertyChanged; + /// /// Gets or sets the uniform resource identifier (URI) to load resources from. /// @@ -32,6 +36,7 @@ public class SharedResourceDictionary : ResourceDictionary set { _sourceUri = value; + OnPropertyChanged(nameof(Source)); if (!_sharedDictionaries.ContainsKey(value)) { @@ -43,11 +48,15 @@ public class SharedResourceDictionary : ResourceDictionary _sharedDictionaries.Add(value, this); } else - { + // If the dictionary is already loaded, get it from the cache MergedDictionaries.Add(_sharedDictionaries[value]); - } } } + + protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null) + { + PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); + } } } diff --git a/src/Maple/UI/IoCResourceDictionary.cs b/src/Maple/UI/IoCResourceDictionary.cs index 127cfe2..61bf261 100644 --- a/src/Maple/UI/IoCResourceDictionary.cs +++ b/src/Maple/UI/IoCResourceDictionary.cs @@ -1,6 +1,8 @@ using System; using System.Diagnostics; + using Maple.Core; +using Maple.Domain; namespace Maple { diff --git a/src/Maple/UI/MarkupExtensions/BrushRoundConverter.cs b/src/Maple/UI/MarkupExtensions/BrushRoundConverter.cs index 19f812f..38a15b6 100644 --- a/src/Maple/UI/MarkupExtensions/BrushRoundConverter.cs +++ b/src/Maple/UI/MarkupExtensions/BrushRoundConverter.cs @@ -13,8 +13,7 @@ public class BrushRoundConverter : ConverterMarkupExtension public override object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - var solidColorBrush = value as SolidColorBrush; - if (solidColorBrush == null) + if (!(value is SolidColorBrush solidColorBrush)) return null; var color = solidColorBrush.Color; diff --git a/src/Maple/UI/MarkupExtensions/TranslationExtension.cs b/src/Maple/UI/MarkupExtensions/TranslationExtension.cs index ff79a2e..f536d1e 100644 --- a/src/Maple/UI/MarkupExtensions/TranslationExtension.cs +++ b/src/Maple/UI/MarkupExtensions/TranslationExtension.cs @@ -4,7 +4,9 @@ using System.Windows.Data; using System.Windows.Markup; using System.Xaml; + using Maple.Core; +using Maple.Domain; namespace Maple { @@ -72,7 +74,7 @@ private object ProvideValue(IServiceProvider serviceProvider, ILocalizationServi { var binding = new Binding("Value") { - Source = new LocalizationDTO(manager, Key, ToUpper) + Source = new LocalizationDto(manager, Key, ToUpper) }; return binding.ProvideValue(serviceProvider); diff --git a/src/Maple/UI/PackIcon.cs b/src/Maple/UI/PackIcon.cs index ab5d6b7..1c0c47d 100644 --- a/src/Maple/UI/PackIcon.cs +++ b/src/Maple/UI/PackIcon.cs @@ -9,7 +9,7 @@ namespace Maple /// /// /// - public class PackIcon : PackIcon + public class PackIcon : PackIconControl { private static IDictionary _cache; /// diff --git a/src/Maple/UI/UserControls/MediaPlayerPage.xaml.cs b/src/Maple/UI/UserControls/MediaPlayerPage.xaml.cs index 88cc6df..19b9743 100644 --- a/src/Maple/UI/UserControls/MediaPlayerPage.xaml.cs +++ b/src/Maple/UI/UserControls/MediaPlayerPage.xaml.cs @@ -1,4 +1,4 @@ -using Maple.Core; +using Maple.Domain; namespace Maple { diff --git a/src/Maple/UI/UserControls/MediaPlayersPage.xaml.cs b/src/Maple/UI/UserControls/MediaPlayersPage.xaml.cs index 923ef9b..1d32ec7 100644 --- a/src/Maple/UI/UserControls/MediaPlayersPage.xaml.cs +++ b/src/Maple/UI/UserControls/MediaPlayersPage.xaml.cs @@ -1,4 +1,4 @@ -using Maple.Core; +using Maple.Domain; namespace Maple { diff --git a/src/Maple/UI/UserControls/Options/ColorOptionsPage.xaml.cs b/src/Maple/UI/UserControls/Options/ColorOptionsPage.xaml.cs index b9937e1..6095987 100644 --- a/src/Maple/UI/UserControls/Options/ColorOptionsPage.xaml.cs +++ b/src/Maple/UI/UserControls/Options/ColorOptionsPage.xaml.cs @@ -1,4 +1,4 @@ -using Maple.Core; +using Maple.Domain; namespace Maple { diff --git a/src/Maple/UI/UserControls/Options/OptionsPage.xaml.cs b/src/Maple/UI/UserControls/Options/OptionsPage.xaml.cs index 3228e2c..86880c5 100644 --- a/src/Maple/UI/UserControls/Options/OptionsPage.xaml.cs +++ b/src/Maple/UI/UserControls/Options/OptionsPage.xaml.cs @@ -1,4 +1,4 @@ -using Maple.Core; +using Maple.Domain; namespace Maple { diff --git a/src/Maple/UI/UserControls/Playlist/NewPlaylistOptionsPage.xaml.cs b/src/Maple/UI/UserControls/Playlist/NewPlaylistOptionsPage.xaml.cs index 852826c..9b189e0 100644 --- a/src/Maple/UI/UserControls/Playlist/NewPlaylistOptionsPage.xaml.cs +++ b/src/Maple/UI/UserControls/Playlist/NewPlaylistOptionsPage.xaml.cs @@ -1,4 +1,4 @@ -using Maple.Core; +using Maple.Domain; namespace Maple { diff --git a/src/Maple/UI/UserControls/Playlist/NewPlaylistPage.xaml.cs b/src/Maple/UI/UserControls/Playlist/NewPlaylistPage.xaml.cs index fd9772d..5fa8737 100644 --- a/src/Maple/UI/UserControls/Playlist/NewPlaylistPage.xaml.cs +++ b/src/Maple/UI/UserControls/Playlist/NewPlaylistPage.xaml.cs @@ -1,4 +1,4 @@ -using Maple.Core; +using Maple.Domain; namespace Maple { diff --git a/src/Maple/UI/UserControls/Playlist/PlaylistsPage.xaml.cs b/src/Maple/UI/UserControls/Playlist/PlaylistsPage.xaml.cs index dc83d72..3e8c742 100644 --- a/src/Maple/UI/UserControls/Playlist/PlaylistsPage.xaml.cs +++ b/src/Maple/UI/UserControls/Playlist/PlaylistsPage.xaml.cs @@ -1,4 +1,4 @@ -using Maple.Core; +using Maple.Domain; namespace Maple { diff --git a/src/Maple/Utils/Validation/PlaylistsValidator.cs b/src/Maple/Utils/Validation/PlaylistsValidator.cs deleted file mode 100644 index 5c3c8af..0000000 --- a/src/Maple/Utils/Validation/PlaylistsValidator.cs +++ /dev/null @@ -1,15 +0,0 @@ -using FluentValidation; -using Maple.Core; - -namespace Maple -{ - public class PlaylistsValidator : BaseValidator, IValidator - { - public PlaylistsValidator(ILocalizationService translationService, IValidator playlistValidator) - : base(translationService) - { - RuleFor(playlists => playlists.Items).NotEmpty() - .SetCollectionValidator(playlistValidator); - } - } -} diff --git a/src/Maple/ViewModels/Interfaces/ICultureViewModel.cs b/src/Maple/ViewModels/Interfaces/ICultureViewModel.cs deleted file mode 100644 index 1af604a..0000000 --- a/src/Maple/ViewModels/Interfaces/ICultureViewModel.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Maple.Core; - -namespace Maple -{ - public interface ICultureViewModel : ILoadableViewModel, ISaveableViewModel - { - } -} \ No newline at end of file diff --git a/src/Maple/ViewModels/Interfaces/IMediaItemsViewModel.cs b/src/Maple/ViewModels/Interfaces/IMediaItemsViewModel.cs deleted file mode 100644 index 3ebd2bb..0000000 --- a/src/Maple/ViewModels/Interfaces/IMediaItemsViewModel.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using Maple.Core; - -namespace Maple -{ - public interface IMediaItemsViewModel : ISaveableViewModel - { - IReadOnlyCollection Items { get; } - - void Add(Playlist playlist); - Task LoadAsync(); - void Save(); - } -} \ No newline at end of file diff --git a/src/Maple/ViewModels/Interfaces/IMediaPlayersViewModel.cs b/src/Maple/ViewModels/Interfaces/IMediaPlayersViewModel.cs deleted file mode 100644 index b035984..0000000 --- a/src/Maple/ViewModels/Interfaces/IMediaPlayersViewModel.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using System.Collections.Generic; -using Maple.Core; - -namespace Maple -{ - public interface IMediaPlayersViewModel : ILoadableViewModel, ISaveableViewModel, IDisposable - { - IReadOnlyCollection Items { get; } - } -} \ No newline at end of file diff --git a/src/Maple/ViewModels/Interfaces/IPlaylistsViewModel.cs b/src/Maple/ViewModels/Interfaces/IPlaylistsViewModel.cs deleted file mode 100644 index 2c2a01a..0000000 --- a/src/Maple/ViewModels/Interfaces/IPlaylistsViewModel.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Maple.Core; - -namespace Maple -{ - public interface IPlaylistsViewModel : ILoadableViewModel, ISaveableViewModel - { - void Add(); - } -} \ No newline at end of file diff --git a/src/Maple/ViewModels/MediaItems/MediaItems.cs b/src/Maple/ViewModels/MediaItems/MediaItems.cs deleted file mode 100644 index ce97881..0000000 --- a/src/Maple/ViewModels/MediaItems/MediaItems.cs +++ /dev/null @@ -1,57 +0,0 @@ -using System; -using System.Linq; -using System.Threading.Tasks; -using Maple.Core; -using Maple.Domain; -using Maple.Localization.Properties; - -namespace Maple -{ - public class MediaItems : BaseDataListViewModel, IMediaItemsViewModel - { - private readonly Func _repositoryFactory; - private readonly IMediaItemMapper _mediaItemMapper; - - public MediaItems(ViewModelServiceContainer container, IMediaItemMapper mediaItemMapper, Func repositoryFactory) - : base(container) - { - _repositoryFactory = repositoryFactory ?? throw new ArgumentNullException(nameof(repositoryFactory), $"{nameof(repositoryFactory)} {Resources.IsRequired}"); - _mediaItemMapper = mediaItemMapper ?? throw new ArgumentNullException(nameof(mediaItemMapper), $"{nameof(mediaItemMapper)} {Resources.IsRequired}"); - } - - public void Add(Playlist playlist) - { - var sequence = _sequenceProvider.Get(Items.Select(p => (ISequence)p).ToList()); - Add(_mediaItemMapper.GetNewMediaItem(sequence, playlist)); - } - - private void SaveInternal() - { - _log.Info($"{_translationService.Translate(nameof(Resources.Saving))} {_translationService.Translate(nameof(Resources.MediaItems))}"); - using (var context = _repositoryFactory()) - { - context.Save(this); - } - } - - public override async Task LoadAsync() - { - _log.Info($"{_translationService.Translate(nameof(Resources.Loading))} {_translationService.Translate(nameof(Resources.MediaItems))}"); - Clear(); - - using (var context = _repositoryFactory()) - { - var result = await context.GetMediaItemsAsync().ConfigureAwait(true); - AddRange(result); - } - - SelectedItem = Items.FirstOrDefault(); - OnLoaded(); - } - - public override void Save() - { - SaveInternal(); - } - } -} diff --git a/src/Maple/ViewModels/MediaPlayer/MediaPlayers.cs b/src/Maple/ViewModels/MediaPlayer/MediaPlayers.cs deleted file mode 100644 index f482a5f..0000000 --- a/src/Maple/ViewModels/MediaPlayer/MediaPlayers.cs +++ /dev/null @@ -1,104 +0,0 @@ -using System; -using System.Linq; -using System.Threading.Tasks; -using Maple.Core; -using Maple.Domain; -using Maple.Localization.Properties; - -namespace Maple -{ - public class MediaPlayers : BaseDataListViewModel, IMediaPlayersViewModel - { - private readonly Func _playerFactory; - private readonly AudioDevices _devices; - private readonly IDialogViewModel _dialog; - private readonly Func _repositoryFactory; - private readonly IMediaPlayerMapper _mediaPlayerMapper; - private readonly ILoggingNotifcationService _notificationService; - - /// - /// Initializes a new instance of the class. - /// - /// The manager. - /// The player factory. - /// The repo. - /// The devices. - /// The dialog. - public MediaPlayers(ViewModelServiceContainer container, - IMediaPlayerMapper mediaPlayerMapper, - Func playerFactory, - Func repositoryFactory, - AudioDevices devices, - IDialogViewModel dialog) - : base(container) - { - _playerFactory = playerFactory ?? throw new ArgumentNullException(nameof(playerFactory), $"{nameof(playerFactory)} {Resources.IsRequired}"); - _devices = devices ?? throw new ArgumentNullException(nameof(devices), $"{nameof(devices)} {Resources.IsRequired}"); - _dialog = dialog ?? throw new ArgumentNullException(nameof(dialog), $"{nameof(dialog)} {Resources.IsRequired}"); - _repositoryFactory = repositoryFactory ?? throw new ArgumentNullException(nameof(repositoryFactory), $"{nameof(repositoryFactory)} {Resources.IsRequired}"); - _mediaPlayerMapper = mediaPlayerMapper ?? throw new ArgumentNullException(nameof(mediaPlayerMapper), $"{nameof(mediaPlayerMapper)} {Resources.IsRequired}"); - - _notificationService = container.NotificationService; - } - - private void SaveInternal() - { - _log.Info($"{_translationService.Translate(nameof(Resources.Saving))} {_translationService.Translate(nameof(Resources.MediaPlayers))}"); - using (var context = _repositoryFactory()) - { - context.Save(this); - } - } - - public void Add() - { - var sequence = _sequenceProvider.Get(Items.Select(p => (ISequence)p).ToList()); - Add(_mediaPlayerMapper.GetNewMediaPlayer(sequence)); - } - - /// - /// Releases unmanaged and - optionally - managed resources. - /// - /// true to release both managed and unmanaged resources; false to release only unmanaged resources. - protected override void Dispose(bool disposing) - { - if (Disposed) - return; - - if (disposing) - { - foreach (var player in Items) - player?.Dispose(); - - // Free any other managed objects here. - } - - // Free any unmanaged objects here. - Disposed = true; - } - - public override void Save() - { - SaveInternal(); - } - - public override async Task LoadAsync() - { - _notificationService.Info($"{_translationService.Translate(nameof(Resources.Loading))} {_translationService.Translate(nameof(Resources.MediaPlayers))}"); - Clear(); - - using (var context = _repositoryFactory()) - { - var main = await context.GetMainMediaPlayerAsync().ConfigureAwait(true); - - Add(main); - SelectedItem = main; - - var others = await context.GetAllOptionalMediaPlayersAsync().ConfigureAwait(true); - AddRange(others); - } - - OnLoaded(); - } - } -} diff --git a/src/Maple/ViewModels/MediaPlayer/NAudio/PlaybackDeviceFactory.cs b/src/Maple/ViewModels/MediaPlayer/NAudio/PlaybackDeviceFactory.cs index 6546fd2..094b888 100644 --- a/src/Maple/ViewModels/MediaPlayer/NAudio/PlaybackDeviceFactory.cs +++ b/src/Maple/ViewModels/MediaPlayer/NAudio/PlaybackDeviceFactory.cs @@ -1,13 +1,14 @@ using System; using System.Collections.Generic; +using Maple.Core; using Maple.Domain; using NAudio.Wave; namespace Maple { - public static class PlaybackDeviceFactory + public class PlaybackDeviceFactory : IPlaybackDeviceFactory { - public static IEnumerable GetAudioDevices(ILoggingService log) + public IEnumerable GetAudioDevices(ILoggingService log) { for (var i = 0; i < WaveOut.DeviceCount; i++) { @@ -25,7 +26,7 @@ public static IEnumerable GetAudioDevices(ILoggingService log) } - private static WaveOutCapabilities GetCapabilities(int index, ILoggingService log) + private WaveOutCapabilities GetCapabilities(int index, ILoggingService log) { try { diff --git a/src/Maple/ViewModels/Navigation/Scene.cs b/src/Maple/ViewModels/Navigation/Scene.cs index e095499..04c094b 100644 --- a/src/Maple/ViewModels/Navigation/Scene.cs +++ b/src/Maple/ViewModels/Navigation/Scene.cs @@ -6,11 +6,6 @@ namespace Maple { - /// - /// - /// - /// - /// public class Scene : ObservableObject, ISequence { private readonly ILocalizationService _manager; diff --git a/src/Maple/ViewModels/Navigation/Scenes.cs b/src/Maple/ViewModels/Navigation/Scenes.cs index 2d3292b..c47f480 100644 --- a/src/Maple/ViewModels/Navigation/Scenes.cs +++ b/src/Maple/ViewModels/Navigation/Scenes.cs @@ -1,9 +1,8 @@ using System; -using System.ComponentModel; using System.Diagnostics; using System.Linq; -using System.Windows.Controls; using System.Windows.Input; + using Maple.Core; using Maple.Domain; using Maple.Localization.Properties; @@ -149,11 +148,6 @@ public Scenes(ILocalizationService manager, ILoggingService log, IMessenger mess AddRange(content); SelectedItem = this[0]; - - using (View.DeferRefresh()) - { - View.SortDescriptions.Add(new SortDescription(nameof(Scene.Sequence), ListSortDirection.Ascending)); - } } InitializeCommands(); diff --git a/src/Maple/ViewModels/Playlists/Playlists.cs b/src/Maple/ViewModels/Playlists/Playlists.cs deleted file mode 100644 index 5f425ea..0000000 --- a/src/Maple/ViewModels/Playlists/Playlists.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System; -using System.Linq; -using System.Threading.Tasks; -using Maple.Core; -using Maple.Domain; -using Maple.Localization.Properties; - -namespace Maple -{ - public class Playlists : BaseDataListViewModel, ISaveableViewModel, IPlaylistsViewModel - { - private readonly Func _repositoryFactory; - private readonly IPlaylistMapper _playlistMapper; - - public Playlists(ViewModelServiceContainer container, IPlaylistMapper playlistMapper, Func repositoryFactory) - : base(container) - { - _repositoryFactory = repositoryFactory ?? throw new ArgumentNullException(nameof(repositoryFactory), $"{nameof(repositoryFactory)} {Resources.IsRequired}"); - _playlistMapper = playlistMapper ?? throw new ArgumentNullException(nameof(playlistMapper), $"{nameof(playlistMapper)} {Resources.IsRequired}"); - - AddCommand = new RelayCommand(Add, CanAdd); - } - - private void SaveInternal() - { - _log.Info($"{_translationService.Translate(nameof(Resources.Saving))} {_translationService.Translate(nameof(Resources.Playlists))}"); - using (var context = _repositoryFactory()) - { - context.Save(this); - } - } - - public void Add() - { - Add(_playlistMapper.GetNewPlaylist()); - } - - public bool CanAdd() - { - return Items != null; - } - - public override void Save() - { - SaveInternal(); - } - - public override async Task LoadAsync() - { - _log.Info($"{_translationService.Translate(nameof(Resources.Loading))} {_translationService.Translate(nameof(Resources.Playlists))}"); - Clear(); - - using (var context = _repositoryFactory()) - { - var result = await context.GetPlaylistsAsync().ConfigureAwait(true); - AddRange(result); - } - - SelectedItem = Items.FirstOrDefault(); - OnLoaded(); - } - } -} diff --git a/src/Maple/ViewModels/ShellViewModel.cs b/src/Maple/ViewModels/ShellViewModel.cs index 1da8769..5837fa6 100644 --- a/src/Maple/ViewModels/ShellViewModel.cs +++ b/src/Maple/ViewModels/ShellViewModel.cs @@ -1,22 +1,14 @@ using System; + using Maple.Core; +using Maple.Domain; using Maple.Localization.Properties; namespace Maple { - /// - /// - /// - /// public class ShellViewModel : ObservableObject { private StatusbarViewModel _statusbarViewModel; - /// - /// Gets the statusbar view model. - /// - /// - /// The statusbar view model. - /// public StatusbarViewModel StatusbarViewModel { get { return _statusbarViewModel; } @@ -24,12 +16,6 @@ public StatusbarViewModel StatusbarViewModel } private Scenes _scenes; - /// - /// Gets the scenes. - /// - /// - /// The scenes. - /// public Scenes Scenes { get { return _scenes; } @@ -37,12 +23,6 @@ public Scenes Scenes } private ILocalizationService _translationManager; - /// - /// Gets the translation manager. - /// - /// - /// The translation manager. - /// public ILocalizationService TranslationManager { get { return _translationManager; } @@ -50,12 +30,6 @@ public ILocalizationService TranslationManager } private IDialogViewModel _dialogViewModel; - /// - /// Gets the dialog view model. - /// - /// - /// The dialog view model. - /// public IDialogViewModel DialogViewModel { get { return _dialogViewModel; } @@ -63,12 +37,6 @@ public IDialogViewModel DialogViewModel } private IPlaylistsViewModel _playlists; - /// - /// Gets the playlists. - /// - /// - /// The playlists. - /// public IPlaylistsViewModel Playlists { get { return _playlists; } @@ -76,12 +44,6 @@ public IPlaylistsViewModel Playlists } private IMediaPlayersViewModel _mediaPlayers; - /// - /// Gets the media players. - /// - /// - /// The media players. - /// public IMediaPlayersViewModel MediaPlayers { get { return _mediaPlayers; } @@ -89,29 +51,12 @@ public IMediaPlayersViewModel MediaPlayers } private OptionsViewModel _optionsViewModel; - /// - /// Gets the options view model. - /// - /// - /// The options view model. - /// public OptionsViewModel OptionsViewModel { get { return _optionsViewModel; } private set { SetValue(ref _optionsViewModel, value); } } - /// - /// Initializes a new instance of the class. - /// - /// The translation manager. - /// The scenes. - /// The status bar view model. - /// The dialog view model. - /// The playlists. - /// The media players. - /// The UI colors view model. - /// The options view model. public ShellViewModel(ILocalizationService translationManager, Scenes scenes, StatusbarViewModel statusBarViewModel, diff --git a/src/Maple/ViewModels/Settings/UIColorsViewModel.cs b/src/Maple/ViewModels/UIColorsViewModel.cs similarity index 92% rename from src/Maple/ViewModels/Settings/UIColorsViewModel.cs rename to src/Maple/ViewModels/UIColorsViewModel.cs index c6c0760..5c570d8 100644 --- a/src/Maple/ViewModels/Settings/UIColorsViewModel.cs +++ b/src/Maple/ViewModels/UIColorsViewModel.cs @@ -85,21 +85,21 @@ public ICommand ApplyAccentCommand /// /// The refresh command. /// - public ICommand RefreshCommand => new RelayCommand(Load); + public IAsyncCommand RefreshCommand => AsyncCommand.Create(Load); /// /// Gets the load command. /// /// /// The load command. /// - public ICommand LoadCommand => new RelayCommand(Load, () => !IsLoaded); + public IAsyncCommand LoadCommand => AsyncCommand.Create(Load, () => !IsLoaded); /// /// Gets the save command. /// /// /// The save command. /// - public ICommand SaveCommand => new RelayCommand(Save); + public IAsyncCommand SaveCommand => AsyncCommand.Create(Save); /// /// Gets the swatches. @@ -166,7 +166,7 @@ public void OnPrimaryColorChanged(UiPrimaryColorChangedMessage args) /// /// Saves this instance. /// - public void Save() + public Task Save() { _log.Info($"{Resources.Saving} {Resources.Themes}"); @@ -175,12 +175,14 @@ public void Save() Properties.Settings.Default.UseDarkTheme = _isDark; Properties.Settings.Default.Save(); + + return Task.CompletedTask; } /// /// Loads this instance. /// - public void Load() + public Task Load() { _log.Info($"{Resources.Loading} {Resources.Themes}"); @@ -195,14 +197,15 @@ public void Load() ApplyBase(this, Properties.Settings.Default.UseDarkTheme); _messenger.Publish(new LoadedMessage(this, this)); + return Task.CompletedTask; } - public Task SaveAsync() + public async Task SaveAsync() { - return Task.Run(() => Save()); + await Save().ConfigureAwait(true); } - public Task LoadAsync() + public Task GetCountAsync() { Load(); return Task.CompletedTask; diff --git a/src/Resources/SharedAssemblyInfo.cs b/src/Resources/SharedAssemblyInfo.cs index 4c15a37..03f02a4 100644 --- a/src/Resources/SharedAssemblyInfo.cs +++ b/src/Resources/SharedAssemblyInfo.cs @@ -11,7 +11,7 @@ [assembly: AssemblyVersion("0.0.1")] [assembly: AssemblyFileVersion("0.0.1")] [assembly: AssemblyInformationalVersion("0.0.0.1")] -[assembly: AssemblyCopyright("© 2017 Insire")] +[assembly: AssemblyCopyright("© 2018 Insire")] [assembly: AssemblyTrademark("")] [assembly: ComVisible(false)]