Better image loading

.editorconfig

@@ -6,6 +6,9 @@ indent_size = 4
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+tab_width = 4
+end_of_line = crlf
 
 
 [*.cs]
@@ -98,7 +101,7 @@ dotnet_style_parentheses_in_other_operators = never_if_unnecessary:warning
 # object initializers
 
 dotnet_style_object_initializer = true:warning
-dotnet_style_collection_initializer = true:warning
+dotnet_style_collection_initializer = false:suggestion
 
 # conditionals
 
@@ -180,7 +183,7 @@ csharp_prefer_simple_using_statement = false:suggestion
 dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
 
 # IDE0058: Expression value is never used
-csharp_style_unused_value_expression_statement_preference = discard_variable
+csharp_style_unused_value_expression_statement_preference = discard_variable:silent
 dotnet_diagnostic.IDE0058.severity = none
 
 # IDE0045: Use conditional expression for assignment
@@ -195,3 +198,39 @@ dotnet_diagnostic.CA1806.severity = none
 # IDE0130: Namespace does not match folder structure
 dotnet_style_namespace_match_folder = true
 dotnet_diagnostic.IDE0130.severity = none
+
+# IDE0090: Use 'new(...)'
+csharp_style_implicit_object_creation_when_type_is_apparent = false:suggestion
+
+csharp_style_namespace_declarations = block_scoped:silent
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_prefer_top_level_statements = true:silent
+csharp_style_expression_bodied_lambdas = true:silent
+csharp_style_expression_bodied_local_functions = false:silent
+csharp_style_prefer_null_check_over_type_check = true:suggestion
+csharp_style_prefer_local_over_anonymous_function = true:suggestion
+csharp_style_prefer_index_operator = true:suggestion
+csharp_style_prefer_range_operator = true:suggestion
+csharp_style_prefer_tuple_swap = true:suggestion
+csharp_style_prefer_utf8_string_literals = true:suggestion
+csharp_style_unused_value_assignment_preference = discard_variable:suggestion
+
+dotnet_style_coalesce_expression = true:silent
+dotnet_style_null_propagation = true:silent
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_object_initializer = true:warning
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
+dotnet_style_prefer_conditional_expression_over_assignment = false:silent
+dotnet_style_prefer_conditional_expression_over_return = false:suggestion
+dotnet_style_explicit_tuple_names = true:error
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = false:suggestion
+dotnet_style_prefer_compound_assignment = true:suggestion
+dotnet_style_prefer_simplified_interpolation = true:suggestion
+dotnet_style_namespace_match_folder = true:suggestion
+dotnet_style_readonly_field = true:warning
+csharp_style_prefer_primary_constructors = false:suggestion
+
+# IDE0300: Simplify collection initialization
+dotnet_style_prefer_collection_expression = false

build/cake/Build.sln → Build.sln

@@ -1,25 +1,25 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31112.23
+# Visual Studio Version 17
+VisualStudioVersion = 17.7.34221.43
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Build", "Build.csproj", "{A3681B14-6073-4CEF-9484-537EACE8036F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Build", "build\cake\Build.csproj", "{E23ADC45-EE86-433F-9656-2D8E479996DB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A3681B14-6073-4CEF-9484-537EACE8036F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A3681B14-6073-4CEF-9484-537EACE8036F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A3681B14-6073-4CEF-9484-537EACE8036F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A3681B14-6073-4CEF-9484-537EACE8036F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E23ADC45-EE86-433F-9656-2D8E479996DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E23ADC45-EE86-433F-9656-2D8E479996DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E23ADC45-EE86-433F-9656-2D8E479996DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E23ADC45-EE86-433F-9656-2D8E479996DB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {87B91DF1-B65B-485A-8DE2-E8454257A3D3}
+		SolutionGuid = {1BA4F329-14BA-4003-AC56-B766D7834FC5}
 	EndGlobalSection
 EndGlobal

Directory.Build.targets

@@ -8,12 +8,12 @@
     <PropertyGroup>
         <Nullable>enable</Nullable>
         <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
-        <LangVersion>10.0</LangVersion>
+        <LangVersion>12.0</LangVersion>
         <CodeAnalysisRuleSet>.\..\..\SoftThorn.Monstercat.Browser.ruleset</CodeAnalysisRuleSet>
     </PropertyGroup>
 
     <ItemGroup Condition=" '$(Configuration)'=='Debug' ">
-        <PackageReference Include="Roslynator.Analyzers" Version="4.1.1">
+        <PackageReference Include="Roslynator.Analyzers">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

Directory.Packages.props

@@ -0,0 +1,88 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <!--Avalonia -->
+    <PackageVersion Include="Avalonia" Version="0.10.17" />
+    <PackageVersion Include="Avalonia.Desktop" Version="0.10.17" />
+    <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
+    <PackageVersion Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.17" />
+    <PackageVersion Include="Material.Avalonia" Version="3.0.0-rc0.90-nightly" />
+    <PackageVersion Include="Material.Icons.Avalonia" Version="1.1.10" />
+    <PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <!--CLI -->
+    <PackageVersion Include="Spectre.Console" Version="0.48.0" />
+    <PackageVersion Include="Spectre.Console.Cli" Version="0.48.0" />
+    <PackageVersion Include="Spectre.Console.Analyzer" Version="0.48.0" />
+    <!--NAudio -->
+    <PackageVersion Include="NAudio" Version="2.2.1" />
+    <PackageVersion Include="NAudio.Core" Version="2.2.1" />
+    <!--LiveCharts -->
+    <PackageVersion Include="LiveChartsCore" Version="2.0.0-beta.300" />
+    <PackageVersion Include="LiveChartsCore.SkiaSharpView" Version="2.0.0-beta.300" />
+    <PackageVersion Include="LiveChartsCore.SkiaSharpView.WPF" Version="2.0.0-beta.300" />
+    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="8.0.4" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
+    <!--WPF -->
+    <PackageVersion Include="Jot" Version="2.1.17" />
+    <PackageVersion Include="Ookii.Dialogs.Wpf" Version="5.0.1" />
+    <PackageVersion Include="MahApps.Metro.IconPacks.FontAwesome" Version="4.11.0" />
+    <PackageVersion Include="MaterialDesignThemes.MahApps" Version="0.3.0" />
+    <PackageVersion Include="MahApps.Metro" Version="2.4.10" />
+    <PackageVersion Include="XamlFlair.WPF" Version="1.2.13" />
+    <PackageVersion Include="Magick.NET.SystemWindowsMedia" Version="7.2.1" />
+    <!--Logging-->
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageVersion Include="Serilog" Version="3.1.1" />
+    <PackageVersion Include="Serilog.Enrichers.Environment" Version="2.3.0" />
+    <PackageVersion Include="Serilog.Enrichers.Process" Version="2.0.2" />
+    <PackageVersion Include="Serilog.Enrichers.Thread" Version="3.1.0" />
+    <PackageVersion Include="Serilog.Sinks.Debug" Version="2.0.0" />
+    <PackageVersion Include="Serilog.Sinks.XUnit" Version="3.0.5" />
+    <PackageVersion Include="Serilog.Sinks.TestCorrelator" Version="3.2.0" />
+    <!--Misc-->
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageVersion Include="Roslynator.Analyzers" Version="4.12.2" />
+    <PackageVersion Include="EmailValidation" Version="1.0.10" />
+    <PackageVersion Include="akavache" Version="9.1.20" />
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+    <PackageVersion Include="DynamicData" Version="8.4.1" />
+    <PackageVersion Include="Gress" Version="2.1.1" />
+    <PackageVersion Include="MonstercatNet" Version="3.0.52" />
+    <PackageVersion Include="z440.atl.core" Version="5.23.0" />
+    <PackageVersion Include="FuzzySharp" Version="2.0.2" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.3" />
+    <PackageVersion Include="DryIoc.dll" Version="5.4.3" />
+    <PackageVersion Include="Magick.NET-Q8-AnyCPU" Version="13.5.0" />
+    <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.0" />
+    <PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageVersion Include="NSubstitute" Version="5.1.0" />
+    <PackageVersion Include="SkiaSharp" Version="2.88.6" />
+    <PackageVersion Include="System.Drawing.Common" Version="8.0.4" />
+    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
+    <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
+    <!--Assertions-->
+    <PackageVersion Include="FluentAssertions" Version="6.12.0" />
+    <PackageVersion Include="FluentAssertions.Analyzers" Version="0.31.0" />
+    <!--XUnit-->
+    <PackageVersion Include="xunit" Version="2.8.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.0" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.2" />
+    <!--Cake-->
+    <PackageVersion Include="Cake.Compression" Version="0.3.0" />
+    <PackageVersion Include="Cake.Frosting" Version="3.0.0" />
+    <PackageVersion Include="Cake.GitVersioning" Version="3.6.133" />
+    <PackageVersion Include="Cake.Incubator" Version="7.0.0" />
+    <PackageVersion Include="SharpZipLib" Version="1.4.1" />
+    <PackageVersion Include="GitVersion.CommandLine" Version="5.11.1" />
+  </ItemGroup>
+</Project>

README.md

@@ -18,6 +18,7 @@ The SoftThorn.Monstercat.Browser app (or SMB app for short) is my approach for d
 ## Features
 
 - Browse the latest tracks and releases from [monstercat](https://www.monstercat.com/)
+- Stream/Play music directly from [monstercat](https://www.monstercat.com/)
 - Download any/all of their music to your local device (You need an active Gold Subscription for that!)
 - Settings
   - Download locations
@@ -28,17 +29,12 @@ The SoftThorn.Monstercat.Browser app (or SMB app for short) is my approach for d
 
 ### Planned
 
-- Settings Storage (persist configuration between app restarts)
-  - color selection?
-  - Enable AssetSize Configuration (Download the art in the format and size you like)
 - AutoUpdate via Github releases
 - Playlist (manage playback via playlists)
   - Playbackmode (shuffle, one, all, folder)
 
 ### ToDo
 
-- add Previous button for going back to the previous track
-- remember playback volume level
 - figure out how to show playback progress with NAudio
 - auto updates
 - sign my binaries
@@ -54,6 +50,6 @@ This app uses SDK-style project files, which means you are required to use [Visu
 For anyone not wishing to install that, they atleast need:
 
 - Windows 10 (older versions work probably too, but the repository is not configured for those)
-- [Net 6.0](https://dotnet.microsoft.com/download/dotnet-core/6.0)
+- [Net 8.0](https://dotnet.microsoft.com/download/dotnet-core/8.0)
 - [Visual Studio Code](https://code.visualstudio.com/) with the [C# Extension](https://github.com/OmniSharp/omnisharp-vscode) provided by Microsoft
 - [git](https://git-scm.com/)

SoftThorn.Monstercat.Browser.sln

@@ -9,17 +9,22 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SoftThorn.Monstercat.Browse
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{73F118B7-BF91-451D-887F-3390EF495E67}"
 	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
+		Directory.Packages.props = Directory.Packages.props
 		global.json = global.json
+		nuget.config = nuget.config
 		README.md = README.md
 		SoftThorn.Monstercat.Browser.ruleset = SoftThorn.Monstercat.Browser.ruleset
 		version.json = version.json
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SoftThorn.Monstercat.Browser.Avalonia", "src\Avalonia\SoftThorn.Monstercat.Browser.Avalonia.csproj", "{B3989C1E-304F-4A19-B165-CAD1599E18FC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SoftThorn.Monstercat.Browser.Cli", "src\SoftThorn.Monstercat.Browser.Cli\SoftThorn.Monstercat.Browser.Cli.csproj", "{B244F528-4062-4FC0-99BB-5899FB895CB7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SoftThorn.Monstercat.Browser.Cli", "src\Cli\SoftThorn.Monstercat.Browser.Cli.csproj", "{B244F528-4062-4FC0-99BB-5899FB895CB7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SoftThorn.Monstercat.UnitTests", "src\UnitTests\SoftThorn.Monstercat.UnitTests.csproj", "{8CFF5DAE-DF5E-4EBC-919F-E500EF05846D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -43,6 +48,10 @@ Global
 		{B244F528-4062-4FC0-99BB-5899FB895CB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B244F528-4062-4FC0-99BB-5899FB895CB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B244F528-4062-4FC0-99BB-5899FB895CB7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8CFF5DAE-DF5E-4EBC-919F-E500EF05846D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8CFF5DAE-DF5E-4EBC-919F-E500EF05846D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8CFF5DAE-DF5E-4EBC-919F-E500EF05846D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8CFF5DAE-DF5E-4EBC-919F-E500EF05846D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

build/cake/Build.csproj

@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net60</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
 
         <!-- Make sure start same folder .NET Core CLI and Visual Studio -->
         <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Cake.Compression" Version="0.3.0" />
-        <PackageReference Include="Cake.Frosting" Version="2.2.0" />
-        <PackageReference Include="Cake.GitVersioning" Version="3.5.113" />
-        <PackageReference Include="Cake.Incubator" Version="7.0.0" />
-        <PackageReference Include="SharpZipLib" Version="1.4.0" />
+        <PackageReference Include="Cake.Compression" />
+        <PackageReference Include="Cake.Frosting" />
+        <PackageReference Include="Cake.GitVersioning" />
+        <PackageReference Include="Cake.Incubator" />
+        <PackageReference Include="SharpZipLib" />
 
-        <PackageReference Include="GitVersion.CommandLine" Version="5.10.3">
+        <PackageReference Include="GitVersion.CommandLine">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

build/cake/Program.cs

@@ -11,7 +11,7 @@ public static int Main(string[] args)
                 .UseContext<BuildContext>()
                 .UseWorkingDirectory("../../")
                 .SetToolPath("../")
-                .InstallTool(new Uri("nuget:?package=GitVersion.CommandLine&version=5.10.3"))
+                .InstallTool(new Uri("nuget:?package=GitVersion.CommandLine&version=5.12.0"))
                 .Run(args);
         }
     }

build/cake/Tasks/GenerateLicenseFileTask.cs

@@ -9,7 +9,7 @@ namespace Build
     public sealed class GenerateLicenseFileTask : FrostingTask<BuildContext>
     {
         private const string DotnetToolName = "dotnet-project-licenses";
-        private const string DotnetToolVersion = "2.4.0";
+        private const string DotnetToolVersion = "2.5.0";
 
         public override void Run(BuildContext context)
         {

global.json

@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "6.0.401",
+        "version": "8.0.204",
         "rollForward": "disable"
     }
 }

nuget.config

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <packageSources>
+        <!--To inherit the global NuGet package sources remove the <clear/> line below -->
+        <clear />
+        <add key="nuget" value="https://api.nuget.org/v3/index.json" />
+        <add key="local" value="D:\Drop\NuGet" />
+    </packageSources>
+
+    <!-- Define mappings by adding package patterns beneath the target source. -->
+    <!-- Contoso.* packages and NuGet.Common will be restored from contoso.com, everything else from nuget.org. -->
+    <packageSourceMapping>
+        <!-- key value for <packageSource> should match key values from <packageSources> element -->
+        <packageSource key="local">
+            <package pattern="Monstercat*" />
+        </packageSource>
+        <packageSource key="nuget">
+            <package pattern="*" />
+        </packageSource>
+    </packageSourceMapping>
+
+    <activePackageSource>
+        <!-- All non-disabled sources are active -->
+        <add key="All" value="(Aggregate source)" />
+    </activePackageSource>
+
+</configuration>

src/Avalonia/App.axaml.cs

@@ -1,7 +1,11 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
+using Avalonia.Media.Imaging;
 using DryIoc;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Logging;
+using Microsoft.IO;
 using SoftThorn.Monstercat.Browser.Core;
 using System.Threading;
 
@@ -25,6 +29,10 @@ public override async void OnFrameworkInitializationCompleted()
         {
             var container = _container = CompositionRoot.Get();
 
+            ImageLoader.Manager = container.Resolve<RecyclableMemoryStreamManager>();
+            ImageLoader.ImageFactory = container.Resolve<IImageFactory<IBitmap>>();
+            ImageLoader.AsyncImageLoader = new RamCachedWebImageLoader<IBitmap>(container.Resolve<ILogger<RamCachedWebImageLoader<IBitmap>>>(), new MemoryCache(new MemoryCacheOptions()), ImageLoader.Manager, ImageLoader.ImageFactory);
+
             var settingsViewModel = container.Resolve<SettingsViewModel>();
             // the shellviewmodel has to exist, so that loading the settings updates its own and all of its dependencies initial state
             var shellViewModel = container.Resolve<ShellViewModel>();
@@ -37,7 +45,10 @@ public override async void OnFrameworkInitializationCompleted()
                 desktop.MainWindow = new Shell(shellViewModel);
 
                 var loginViewModel = container.Resolve<LoginViewModel>();
-                await loginViewModel.TryLogin(null, CancellationToken.None);
+                if (!await loginViewModel.TryLogin(null, CancellationToken.None))
+                {
+                    desktop.Shutdown();
+                }
 
                 await shellViewModel.Refresh();