Removed half-baked import feature for now

No views depend on services anymore
Dirty status fully handled by behavior
This commit is contained in:
Geoffroy BONNEVILLE
2020-04-27 11:14:29 +02:00
parent 59ab43ca9c
commit 8e06bf4bb0
11 changed files with 34 additions and 113 deletions

View File

@@ -75,7 +75,7 @@
<None Include="project.json" />
</ItemGroup>
<ItemGroup>
<Compile Include="Common\Behaviors\SetDirtyBehavior.cs" />
<Compile Include="Common\Behaviors\DirtyStatusBehavior.cs" />
<Compile Include="Common\Interfaces\ICryptographyClient.cs" />
<Compile Include="Common\Interfaces\IDatabaseProxy.cs" />
<Compile Include="Common\Interfaces\IEntityVm.cs" />

View File

@@ -7,14 +7,14 @@ using ModernKeePass.Application.Database.Commands.SaveDatabase;
namespace ModernKeePass.Application.Common.Behaviors
{
public class SetDirtyBehavior<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse>
public class DirtyStatusBehavior<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse>
{
private readonly List<string> _excludedCommands = new List<string>
{nameof(SaveDatabaseCommand), nameof(CloseDatabaseCommand)};
private readonly IDatabaseProxy _database;
public SetDirtyBehavior(IDatabaseProxy database)
public DirtyStatusBehavior(IDatabaseProxy database)
{
_database = database;
}
@@ -23,9 +23,9 @@ namespace ModernKeePass.Application.Common.Behaviors
{
var response = await next();
var queryName = typeof(TRequest).Name;
if (queryName.Contains("Command") && !_excludedCommands.Contains(queryName))
if (queryName.Contains("Command"))
{
_database.IsDirty = true;
_database.IsDirty = !_excludedCommands.Contains(queryName);
}
return response;

View File

@@ -21,7 +21,6 @@ namespace ModernKeePass.Application.Database.Commands.CloseDatabase
// Cleanup
_database.FileAccessToken = null;
_database.IsDirty = false;
_database.Size = 0;
}
}

View File

@@ -47,8 +47,6 @@ namespace ModernKeePass.Application.Database.Commands.SaveDatabase
_file.ReleaseFile(_database.FileAccessToken);
_database.FileAccessToken = message.FilePath;
}
_database.IsDirty = false;
}
catch (Exception exception)
{

View File

@@ -12,7 +12,7 @@ namespace ModernKeePass.Application
{
var assembly = typeof(DependencyInjection).GetTypeInfo().Assembly;
services.AddMediatR(assembly);
services.AddTransient(typeof(IPipelineBehavior<,>), typeof(SetDirtyBehavior<,>));
services.AddTransient(typeof(IPipelineBehavior<,>), typeof(DirtyStatusBehavior<,>));
//services.AddValidatorsFromAssembly(assembly);
return services;