increase portibility, fix #208

thecodrr · Nov 14, 2017 · 4ff0a3d · 4ff0a3d
1 parent a5337f4
commit 4ff0a3d
Show file tree

Hide file tree

Showing 95 changed files with 381 additions and 343 deletions.
diff --git a/BreadPlayer.Core/BreadLogger/BLogger.cs → BreadPlayer.Common/BLogger.cs b/BreadPlayer.Core/BreadLogger/BLogger.cs → BreadPlayer.Common/BLogger.cs
diff --git a/BreadPlayer.Common/BreadPlayer.Common.csproj b/BreadPlayer.Common/BreadPlayer.Common.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard1.4</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Serilog" Version="2.6.0-dev-00923" />
+    <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\BreadPlayer.Interfaces\BreadPlayer.Interfaces.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/BreadPlayer.Common/InitializeSwitch.cs b/BreadPlayer.Common/InitializeSwitch.cs
@@ -0,0 +1,16 @@
+using BreadPlayer.Interfaces;
+
+public class InitializeSwitch
+{
+    public InitializeSwitch(INotificationManager notificationManager, IEqualizerSettingsHelper equalizerSettingsHelper, IDispatcher dispatcher, bool isMobile)
+    {
+        NotificationManager = notificationManager;
+        EqualizerSettingsHelper = equalizerSettingsHelper;
+        Dispatcher = dispatcher;
+        IsMobile = isMobile;
+    }
+    public static bool IsMobile { get; set; }
+    public static INotificationManager NotificationManager { get; private set; }
+    public static IEqualizerSettingsHelper EqualizerSettingsHelper { get; private set; }
+    public static IDispatcher Dispatcher { get; private set; }
+}
diff --git a/BreadPlayer.Framework/Messenger/Message.cs → BreadPlayer.Common/Messenger/Message.cs b/BreadPlayer.Framework/Messenger/Message.cs → BreadPlayer.Common/Messenger/Message.cs
diff --git a/...layer.Framework/Messenger/MessageTypes.cs → BreadPlayer.Common/Messenger/MessageTypes.cs b/...layer.Framework/Messenger/MessageTypes.cs → BreadPlayer.Common/Messenger/MessageTypes.cs
diff --git a/BreadPlayer.Framework/Messenger/Messenger.cs → BreadPlayer.Common/Messenger/Messenger.cs b/BreadPlayer.Framework/Messenger/Messenger.cs → BreadPlayer.Common/Messenger/Messenger.cs
diff --git a/...iewModels/BaseClasses/ObservableObject.cs → BreadPlayer.Common/ObservableObject.cs b/...iewModels/BaseClasses/ObservableObject.cs → BreadPlayer.Common/ObservableObject.cs
@@ -45,9 +45,9 @@ protected void RaisePropertyChanged([CallerMemberName] string propertyName = nul
     /// <param name="args">The arguments. </param>
     protected async virtual void RaisePropertyChanged(PropertyChangedEventArgs args)
     {
-        if (InitializeFramework.Dispatcher != null)
+        if (InitializeSwitch.Dispatcher != null)
         {
-            await InitializeFramework.Dispatcher?.RunAsync(() => { PropertyChanged?.Invoke(this, args); });
+            await InitializeSwitch.Dispatcher?.RunAsync(() => { PropertyChanged?.Invoke(this, args); });
         }
         else
         {

diff --git a/BreadPlayer.Controls/BreadPlayer.Controls.csproj b/BreadPlayer.Controls/BreadPlayer.Controls.csproj
@@ -107,14 +107,6 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="AlternativeRowListView\AlternateRowListView.cs" />
-    <Compile Include="GroupHeaderDataTemplateSelector.cs" />
-    <Compile Include="ImageEx\BitmapCache.cs" />
-    <Compile Include="ImageEx\BitmapTools.cs" />
-    <Compile Include="ImageEx\ImageEx.cs" />
-    <Compile Include="ImageEx\ImageEx.Members.cs" />
-    <Compile Include="ImageEx\ImageEx.Source.cs" />
-    <Compile Include="ImageEx\SizeExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <EmbeddedResource Include="Properties\BreadPlayer.Controls.rd.xml" />
   </ItemGroup>
@@ -132,9 +124,9 @@
       <Project>{e5851a02-a8ce-4f4d-8b5f-0986013ae830}</Project>
       <Name>BreadPlayer.Extensions</Name>
     </ProjectReference>
-    <ProjectReference Include="..\BreadPlayer.Framework\BreadPlayer.Framework.csproj">
-      <Project>{f22742c9-7088-4325-9f87-0a1aa34dda74}</Project>
-      <Name>BreadPlayer.Framework</Name>
+    <ProjectReference Include="..\BreadPlayer.Interfaces\BreadPlayer.Interfaces.csproj">
+      <Project>{412718BB-903F-482F-8577-99B8EFCD96D2}</Project>
+      <Name>BreadPlayer.Interfaces</Name>
     </ProjectReference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">

diff --git a/BreadPlayer.Core/BreadPlayer.Core.csproj b/BreadPlayer.Core/BreadPlayer.Core.csproj
@@ -102,34 +102,24 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="BreadLogger\BLogger.cs" />
-    <Compile Include="BreadLogger\ISentryMessageSender.cs" />
     <Compile Include="Common\Collections.cs" />
     <Compile Include="Common\ConfigSaver.cs" />
     <Compile Include="Common\DelegateCommand.cs" />
     <Compile Include="Common\Enums.cs" />
-    <Compile Include="Common\ICommand.cs" />
-    <Compile Include="Common\INotificationManager.cs" />
-    <Compile Include="Common\IEqualizerSettingsHelper.cs" />
-    <Compile Include="Common\IPinnable.cs" />
-    <Compile Include="Common\ISelectable.cs" />
     <Compile Include="Common\PasswordStorage.cs" />
     <Compile Include="Engines\BASSEngine\BassEqualizer.cs" />
     <Compile Include="Engines\BASSEngine\BassEqualizerBand.cs" />
     <Compile Include="Events\MediaAboutToEndEventArgs.cs" />
     <Compile Include="Events\MediaEndedEventArgs.cs" />
     <Compile Include="Events\MediaStateChangedEventArgs.cs" />
     <Compile Include="Extensions\ObservableCollection.cs" />
-    <Compile Include="Common\IDBRecord.cs" />
     <Compile Include="GlobalSuppressions.cs" />
-    <Compile Include="InitializeCore.cs" />
     <Compile Include="Models\Album.cs" />
     <Compile Include="Models\Artist.cs" />
     <Compile Include="Models\DiskItem.cs" />
     <Compile Include="Models\DiskItemLocationType.cs" />
     <Compile Include="Models\EqualizerBand.cs" />
     <Compile Include="Models\GroupKeys.cs" />
-    <Compile Include="Models\IGroupKey.cs" />
     <Compile Include="Models\Mediafile.cs" />
     <Compile Include="Models\MediaLocationType.cs" />
     <Compile Include="Models\Playlist.cs" />
@@ -145,9 +135,17 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\BreadPlayer.Framework\BreadPlayer.Framework.csproj">
-      <Project>{f22742c9-7088-4325-9f87-0a1aa34dda74}</Project>
-      <Name>BreadPlayer.Framework</Name>
+    <ProjectReference Include="..\BreadPlayer.Common\BreadPlayer.Common.csproj">
+      <Project>{47af841a-4b78-490d-8915-7f58cdbdbeb3}</Project>
+      <Name>BreadPlayer.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\BreadPlayer.Extensions\BreadPlayer.Extensions.csproj">
+      <Project>{e5851a02-a8ce-4f4d-8b5f-0986013ae830}</Project>
+      <Name>BreadPlayer.Extensions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\BreadPlayer.Interfaces\BreadPlayer.Interfaces.csproj">
+      <Project>{412718bb-903f-482f-8577-99b8efcd96d2}</Project>
+      <Name>BreadPlayer.Interfaces</Name>
     </ProjectReference>
     <ProjectReference Include="..\BreadPlayer.Parsers\BreadPlayer.Parsers.csproj">
       <Project>{ec3f27a8-ab79-420f-aef2-8d3316abab3c}</Project>
@@ -157,6 +155,9 @@
   <ItemGroup>
     <None Include="project.json" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="BreadLogger\" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/BreadPlayer.Core/Common/ConfigSaver.cs b/BreadPlayer.Core/Common/ConfigSaver.cs
@@ -1,4 +1,5 @@
 using BreadPlayer.Core.Models;
+using BreadPlayer.Interfaces;
 using Newtonsoft.Json;
 using System.Collections.Generic;
 using System.Linq;
@@ -64,9 +65,9 @@ public EqualizerSettings MakeSetting(string name, Dictionary<string, float> band
             return equalizerSettings;
         }
 
-        public IEnumerable<EqualizerSettings> GetSettings()
+        public IEnumerable<IEqualizerSettings> GetSettings()
         {
-            var savedPresets = InitializeCore.EqualizerSettingsHelper.LoadEqualizerPresets();
+            var savedPresets = InitializeSwitch.EqualizerSettingsHelper.LoadEqualizerPresets();
             if(savedPresets?.Any() == true)
             {
                 return savedPresets;

diff --git a/BreadPlayer.Core/Common/DelegateCommand.cs b/BreadPlayer.Core/Common/DelegateCommand.cs
@@ -16,6 +16,7 @@ You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+using BreadPlayer.Interfaces;
 using System;
 using System.Diagnostics;
 

diff --git a/BreadPlayer.Core/Common/IEqualizerSettingsHelper.cs b/BreadPlayer.Core/Common/IEqualizerSettingsHelper.cs
diff --git a/BreadPlayer.Core/Engines/BASSEngine/BASSPlayerEngine.cs b/BreadPlayer.Core/Engines/BASSEngine/BASSPlayerEngine.cs
@@ -105,7 +105,7 @@ await Task.Run(() =>
         public async Task ChangeDevice(string deviceName = null)
         {
             if (deviceName != null)
-                await InitializeCore.NotificationManager.ShowMessageAsync($"Transitioning to {deviceName}.", 5);
+                await InitializeSwitch.NotificationManager.ShowMessageAsync($"Transitioning to {deviceName}.", 5);
 
             await Task.Run(() =>
             {
@@ -122,7 +122,7 @@ await Task.Run(() =>
                             PlayerState = PlayerState.Paused;
                         }
 
-                        if (InitializeCore.IsMobile)
+                        if (InitializeSwitch.IsMobile)
                             NativeMethods.BASS_SetConfig(NativeMethods.BassConfigDevBuffer, (int)DeviceBufferSize);
 
                         Bass.Init();
@@ -138,7 +138,7 @@ await Task.Run(() =>
             });
 
             if (deviceName != null)
-                await InitializeCore.NotificationManager.ShowMessageAsync($"Transition to {deviceName} complete.", 5);
+                await InitializeSwitch.NotificationManager.ShowMessageAsync($"Transition to {deviceName} complete.", 5);
         }
         public async Task<bool> LoadURLAsync(Mediafile mediafile, string uri)
         {
@@ -241,7 +241,7 @@ public async Task<bool> LoadLocalFileAsync(Mediafile mediaFile)
             else
             {
                 string error = "The file " + mediaFile?.OrginalFilename + " is either corrupt, incomplete or unavailable. \r\n\r\n Exception details: No data available.";
-                await InitializeCore.NotificationManager.ShowMessageAsync(error);                
+                await InitializeSwitch.NotificationManager.ShowMessageAsync(error);                
                 return false;
             }
         }
@@ -253,7 +253,7 @@ private async Task<bool> LoadMusicAsync(Action LoadMusicAction)
         {
             try
             {
-                await InitializeCore.Dispatcher.RunAsync(() =>
+                await InitializeSwitch.Dispatcher.RunAsync(() =>
                 {
                     MediaChanging?.Invoke(this, new EventArgs());
                 });
@@ -273,7 +273,7 @@ await Task.Run(() =>
                         Bass.ChannelSetSync(_handle, SyncFlags.Position, Bass.ChannelSeconds2Bytes(_handle, Length - 15), _posSync);
 
                     });
-                if (InitializeCore.IsMobile)
+                if (InitializeSwitch.IsMobile)
                     await ChangeDevice();
                 if (Equalizer == null)
                 {
@@ -290,7 +290,7 @@ await Task.Run(() =>
             catch (Exception ex)
             {
                 BLogger.E("An error occured while loading music. Action {action}", ex, LoadMusicAction.ToString());
-                await InitializeCore.NotificationManager.ShowMessageAsync(ex.Message);
+                await InitializeSwitch.NotificationManager.ShowMessageAsync(ex.Message);
                 return false;
             }
         }

diff --git a/BreadPlayer.Core/Engines/BASSEngine/BassEqualizer.cs b/BreadPlayer.Core/Engines/BASSEngine/BassEqualizer.cs
@@ -1,6 +1,7 @@
 using BreadPlayer.Core.Common;
 using BreadPlayer.Core.Engines.Interfaces;
 using BreadPlayer.Core.Models;
+using BreadPlayer.Interfaces;
 using ManagedBass;
 using ManagedBass.Fx;
 using System;
@@ -22,8 +23,8 @@ public BassEqualizer(int coreHandle)
             IsPreampAvailable = true;
 
             Bands = new ObservableCollection<IEqualizerBand>();
-            Presets = new ObservableCollection<EqualizerSettings>(new ConfigSaver().GetSettings());           
-            EqualizerSettings = InitializeCore.EqualizerSettingsHelper.LoadEqualizerSettings("CustomEq").settings;
+            Presets = new ObservableCollection<IEqualizerSettings>(new ConfigSaver().GetSettings());           
+            EqualizerSettings = InitializeSwitch.EqualizerSettingsHelper.LoadEqualizerSettings("CustomEq").settings;
             Name = EqualizerSettings.Name;
             SelectedPreset = Presets.IndexOf(Presets.FirstOrDefault(t => t.Name == EqualizerSettings.Name));
 

diff --git a/BreadPlayer.Core/Engines/Interfaces/IEqualizer.cs b/BreadPlayer.Core/Engines/Interfaces/IEqualizer.cs
@@ -1,4 +1,5 @@
 using BreadPlayer.Core.Models;
+using BreadPlayer.Interfaces;
 using System.Collections.ObjectModel;
 using System.Linq;
 
@@ -21,8 +22,8 @@ public abstract class Equalizer : ObservableObject
               new[] {8000f, 1f, 0f},
               new[] {16000f, 1f, 0f }
         };
-        public EqualizerSettings EqualizerSettings { get; set; }
-        public ObservableCollection<EqualizerSettings> Presets { get; set; }
+        public IEqualizerSettings EqualizerSettings { get; set; }
+        public ObservableCollection<IEqualizerSettings> Presets { get; set; }
         private int _selectedPreset = -1;
 
         public int SelectedPreset
@@ -91,8 +92,8 @@ public void SaveEqualizerSettings()
             }
             equalizerSettings.GainValues = Bands.ToDictionary(b => b.BandCaption, b => b.Gain);
             equalizerSettings.IsEnabled = IsEnabled;
-            InitializeCore.EqualizerSettingsHelper.SaveEqualizerSettings(equalizerSettings, 1);
-            InitializeCore.EqualizerSettingsHelper.SaveEqualizerPresets(Presets);
+            InitializeSwitch.EqualizerSettingsHelper.SaveEqualizerSettings(equalizerSettings, 1);
+            InitializeSwitch.EqualizerSettingsHelper.SaveEqualizerPresets(Presets);
         }
 
         public void SetToDefault()

diff --git a/BreadPlayer.Core/InitializeCore.cs b/BreadPlayer.Core/InitializeCore.cs
diff --git a/BreadPlayer.Core/Models/Album.cs b/BreadPlayer.Core/Models/Album.cs
@@ -1,6 +1,5 @@
-using BreadPlayer.Core.Common;
+using BreadPlayer.Interfaces;
 using LiteDB;
-using Newtonsoft.Json;
 using System;
 
 namespace BreadPlayer.Core.Models

diff --git a/BreadPlayer.Core/Models/Artist.cs b/BreadPlayer.Core/Models/Artist.cs
@@ -1,6 +1,5 @@
-using BreadPlayer.Core.Common;
+using BreadPlayer.Interfaces;
 using LiteDB;
-using Newtonsoft.Json;
 
 namespace BreadPlayer.Core.Models
 {

diff --git a/BreadPlayer.Core/Models/ChildSong.cs b/BreadPlayer.Core/Models/ChildSong.cs
@@ -1,4 +1,5 @@
 using BreadPlayer.Core.Common;
+using BreadPlayer.Interfaces;
 
 namespace BreadPlayer.Core.Models
 {

diff --git a/BreadPlayer.Core/Models/EqualizerSettings.cs b/BreadPlayer.Core/Models/EqualizerSettings.cs
@@ -1,8 +1,9 @@
-using System.Collections.Generic;
+using BreadPlayer.Interfaces;
+using System.Collections.Generic;
 
 namespace BreadPlayer.Core.Models
 {
-    public class EqualizerSettings
+    public class EqualizerSettings : IEqualizerSettings
     {
         public string Name { get; set; }
         public Dictionary<string, float> GainValues { get; set; }

diff --git a/BreadPlayer.Core/Models/GroupKeys.cs b/BreadPlayer.Core/Models/GroupKeys.cs
@@ -1,4 +1,6 @@
-namespace BreadPlayer.Core.Models
+using BreadPlayer.Interfaces;
+
+namespace BreadPlayer.Core.Models
 {
     public class AlbumGroupKey : IGroupKey
     {

diff --git a/BreadPlayer.Core/Models/Mediafile.cs b/BreadPlayer.Core/Models/Mediafile.cs
@@ -17,13 +17,14 @@ You should have received a copy of the GNU General Public License
 */
 
 using BreadPlayer.Core.Common;
+using BreadPlayer.Interfaces;
 using LiteDB;
 using Newtonsoft.Json;
 using System;
 
 namespace BreadPlayer.Core.Models
 {
-    public class Mediafile : ObservableObject, IComparable<Mediafile>, IDbRecord, ISelectable, IPinnable
+    public class Mediafile : ObservableObject, IComparable<IMediafile>, IDbRecord, ISelectable, IPinnable, IMediafile
     {
         #region Fields
 
@@ -196,7 +197,7 @@ public bool IsSelected
 
         public string TextSearchKey => GetTextSearchKey().ToLower();
 
-        public int CompareTo(Mediafile compareTo)
+        public int CompareTo(IMediafile compareTo)
         {
             return Title.CompareTo(compareTo.Title);
         }