DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-12 03:48:56 +00:00
Code Issues Releases Wiki Activity

Added most of the settings code, doesn't work because SQLite is weird

Browse Source
This commit is contained in:
SpoinkyNL committed 2019-04-17 20:47:23 +02:00
1 parent 40c3222ae9
commit 8f4bb37fa4
42 files changed
+409 -582
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.Core/Artemis.Core.csproj
+6 -3
View File
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Artemis.Core</RootNamespace>
<AssemblyName>Artemis.Core</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
@@ -93,6 +93,9 @@
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.3.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.5.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Numerics" />
<Reference Include="System.Xml.Linq" />
@@ -105,6 +108,7 @@
<Compile Include="Events\DeviceEventArgs.cs" />
<Compile Include="Exceptions\ArtemisCoreException.cs" />
<Compile Include="Models\DataModelDescription.cs" />
<Compile Include="Ninject\PluginSettingsProvider.cs" />
<Compile Include="Plugins\Abstract\ModuleDataModel.cs" />
<Compile Include="Plugins\Abstract\ModuleViewModel.cs" />
<Compile Include="Plugins\Abstract\ProfileModule.cs" />
@@ -117,7 +121,7 @@
<Compile Include="Plugins\Abstract\Plugin.cs" />
<Compile Include="Plugins\Models\PluginInfo.cs" />
<Compile Include="Plugins\Models\PluginSetting.cs" />
<Compile Include="Plugins\Models\PluginSettingsContainer.cs" />
<Compile Include="Plugins\Models\PluginSettings.cs" />
<Compile Include="ProfileElements\Folder.cs" />
<Compile Include="ProfileElements\Interfaces\IProfileElement.cs" />
<Compile Include="ProfileElements\Layer.cs" />
@@ -136,7 +140,6 @@
<Compile Include="Services\Interfaces\IPluginService.cs" />
<Compile Include="Events\PluginEventArgs.cs" />
<Compile Include="Services\PluginService.cs" />
<Compile Include="Services\SettingsService.cs" />
<Compile Include="Services\StorageService.cs" />
<Compile Include="UtilitiesRemoveMe.cs" />
</ItemGroup>
src/Artemis.Core/Ninject/CoreModule.cs
+15 -1
View File
@@ -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<IRepository>()
.SelectAllClasses()
.InheritedFrom<IRepository>()
.BindAllInterfaces()
.Configure(c => c.InSingletonScope());
});
Kernel.Bind<PluginSettings>().ToProvider<PluginSettingsProvider>();
}
}
}
src/Artemis.Core/Ninject/PluginSettingsProvider.cs
+27
View File
@@ -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<PluginSettings>
{
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);
}
}
}
src/Artemis.Core/Plugins/Models/PluginInfo.cs
+5 -1
View File
@@ -15,21 +15,25 @@ namespace Artemis.Core.Plugins.Models
/// <summary>
/// The plugins GUID
/// </summary>
[JsonProperty(Required = Required.Always)]
public Guid Guid { get; internal set; }
/// <summary>
/// The name of the plugin
/// </summary>
[JsonProperty(Required = Required.Always)]
public string Name { get; internal set; }
/// <summary>
/// The version of the plugin
/// </summary>
public string Version { get; internal set; }
[JsonProperty(Required = Required.Always)]
public Version Version { get; internal set; }
/// <summary>
/// The main entry DLL, should contain a class implementing Plugin
/// </summary>
[JsonProperty(Required = Required.Always)]
public string Main { get; internal set; }
/// <summary>
src/Artemis.Core/Plugins/Models/PluginSetting.cs
+2 -2
View File
@@ -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;
src/Artemis.Core/Plugins/Models/PluginSettings.cs
+35
View File
@@ -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<string, SettingEntity> _settingEntities;
public PluginSettings(PluginInfo pluginInfo, ISettingRepository settingRepository)
{
_pluginInfo = pluginInfo;
_settingRepository = settingRepository;
_settingEntities = settingRepository.GetByPluginGuid(_pluginInfo.Guid).ToDictionary(se => se.Name);
}
public PluginSetting<T> GetSetting<T>(string name, T defaultValue = default)
{
if (_settingEntities.ContainsKey(name))
return new PluginSetting<T>(_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);
}
}
}
src/Artemis.Core/Plugins/Models/PluginSettingsContainer.cs
-30
View File
@@ -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<List<SettingEntity>> _settings;
internal PluginSettingsContainer(PluginInfo pluginInfo, SettingRepository settingRepository)
{
_pluginInfo = pluginInfo;
_settingRepository = settingRepository;
}
public bool HasSettingChanged(string settingName)
{
return false;
}
public bool HasAnySettingChanged()
{
return false;
}
}
}
src/Artemis.Core/Services/CoreService.cs
+1 -1
View File
@@ -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;
src/Artemis.Core/Services/MainDataModelService.cs
+1 -1
View File
@@ -12,7 +12,7 @@ namespace Artemis.Core.Services
{
private readonly List<DataModelExpansion> _dataModelExpansions;
public MainDataModelService()
internal MainDataModelService()
{
_dataModelExpansions = new List<DataModelExpansion>();
}
src/Artemis.Core/Services/PluginService.cs
+6 -2
View File
@@ -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)
{
src/Artemis.Core/Services/RgbService.cs
+1 -1
View File
@@ -16,7 +16,7 @@ namespace Artemis.Core.Services
private readonly List<IRGBDevice> _loadedDevices;
private readonly TimerUpdateTrigger _updateTrigger;
public RgbService()
internal RgbService()
{
Surface = RGBSurface.Instance;
LoadingDevices = false;
src/Artemis.Core/Services/SettingsService.cs
-26
View File
@@ -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
{
}
}
src/Artemis.Core/Services/StorageService.cs
+1 -1
View File
@@ -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();
src/Artemis.Core/app.config
+7 -13
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -28,8 +27,7 @@
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a"
culture="neutral" />
<assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
@@ -53,8 +51,7 @@
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp.Scripting" publicKeyToken="31bf3856ad364e35"
culture="neutral" />
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp.Scripting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
@@ -70,8 +67,7 @@
<bindingRedirect oldVersion="0.0.0.0-2.6.0.0" newVersion="2.6.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Cryptography.Algorithms" publicKeyToken="b03f5f7f11d50a3a"
culture="neutral" />
<assemblyIdentity name="System.Security.Cryptography.Algorithms" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
</dependentAssembly>
<dependentAssembly>
@@ -87,8 +83,7 @@
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a"
culture="neutral" />
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
</dependentAssembly>
<dependentAssembly>
@@ -96,8 +91,7 @@
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51"
culture="neutral" />
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.1" newVersion="4.0.3.1" />
</dependentAssembly>
<dependentAssembly>
@@ -111,6 +105,6 @@
</assemblyBinding>
</runtime>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup>
</configuration>
</configuration>
src/Artemis.Core/packages.config
+1 -1
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AppDomainToolkit" version="1.0.4.3" targetFramework="net461" />
<package id="Castle.Core" version="4.4.0" targetFramework="net461" />
@@ -14,4 +13,5 @@
<package id="RGB.NET.Devices.Corsair" version="0.1.22" targetFramework="net461" />
<package id="RGB.NET.Groups" version="0.1.22" targetFramework="net461" />
<package id="Stylet" version="1.1.22" targetFramework="net461" />
<package id="System.Diagnostics.DiagnosticSource" version="4.5.1" targetFramework="net472" />
</packages>