diff --git a/src/Artemis.Core/Artemis.Core.csproj b/src/Artemis.Core/Artemis.Core.csproj index e48a7c924..aea12b7f3 100644 --- a/src/Artemis.Core/Artemis.Core.csproj +++ b/src/Artemis.Core/Artemis.Core.csproj @@ -9,7 +9,7 @@ Properties Artemis.Core Artemis.Core - v4.6.1 + v4.7.2 512 @@ -93,6 +93,9 @@ + + ..\packages\System.Diagnostics.DiagnosticSource.4.5.1\lib\net46\System.Diagnostics.DiagnosticSource.dll + @@ -105,6 +108,7 @@ + @@ -117,7 +121,7 @@ - + @@ -136,7 +140,6 @@ - diff --git a/src/Artemis.Core/Ninject/CoreModule.cs b/src/Artemis.Core/Ninject/CoreModule.cs index 6b1c062c2..458f01162 100644 --- a/src/Artemis.Core/Ninject/CoreModule.cs +++ b/src/Artemis.Core/Ninject/CoreModule.cs @@ -1,4 +1,6 @@ -using Artemis.Core.Services.Interfaces; +using Artemis.Core.Plugins.Models; +using Artemis.Core.Services.Interfaces; +using Artemis.Storage.Repositories; using Ninject.Extensions.Conventions; using Ninject.Modules; @@ -17,6 +19,18 @@ namespace Artemis.Core.Ninject .BindAllInterfaces() .Configure(c => c.InSingletonScope()); }); + + // Bind all repositories as singletons + Kernel.Bind(x => + { + x.FromAssemblyContaining() + .SelectAllClasses() + .InheritedFrom() + .BindAllInterfaces() + .Configure(c => c.InSingletonScope()); + }); + + Kernel.Bind().ToProvider(); } } } \ No newline at end of file diff --git a/src/Artemis.Core/Ninject/PluginSettingsProvider.cs b/src/Artemis.Core/Ninject/PluginSettingsProvider.cs new file mode 100644 index 000000000..ae0b15282 --- /dev/null +++ b/src/Artemis.Core/Ninject/PluginSettingsProvider.cs @@ -0,0 +1,27 @@ +using System.Linq; +using Artemis.Core.Exceptions; +using Artemis.Core.Plugins.Models; +using Artemis.Storage.Repositories; +using Ninject.Activation; + +namespace Artemis.Core.Ninject +{ + public class PluginSettingsProvider : Provider + { + private readonly ISettingRepository _settingRepository; + + public PluginSettingsProvider(ISettingRepository settingRepository) + { + _settingRepository = settingRepository; + } + + protected override PluginSettings CreateInstance(IContext context) + { + var pluginInfo = context.Request.ParentRequest?.Parameters.FirstOrDefault(p => p.Name == "PluginInfo")?.GetValue(context, null) as PluginInfo; + if (pluginInfo == null) + throw new ArtemisCoreException("A plugin needs to be initialized with PluginInfo as a parameter"); + + return new PluginSettings(pluginInfo, _settingRepository); + } + } +} \ No newline at end of file diff --git a/src/Artemis.Core/Plugins/Models/PluginInfo.cs b/src/Artemis.Core/Plugins/Models/PluginInfo.cs index 956ca67b6..654715475 100644 --- a/src/Artemis.Core/Plugins/Models/PluginInfo.cs +++ b/src/Artemis.Core/Plugins/Models/PluginInfo.cs @@ -15,21 +15,25 @@ namespace Artemis.Core.Plugins.Models /// /// The plugins GUID /// + [JsonProperty(Required = Required.Always)] public Guid Guid { get; internal set; } /// /// The name of the plugin /// + [JsonProperty(Required = Required.Always)] public string Name { get; internal set; } /// /// The version of the plugin /// - public string Version { get; internal set; } + [JsonProperty(Required = Required.Always)] + public Version Version { get; internal set; } /// /// The main entry DLL, should contain a class implementing Plugin /// + [JsonProperty(Required = Required.Always)] public string Main { get; internal set; } /// diff --git a/src/Artemis.Core/Plugins/Models/PluginSetting.cs b/src/Artemis.Core/Plugins/Models/PluginSetting.cs index 817eb5021..1a0c7fb71 100644 --- a/src/Artemis.Core/Plugins/Models/PluginSetting.cs +++ b/src/Artemis.Core/Plugins/Models/PluginSetting.cs @@ -9,9 +9,9 @@ namespace Artemis.Core.Plugins.Models { private readonly PluginInfo _pluginInfo; private readonly SettingEntity _settingEntity; - private readonly SettingRepository _settingRepository; + private readonly ISettingRepository _settingRepository; - internal PluginSetting(PluginInfo pluginInfo, SettingRepository settingRepository, SettingEntity settingEntity) + internal PluginSetting(PluginInfo pluginInfo, ISettingRepository settingRepository, SettingEntity settingEntity) { _pluginInfo = pluginInfo; _settingRepository = settingRepository; diff --git a/src/Artemis.Core/Plugins/Models/PluginSettings.cs b/src/Artemis.Core/Plugins/Models/PluginSettings.cs new file mode 100644 index 000000000..28bda4dfc --- /dev/null +++ b/src/Artemis.Core/Plugins/Models/PluginSettings.cs @@ -0,0 +1,35 @@ +using System.Collections.Generic; +using System.Linq; +using Artemis.Storage.Entities; +using Artemis.Storage.Repositories; +using Newtonsoft.Json; + +namespace Artemis.Core.Plugins.Models +{ + public class PluginSettings + { + private readonly PluginInfo _pluginInfo; + private readonly ISettingRepository _settingRepository; + private readonly Dictionary _settingEntities; + + public PluginSettings(PluginInfo pluginInfo, ISettingRepository settingRepository) + { + _pluginInfo = pluginInfo; + _settingRepository = settingRepository; + _settingEntities = settingRepository.GetByPluginGuid(_pluginInfo.Guid).ToDictionary(se => se.Name); + } + + public PluginSetting GetSetting(string name, T defaultValue = default) + { + if (_settingEntities.ContainsKey(name)) + return new PluginSetting(_pluginInfo, _settingRepository, _settingEntities[name]); + + var settingEntity = new SettingEntity {Name = name, PluginGuid = _pluginInfo.Guid, Value = JsonConvert.SerializeObject(defaultValue)}; + _settingRepository.Add(settingEntity); + _settingRepository.Save(); + + _settingEntities.Add(name, settingEntity); + return GetSetting(name, defaultValue); + } + } +} \ No newline at end of file diff --git a/src/Artemis.Core/Plugins/Models/PluginSettingsContainer.cs b/src/Artemis.Core/Plugins/Models/PluginSettingsContainer.cs deleted file mode 100644 index 4f608276f..000000000 --- a/src/Artemis.Core/Plugins/Models/PluginSettingsContainer.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using Artemis.Storage.Entities; -using Artemis.Storage.Repositories; - -namespace Artemis.Core.Plugins.Models -{ - public class PluginSettingsContainer - { - private readonly PluginInfo _pluginInfo; - private readonly SettingRepository _settingRepository; - private Task> _settings; - - internal PluginSettingsContainer(PluginInfo pluginInfo, SettingRepository settingRepository) - { - _pluginInfo = pluginInfo; - _settingRepository = settingRepository; - } - - public bool HasSettingChanged(string settingName) - { - return false; - } - - public bool HasAnySettingChanged() - { - return false; - } - } -} \ No newline at end of file diff --git a/src/Artemis.Core/Services/CoreService.cs b/src/Artemis.Core/Services/CoreService.cs index ce47d39c9..0cfa55bfb 100644 --- a/src/Artemis.Core/Services/CoreService.cs +++ b/src/Artemis.Core/Services/CoreService.cs @@ -13,7 +13,7 @@ namespace Artemis.Core.Services private readonly IPluginService _pluginService; private readonly IRgbService _rgbService; - public CoreService(IPluginService pluginService, IRgbService rgbService) + internal CoreService(IPluginService pluginService, IRgbService rgbService) { _pluginService = pluginService; _rgbService = rgbService; diff --git a/src/Artemis.Core/Services/MainDataModelService.cs b/src/Artemis.Core/Services/MainDataModelService.cs index 16064da64..5ee12411c 100644 --- a/src/Artemis.Core/Services/MainDataModelService.cs +++ b/src/Artemis.Core/Services/MainDataModelService.cs @@ -12,7 +12,7 @@ namespace Artemis.Core.Services { private readonly List _dataModelExpansions; - public MainDataModelService() + internal MainDataModelService() { _dataModelExpansions = new List(); } diff --git a/src/Artemis.Core/Services/PluginService.cs b/src/Artemis.Core/Services/PluginService.cs index d5e61d86a..36926545b 100644 --- a/src/Artemis.Core/Services/PluginService.cs +++ b/src/Artemis.Core/Services/PluginService.cs @@ -146,8 +146,12 @@ namespace Artemis.Core.Services var pluginType = pluginTypes.Single(); try { - var constructorArguments = new ConstructorArgument("pluginInfo", pluginInfo); - pluginInfo.Instance = (Plugin) _childKernel.Get(pluginType, constraint: null, parameters: constructorArguments); + var parameters = new IParameter[] + { + new ConstructorArgument("pluginInfo", pluginInfo), + new Parameter("PluginInfo", pluginInfo, false) + }; + pluginInfo.Instance = (Plugin) _childKernel.Get(pluginType, constraint: null, parameters: parameters); } catch (Exception e) { diff --git a/src/Artemis.Core/Services/RgbService.cs b/src/Artemis.Core/Services/RgbService.cs index 233942d6d..d7fb13246 100644 --- a/src/Artemis.Core/Services/RgbService.cs +++ b/src/Artemis.Core/Services/RgbService.cs @@ -16,7 +16,7 @@ namespace Artemis.Core.Services private readonly List _loadedDevices; private readonly TimerUpdateTrigger _updateTrigger; - public RgbService() + internal RgbService() { Surface = RGBSurface.Instance; LoadingDevices = false; diff --git a/src/Artemis.Core/Services/SettingsService.cs b/src/Artemis.Core/Services/SettingsService.cs deleted file mode 100644 index da8a78591..000000000 --- a/src/Artemis.Core/Services/SettingsService.cs +++ /dev/null @@ -1,26 +0,0 @@ -using Artemis.Core.Plugins.Models; -using Artemis.Core.Services.Interfaces; -using Artemis.Storage.Repositories; - -namespace Artemis.Core.Services -{ - // TODO: Rethink this :') - public class SettingsService : ISettingsService - { - private SettingRepository _settingRepository; - - public SettingsService() - { - _settingRepository = new SettingRepository(); - } - - public PluginSettingsContainer GetPluginSettings(PluginInfo pluginInfo) - { - return new PluginSettingsContainer(pluginInfo, _settingRepository); - } - } - - public interface ISettingsService : IArtemisService - { - } -} \ No newline at end of file diff --git a/src/Artemis.Core/Services/StorageService.cs b/src/Artemis.Core/Services/StorageService.cs index 51beefc84..3d5d4c3ea 100644 --- a/src/Artemis.Core/Services/StorageService.cs +++ b/src/Artemis.Core/Services/StorageService.cs @@ -12,7 +12,7 @@ namespace Artemis.Core.Services private readonly IPluginService _pluginService; private readonly ProfileRepository _profileRepository; - public StorageService(IPluginService pluginService) + internal StorageService(IPluginService pluginService) { _pluginService = pluginService; _profileRepository = new ProfileRepository(); diff --git a/src/Artemis.Core/app.config b/src/Artemis.Core/app.config index ec91ee1d6..52d8e8241 100644 --- a/src/Artemis.Core/app.config +++ b/src/Artemis.Core/app.config @@ -1,5 +1,4 @@  - @@ -28,8 +27,7 @@ - + @@ -53,8 +51,7 @@ - + @@ -70,8 +67,7 @@ - + @@ -87,8 +83,7 @@ - + @@ -96,8 +91,7 @@ - + @@ -111,6 +105,6 @@ - + - \ No newline at end of file + diff --git a/src/Artemis.Core/packages.config b/src/Artemis.Core/packages.config index 6dc3ac0de..575498e27 100644 --- a/src/Artemis.Core/packages.config +++ b/src/Artemis.Core/packages.config @@ -1,5 +1,4 @@  - @@ -14,4 +13,5 @@ + \ No newline at end of file diff --git a/src/Artemis.Plugins.LayerTypes.Brush/Artemis.Plugins.LayerTypes.Brush.csproj b/src/Artemis.Plugins.LayerTypes.Brush/Artemis.Plugins.LayerTypes.Brush.csproj index 1ebbf9ab2..cc9117674 100644 --- a/src/Artemis.Plugins.LayerTypes.Brush/Artemis.Plugins.LayerTypes.Brush.csproj +++ b/src/Artemis.Plugins.LayerTypes.Brush/Artemis.Plugins.LayerTypes.Brush.csproj @@ -9,9 +9,10 @@ Properties Artemis.Plugins.LayerTypes.Brush Artemis.Plugins.LayerTypes.Brush - v4.6.1 + v4.7.2 512 true + true @@ -48,8 +49,7 @@ - ..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll - False + ..\packages\System.ValueTuple.4.4.0\lib\net47\System.ValueTuple.dll diff --git a/src/Artemis.Plugins.LayerTypes.Brush/app.config b/src/Artemis.Plugins.LayerTypes.Brush/app.config index 8d070a7b6..552bc9380 100644 --- a/src/Artemis.Plugins.LayerTypes.Brush/app.config +++ b/src/Artemis.Plugins.LayerTypes.Brush/app.config @@ -1,5 +1,4 @@  - @@ -9,4 +8,4 @@ - \ No newline at end of file + diff --git a/src/Artemis.Plugins.LayerTypes.Brush/packages.config b/src/Artemis.Plugins.LayerTypes.Brush/packages.config index 046348732..3fbd5a7c0 100644 --- a/src/Artemis.Plugins.LayerTypes.Brush/packages.config +++ b/src/Artemis.Plugins.LayerTypes.Brush/packages.config @@ -1,8 +1,7 @@  - - + \ No newline at end of file diff --git a/src/Artemis.Plugins.LayerTypes.Brush/plugin.json b/src/Artemis.Plugins.LayerTypes.Brush/plugin.json index 7f5a0b307..5dfc20629 100644 --- a/src/Artemis.Plugins.LayerTypes.Brush/plugin.json +++ b/src/Artemis.Plugins.LayerTypes.Brush/plugin.json @@ -1,5 +1,10 @@ { + "Guid": "92a9d6ba-6f7a-4937-94d5-c1d715b4141a", "Name": "Brush layer", - "Version": "1.0.0", + "Version": { + "Major": 1, + "Minor": 0, + "Build": 0 + }, "Main": "Artemis.Plugins.LayerTypes.Brush.dll" -} \ No newline at end of file +} diff --git a/src/Artemis.Plugins.Modules.General/Artemis.Plugins.Modules.General.csproj b/src/Artemis.Plugins.Modules.General/Artemis.Plugins.Modules.General.csproj index 357fe9ac1..31b8b0d56 100644 --- a/src/Artemis.Plugins.Modules.General/Artemis.Plugins.Modules.General.csproj +++ b/src/Artemis.Plugins.Modules.General/Artemis.Plugins.Modules.General.csproj @@ -9,9 +9,10 @@ Properties Artemis.Plugins.Modules.General Artemis.Plugins.Modules.General - v4.6.1 + v4.7.2 512 true + true @@ -52,8 +53,7 @@ False - ..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll - False + ..\packages\System.ValueTuple.4.4.0\lib\net47\System.ValueTuple.dll diff --git a/src/Artemis.Plugins.Modules.General/GeneralModule.cs b/src/Artemis.Plugins.Modules.General/GeneralModule.cs index 67ea1ad87..0916e6408 100644 --- a/src/Artemis.Plugins.Modules.General/GeneralModule.cs +++ b/src/Artemis.Plugins.Modules.General/GeneralModule.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Drawing; using Artemis.Core; using Artemis.Core.Plugins.Abstract; @@ -15,11 +16,13 @@ namespace Artemis.Plugins.Modules.General { public class GeneralModule : Module { + private readonly PluginSettings _settings; private readonly RGBSurface _surface; private Dictionary _colors; - public GeneralModule(PluginInfo pluginInfo, IRgbService rgbService) : base(pluginInfo) + public GeneralModule(PluginInfo pluginInfo, IRgbService rgbService, PluginSettings settings) : base(pluginInfo) { + _settings = settings; DisplayName = "General"; ExpandsMainDataModel = true; @@ -27,6 +30,8 @@ namespace Artemis.Plugins.Modules.General _colors = new Dictionary(); rgbService.FinishedLoadedDevices += (sender, args) => PopulateColors(); + + var testSetting = _settings.GetSetting("TestSetting", DateTime.Now); } public override void EnablePlugin() diff --git a/src/Artemis.Plugins.Modules.General/app.config b/src/Artemis.Plugins.Modules.General/app.config index 8d070a7b6..552bc9380 100644 --- a/src/Artemis.Plugins.Modules.General/app.config +++ b/src/Artemis.Plugins.Modules.General/app.config @@ -1,5 +1,4 @@  - @@ -9,4 +8,4 @@ - \ No newline at end of file + diff --git a/src/Artemis.Plugins.Modules.General/packages.config b/src/Artemis.Plugins.Modules.General/packages.config index a7463e291..cc1481525 100644 --- a/src/Artemis.Plugins.Modules.General/packages.config +++ b/src/Artemis.Plugins.Modules.General/packages.config @@ -1,9 +1,8 @@  - - + \ No newline at end of file diff --git a/src/Artemis.Plugins.Modules.General/plugin.json b/src/Artemis.Plugins.Modules.General/plugin.json index 2b8b086c0..dc42f8911 100644 --- a/src/Artemis.Plugins.Modules.General/plugin.json +++ b/src/Artemis.Plugins.Modules.General/plugin.json @@ -1,5 +1,10 @@ { + "Guid": "0de2991a-d7b8-4f61-ae4e-6623849215b5", "Name": "General module", - "Version": "1.0.0", + "Version": { + "Major": 1, + "Minor": 0, + "Build": 0 + }, "Main": "Artemis.Plugins.Modules.General.dll" -} \ No newline at end of file +} diff --git a/src/Artemis.Storage/Artemis.Storage.csproj b/src/Artemis.Storage/Artemis.Storage.csproj index 74be88786..070cafdc1 100644 --- a/src/Artemis.Storage/Artemis.Storage.csproj +++ b/src/Artemis.Storage/Artemis.Storage.csproj @@ -1,12 +1,9 @@  - net461 + net472 AnyCPU;x64 - - - diff --git a/src/Artemis.Storage/Entities/SettingEntity.cs b/src/Artemis.Storage/Entities/SettingEntity.cs index 520235cc6..0ecc277c8 100644 --- a/src/Artemis.Storage/Entities/SettingEntity.cs +++ b/src/Artemis.Storage/Entities/SettingEntity.cs @@ -5,11 +5,9 @@ namespace Artemis.Storage.Entities { public class SettingEntity { - [Key] - public string Name { get; set; } - public Guid PluginGuid { get; set; } - + public string Name { get; set; } + public string Value { get; set; } } } \ No newline at end of file diff --git a/src/Artemis.Storage/Migrations/20180406175247_InitialCreate.Designer.cs b/src/Artemis.Storage/Migrations/20180406175247_InitialCreate.Designer.cs deleted file mode 100644 index 751d62e85..000000000 --- a/src/Artemis.Storage/Migrations/20180406175247_InitialCreate.Designer.cs +++ /dev/null @@ -1,191 +0,0 @@ -// -using Artemis.Storage; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage; -using Microsoft.EntityFrameworkCore.Storage.Internal; -using System; - -namespace Artemis.Storage.Migrations -{ - [DbContext(typeof(StorageContext))] - [Migration("20180406175247_InitialCreate")] - partial class InitialCreate - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "2.0.2-rtm-10011"); - - modelBuilder.Entity("Artemis.Storage.Entities.FolderEntity", b => - { - b.Property("Guid") - .ValueGeneratedOnAdd(); - - b.Property("FolderEntityGuid"); - - b.Property("Name"); - - b.Property("Order"); - - b.HasKey("Guid"); - - b.HasIndex("FolderEntityGuid"); - - b.ToTable("Folders"); - }); - - modelBuilder.Entity("Artemis.Storage.Entities.KeypointEntity", b => - { - b.Property("Guid") - .ValueGeneratedOnAdd(); - - b.Property("LayerSettingEntityGuid"); - - b.Property("Time"); - - b.Property("Value"); - - b.HasKey("Guid"); - - b.HasIndex("LayerSettingEntityGuid"); - - b.ToTable("Keypoints"); - }); - - modelBuilder.Entity("Artemis.Storage.Entities.LayerEntity", b => - { - b.Property("Guid") - .ValueGeneratedOnAdd(); - - b.Property("FolderEntityGuid"); - - b.Property("Name"); - - b.Property("Order"); - - b.HasKey("Guid"); - - b.HasIndex("FolderEntityGuid"); - - b.ToTable("Layers"); - }); - - modelBuilder.Entity("Artemis.Storage.Entities.LayerSettingEntity", b => - { - b.Property("Guid") - .ValueGeneratedOnAdd(); - - b.Property("LayerEntityGuid"); - - b.Property("Name"); - - b.Property("Value"); - - b.HasKey("Guid"); - - b.HasIndex("LayerEntityGuid"); - - b.ToTable("LayerSettings"); - }); - - modelBuilder.Entity("Artemis.Storage.Entities.LedEntity", b => - { - b.Property("Guid") - .ValueGeneratedOnAdd(); - - b.Property("LayerGuid"); - - b.Property("LayerId"); - - b.Property("LedName"); - - b.Property("LimitedToDevice"); - - b.HasKey("Guid"); - - b.HasIndex("LayerGuid"); - - b.ToTable("Leds"); - }); - - modelBuilder.Entity("Artemis.Storage.Entities.ProfileEntity", b => - { - b.Property("Guid") - .ValueGeneratedOnAdd(); - - b.Property("Name"); - - b.Property("PluginGuid"); - - b.Property("RootFolderGuid"); - - b.Property("RootFolderId"); - - b.HasKey("Guid"); - - b.HasIndex("RootFolderGuid"); - - b.ToTable("Profiles"); - }); - - modelBuilder.Entity("Artemis.Storage.Entities.SettingEntity", b => - { - b.Property("Name") - .ValueGeneratedOnAdd(); - - b.Property("Value"); - - b.HasKey("Name"); - - b.ToTable("Settings"); - }); - - modelBuilder.Entity("Artemis.Storage.Entities.FolderEntity", b => - { - b.HasOne("Artemis.Storage.Entities.FolderEntity") - .WithMany("Folders") - .HasForeignKey("FolderEntityGuid"); - }); - - modelBuilder.Entity("Artemis.Storage.Entities.KeypointEntity", b => - { - b.HasOne("Artemis.Storage.Entities.LayerSettingEntity") - .WithMany("Keypoints") - .HasForeignKey("LayerSettingEntityGuid"); - }); - - modelBuilder.Entity("Artemis.Storage.Entities.LayerEntity", b => - { - b.HasOne("Artemis.Storage.Entities.FolderEntity") - .WithMany("Layers") - .HasForeignKey("FolderEntityGuid"); - }); - - modelBuilder.Entity("Artemis.Storage.Entities.LayerSettingEntity", b => - { - b.HasOne("Artemis.Storage.Entities.LayerEntity") - .WithMany("Settings") - .HasForeignKey("LayerEntityGuid"); - }); - - modelBuilder.Entity("Artemis.Storage.Entities.LedEntity", b => - { - b.HasOne("Artemis.Storage.Entities.LayerEntity", "Layer") - .WithMany("Leds") - .HasForeignKey("LayerGuid"); - }); - - modelBuilder.Entity("Artemis.Storage.Entities.ProfileEntity", b => - { - b.HasOne("Artemis.Storage.Entities.FolderEntity", "RootFolder") - .WithMany() - .HasForeignKey("RootFolderGuid"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/src/Artemis.Storage/Migrations/20180406175247_InitialCreate.cs b/src/Artemis.Storage/Migrations/20180406175247_InitialCreate.cs deleted file mode 100644 index 979e01f61..000000000 --- a/src/Artemis.Storage/Migrations/20180406175247_InitialCreate.cs +++ /dev/null @@ -1,196 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace Artemis.Storage.Migrations -{ - public partial class InitialCreate : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - "Folders", - table => new - { - Guid = table.Column(), - FolderEntityGuid = table.Column(nullable: true), - Name = table.Column(nullable: true), - Order = table.Column() - }, - constraints: table => - { - table.PrimaryKey("PK_Folders", x => x.Guid); - table.ForeignKey( - "FK_Folders_Folders_FolderEntityGuid", - x => x.FolderEntityGuid, - "Folders", - "Guid", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateTable( - "Settings", - table => new - { - Name = table.Column(), - Value = table.Column(nullable: true) - }, - constraints: table => { table.PrimaryKey("PK_Settings", x => x.Name); }); - - migrationBuilder.CreateTable( - "Layers", - table => new - { - Guid = table.Column(), - FolderEntityGuid = table.Column(nullable: true), - Name = table.Column(nullable: true), - Order = table.Column() - }, - constraints: table => - { - table.PrimaryKey("PK_Layers", x => x.Guid); - table.ForeignKey( - "FK_Layers_Folders_FolderEntityGuid", - x => x.FolderEntityGuid, - "Folders", - "Guid", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateTable( - "Profiles", - table => new - { - Guid = table.Column(), - Name = table.Column(nullable: true), - PluginGuid = table.Column(), - RootFolderGuid = table.Column(nullable: true), - RootFolderId = table.Column() - }, - constraints: table => - { - table.PrimaryKey("PK_Profiles", x => x.Guid); - table.ForeignKey( - "FK_Profiles_Folders_RootFolderGuid", - x => x.RootFolderGuid, - "Folders", - "Guid", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateTable( - "LayerSettings", - table => new - { - Guid = table.Column(), - LayerEntityGuid = table.Column(nullable: true), - Name = table.Column(nullable: true), - Value = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_LayerSettings", x => x.Guid); - table.ForeignKey( - "FK_LayerSettings_Layers_LayerEntityGuid", - x => x.LayerEntityGuid, - "Layers", - "Guid", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateTable( - "Leds", - table => new - { - Guid = table.Column(), - LayerGuid = table.Column(nullable: true), - LayerId = table.Column(), - LedName = table.Column(nullable: true), - LimitedToDevice = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_Leds", x => x.Guid); - table.ForeignKey( - "FK_Leds_Layers_LayerGuid", - x => x.LayerGuid, - "Layers", - "Guid", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateTable( - "Keypoints", - table => new - { - Guid = table.Column(), - LayerSettingEntityGuid = table.Column(nullable: true), - Time = table.Column(), - Value = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_Keypoints", x => x.Guid); - table.ForeignKey( - "FK_Keypoints_LayerSettings_LayerSettingEntityGuid", - x => x.LayerSettingEntityGuid, - "LayerSettings", - "Guid", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateIndex( - "IX_Folders_FolderEntityGuid", - "Folders", - "FolderEntityGuid"); - - migrationBuilder.CreateIndex( - "IX_Keypoints_LayerSettingEntityGuid", - "Keypoints", - "LayerSettingEntityGuid"); - - migrationBuilder.CreateIndex( - "IX_Layers_FolderEntityGuid", - "Layers", - "FolderEntityGuid"); - - migrationBuilder.CreateIndex( - "IX_LayerSettings_LayerEntityGuid", - "LayerSettings", - "LayerEntityGuid"); - - migrationBuilder.CreateIndex( - "IX_Leds_LayerGuid", - "Leds", - "LayerGuid"); - - migrationBuilder.CreateIndex( - "IX_Profiles_RootFolderGuid", - "Profiles", - "RootFolderGuid"); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - "Keypoints"); - - migrationBuilder.DropTable( - "Leds"); - - migrationBuilder.DropTable( - "Profiles"); - - migrationBuilder.DropTable( - "Settings"); - - migrationBuilder.DropTable( - "LayerSettings"); - - migrationBuilder.DropTable( - "Layers"); - - migrationBuilder.DropTable( - "Folders"); - } - } -} \ No newline at end of file diff --git a/src/Artemis.Storage/Migrations/20190415185618_SettingsPluginGuid.cs b/src/Artemis.Storage/Migrations/20190415185618_SettingsPluginGuid.cs deleted file mode 100644 index 16ba76f23..000000000 --- a/src/Artemis.Storage/Migrations/20190415185618_SettingsPluginGuid.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace Artemis.Storage.Migrations -{ - public partial class SettingsPluginGuid : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "PluginGuid", - table: "Settings", - nullable: false, - defaultValue: new Guid("00000000-0000-0000-0000-000000000000")); - - migrationBuilder.CreateIndex( - name: "IX_Settings_Name_PluginGuid", - table: "Settings", - columns: new[] { "Name", "PluginGuid" }); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropIndex( - name: "IX_Settings_Name_PluginGuid", - table: "Settings"); - - migrationBuilder.DropColumn( - name: "PluginGuid", - table: "Settings"); - } - } -} diff --git a/src/Artemis.Storage/Migrations/20190415185618_SettingsPluginGuid.Designer.cs b/src/Artemis.Storage/Migrations/20190417180145_InitialCreate.Designer.cs similarity index 95% rename from src/Artemis.Storage/Migrations/20190415185618_SettingsPluginGuid.Designer.cs rename to src/Artemis.Storage/Migrations/20190417180145_InitialCreate.Designer.cs index 1e59124a9..c62731c83 100644 --- a/src/Artemis.Storage/Migrations/20190415185618_SettingsPluginGuid.Designer.cs +++ b/src/Artemis.Storage/Migrations/20190417180145_InitialCreate.Designer.cs @@ -9,8 +9,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace Artemis.Storage.Migrations { [DbContext(typeof(StorageContext))] - [Migration("20190415185618_SettingsPluginGuid")] - partial class SettingsPluginGuid + [Migration("20190417180145_InitialCreate")] + partial class InitialCreate { protected override void BuildTargetModel(ModelBuilder modelBuilder) { @@ -132,16 +132,13 @@ namespace Artemis.Storage.Migrations modelBuilder.Entity("Artemis.Storage.Entities.SettingEntity", b => { - b.Property("Name") - .ValueGeneratedOnAdd(); + b.Property("Name"); b.Property("PluginGuid"); b.Property("Value"); - b.HasKey("Name"); - - b.HasIndex("Name", "PluginGuid"); + b.HasKey("Name", "PluginGuid"); b.ToTable("Settings"); }); diff --git a/src/Artemis.Storage/Migrations/20190417180145_InitialCreate.cs b/src/Artemis.Storage/Migrations/20190417180145_InitialCreate.cs new file mode 100644 index 000000000..d07231fdf --- /dev/null +++ b/src/Artemis.Storage/Migrations/20190417180145_InitialCreate.cs @@ -0,0 +1,200 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace Artemis.Storage.Migrations +{ + public partial class InitialCreate : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "Folders", + columns: table => new + { + Guid = table.Column(nullable: false), + Order = table.Column(nullable: false), + Name = table.Column(nullable: true), + FolderEntityGuid = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Folders", x => x.Guid); + table.ForeignKey( + name: "FK_Folders_Folders_FolderEntityGuid", + column: x => x.FolderEntityGuid, + principalTable: "Folders", + principalColumn: "Guid", + onDelete: ReferentialAction.Restrict); + }); + + migrationBuilder.CreateTable( + name: "Settings", + columns: table => new + { + PluginGuid = table.Column(nullable: false), + Name = table.Column(nullable: false), + Value = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Settings", x => new { x.Name, x.PluginGuid }); + }); + + migrationBuilder.CreateTable( + name: "Layers", + columns: table => new + { + Guid = table.Column(nullable: false), + Order = table.Column(nullable: false), + Name = table.Column(nullable: true), + FolderEntityGuid = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Layers", x => x.Guid); + table.ForeignKey( + name: "FK_Layers_Folders_FolderEntityGuid", + column: x => x.FolderEntityGuid, + principalTable: "Folders", + principalColumn: "Guid", + onDelete: ReferentialAction.Restrict); + }); + + migrationBuilder.CreateTable( + name: "Profiles", + columns: table => new + { + Guid = table.Column(nullable: false), + PluginGuid = table.Column(nullable: false), + Name = table.Column(nullable: true), + RootFolderId = table.Column(nullable: false), + RootFolderGuid = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Profiles", x => x.Guid); + table.ForeignKey( + name: "FK_Profiles_Folders_RootFolderGuid", + column: x => x.RootFolderGuid, + principalTable: "Folders", + principalColumn: "Guid", + onDelete: ReferentialAction.Restrict); + }); + + migrationBuilder.CreateTable( + name: "LayerSettings", + columns: table => new + { + Guid = table.Column(nullable: false), + Name = table.Column(nullable: true), + Value = table.Column(nullable: true), + LayerEntityGuid = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_LayerSettings", x => x.Guid); + table.ForeignKey( + name: "FK_LayerSettings_Layers_LayerEntityGuid", + column: x => x.LayerEntityGuid, + principalTable: "Layers", + principalColumn: "Guid", + onDelete: ReferentialAction.Restrict); + }); + + migrationBuilder.CreateTable( + name: "Leds", + columns: table => new + { + Guid = table.Column(nullable: false), + LedName = table.Column(nullable: true), + LimitedToDevice = table.Column(nullable: true), + LayerId = table.Column(nullable: false), + LayerGuid = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Leds", x => x.Guid); + table.ForeignKey( + name: "FK_Leds_Layers_LayerGuid", + column: x => x.LayerGuid, + principalTable: "Layers", + principalColumn: "Guid", + onDelete: ReferentialAction.Restrict); + }); + + migrationBuilder.CreateTable( + name: "Keypoints", + columns: table => new + { + Guid = table.Column(nullable: false), + Time = table.Column(nullable: false), + Value = table.Column(nullable: true), + LayerSettingEntityGuid = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Keypoints", x => x.Guid); + table.ForeignKey( + name: "FK_Keypoints_LayerSettings_LayerSettingEntityGuid", + column: x => x.LayerSettingEntityGuid, + principalTable: "LayerSettings", + principalColumn: "Guid", + onDelete: ReferentialAction.Restrict); + }); + + migrationBuilder.CreateIndex( + name: "IX_Folders_FolderEntityGuid", + table: "Folders", + column: "FolderEntityGuid"); + + migrationBuilder.CreateIndex( + name: "IX_Keypoints_LayerSettingEntityGuid", + table: "Keypoints", + column: "LayerSettingEntityGuid"); + + migrationBuilder.CreateIndex( + name: "IX_Layers_FolderEntityGuid", + table: "Layers", + column: "FolderEntityGuid"); + + migrationBuilder.CreateIndex( + name: "IX_LayerSettings_LayerEntityGuid", + table: "LayerSettings", + column: "LayerEntityGuid"); + + migrationBuilder.CreateIndex( + name: "IX_Leds_LayerGuid", + table: "Leds", + column: "LayerGuid"); + + migrationBuilder.CreateIndex( + name: "IX_Profiles_RootFolderGuid", + table: "Profiles", + column: "RootFolderGuid"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "Keypoints"); + + migrationBuilder.DropTable( + name: "Leds"); + + migrationBuilder.DropTable( + name: "Profiles"); + + migrationBuilder.DropTable( + name: "Settings"); + + migrationBuilder.DropTable( + name: "LayerSettings"); + + migrationBuilder.DropTable( + name: "Layers"); + + migrationBuilder.DropTable( + name: "Folders"); + } + } +} diff --git a/src/Artemis.Storage/Migrations/StorageContextModelSnapshot.cs b/src/Artemis.Storage/Migrations/StorageContextModelSnapshot.cs index c433fddb1..6ecde8ea8 100644 --- a/src/Artemis.Storage/Migrations/StorageContextModelSnapshot.cs +++ b/src/Artemis.Storage/Migrations/StorageContextModelSnapshot.cs @@ -130,16 +130,13 @@ namespace Artemis.Storage.Migrations modelBuilder.Entity("Artemis.Storage.Entities.SettingEntity", b => { - b.Property("Name") - .ValueGeneratedOnAdd(); + b.Property("Name"); b.Property("PluginGuid"); b.Property("Value"); - b.HasKey("Name"); - - b.HasIndex("Name", "PluginGuid"); + b.HasKey("Name", "PluginGuid"); b.ToTable("Settings"); }); diff --git a/src/Artemis.Storage/Repositories/IRepository.cs b/src/Artemis.Storage/Repositories/IRepository.cs new file mode 100644 index 000000000..cd79f9641 --- /dev/null +++ b/src/Artemis.Storage/Repositories/IRepository.cs @@ -0,0 +1,6 @@ +namespace Artemis.Storage.Repositories +{ + public interface IRepository + { + } +} \ No newline at end of file diff --git a/src/Artemis.Storage/Repositories/ISettingRepository.cs b/src/Artemis.Storage/Repositories/ISettingRepository.cs new file mode 100644 index 000000000..5c0a7d835 --- /dev/null +++ b/src/Artemis.Storage/Repositories/ISettingRepository.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Artemis.Storage.Entities; + +namespace Artemis.Storage.Repositories +{ + public interface ISettingRepository : IRepository + { + IQueryable GetAll(); + List GetByPluginGuid(Guid pluginGuid); + void Add(SettingEntity settingEntity); + Task> GetByPluginGuidAsync(Guid pluginGuid); + Task GetByNameAndPluginGuid(string name, Guid pluginGuid); + Task GetByName(string name); + void Save(); + Task SaveAsync(); + } +} \ No newline at end of file diff --git a/src/Artemis.Storage/Repositories/SettingRepository.cs b/src/Artemis.Storage/Repositories/SettingRepository.cs index aace641b8..0b52aaee4 100644 --- a/src/Artemis.Storage/Repositories/SettingRepository.cs +++ b/src/Artemis.Storage/Repositories/SettingRepository.cs @@ -7,11 +7,11 @@ using Microsoft.EntityFrameworkCore; namespace Artemis.Storage.Repositories { - public class SettingRepository + public class SettingRepository : ISettingRepository { private readonly StorageContext _dbContext; - public SettingRepository() + internal SettingRepository() { _dbContext = new StorageContext(); } @@ -26,6 +26,11 @@ namespace Artemis.Storage.Repositories return _dbContext.Settings.Where(p => p.PluginGuid == pluginGuid).ToList(); } + public void Add(SettingEntity settingEntity) + { + _dbContext.Settings.Add(settingEntity); + } + public async Task> GetByPluginGuidAsync(Guid pluginGuid) { return await _dbContext.Settings.Where(p => p.PluginGuid == pluginGuid).ToListAsync(); diff --git a/src/Artemis.Storage/Storage.db b/src/Artemis.Storage/Storage.db index e93b9c353..b0641d32b 100644 Binary files a/src/Artemis.Storage/Storage.db and b/src/Artemis.Storage/Storage.db differ diff --git a/src/Artemis.Storage/StorageContext.cs b/src/Artemis.Storage/StorageContext.cs index f94aed111..9b5f7ca84 100644 --- a/src/Artemis.Storage/StorageContext.cs +++ b/src/Artemis.Storage/StorageContext.cs @@ -11,11 +11,12 @@ namespace Artemis.Storage protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { optionsBuilder.UseSqlite("Data Source=Storage.db"); + SQLitePCL.Batteries.Init(); } protected override void OnModelCreating(ModelBuilder modelBuilder) { - modelBuilder.Entity().HasIndex(s => new {s.Name, s.PluginGuid}); + modelBuilder.Entity().HasKey(s => new {s.Name, s.PluginGuid}); base.OnModelCreating(modelBuilder); } } diff --git a/src/Artemis.UI/App.config b/src/Artemis.UI/App.config index fcbfc6adb..3e8cfd535 100644 --- a/src/Artemis.UI/App.config +++ b/src/Artemis.UI/App.config @@ -1,8 +1,7 @@  - - + @@ -31,8 +30,7 @@ - + @@ -56,8 +54,7 @@ - + @@ -73,8 +70,7 @@ - + @@ -90,8 +86,7 @@ - + @@ -99,8 +94,7 @@ - + @@ -113,4 +107,4 @@ - \ No newline at end of file + diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj index ea191cc59..1bd215c1e 100644 --- a/src/Artemis.UI/Artemis.UI.csproj +++ b/src/Artemis.UI/Artemis.UI.csproj @@ -9,13 +9,14 @@ WinExe Artemis.UI Artemis.UI - v4.6.1 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 true + AnyCPU @@ -62,13 +63,13 @@ ..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll - ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll + ..\packages\ControlzEx.3.0.2.4\lib\net462\ControlzEx.dll ..\packages\Humanizer.Core.2.6.2\lib\netstandard2.0\Humanizer.dll - ..\packages\MahApps.Metro.1.6.5\lib\net46\MahApps.Metro.dll + ..\packages\MahApps.Metro.1.6.5\lib\net47\MahApps.Metro.dll ..\packages\MaterialDesignColors.1.1.3\lib\net45\MaterialDesignColors.dll @@ -113,10 +114,10 @@ - ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll + ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll - ..\packages\ControlzEx.3.0.2.4\lib\net45\System.Windows.Interactivity.dll + ..\packages\ControlzEx.3.0.2.4\lib\net462\System.Windows.Interactivity.dll diff --git a/src/Artemis.UI/Properties/Resources.Designer.cs b/src/Artemis.UI/Properties/Resources.Designer.cs index 7f8dbc8d4..7f76887ff 100644 --- a/src/Artemis.UI/Properties/Resources.Designer.cs +++ b/src/Artemis.UI/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Artemis.UI.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/src/Artemis.UI/Properties/Settings.Designer.cs b/src/Artemis.UI/Properties/Settings.Designer.cs index dbd0340a2..93cac3d15 100644 --- a/src/Artemis.UI/Properties/Settings.Designer.cs +++ b/src/Artemis.UI/Properties/Settings.Designer.cs @@ -8,21 +8,17 @@ // //------------------------------------------------------------------------------ -namespace Artemis.UI.Properties -{ - - +namespace Artemis.UI.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { + + public static Settings Default { + get { return defaultInstance; } } diff --git a/src/Artemis.UI/packages.config b/src/Artemis.UI/packages.config index 521c233ed..a1b5eaaae 100644 --- a/src/Artemis.UI/packages.config +++ b/src/Artemis.UI/packages.config @@ -1,11 +1,10 @@  - - + - + @@ -20,5 +19,5 @@ - + \ No newline at end of file