wismna/modernkeepass
1
0
Fork 0
mirror of https://github.com/wismna/ModernKeePass.git synced 2025-10-03 15:40:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup (bis)

Browse Source
This commit is contained in:
Geoffroy BONNEVILLE
2020-04-08 16:23:15 +02:00
parent d1047a92ba
commit 1046110dd2
5 changed files with 21 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
ModernKeePass.Infrastructure/KeePass/EntryMappingProfile.cs
View File

@@ -3,19 +3,12 @@ using System.Linq;
using AutoMapper;
using ModernKeePass.Domain.Entities;
using ModernKeePassLib;
using ModernKeePassLib.Security;
namespace ModernKeePass.Infrastructure.KeePass
{
public class EntryMappingProfile: Profile
{
public EntryMappingProfile()
{
FromModelToDto();
FromDtoToModel();
}
private void FromDtoToModel()
{
Uri url;
CreateMap<PwEntry, EntryEntity>()
@@ -42,40 +35,7 @@ namespace ModernKeePass.Infrastructure.KeePass
.ToDictionary(s => s.Key, s => GetEntryValue(src, s.Key))))
.ForMember(dest => dest.LastModificationDate, opt => opt.MapFrom(src => new DateTimeOffset(src.LastModificationTime)));
}
private void FromModelToDto()
{
CreateMap<EntryEntity, PwEntry>().ConvertUsing<EntryToPwEntryDictionaryConverter>();
}
private string GetEntryValue(PwEntry entry, string key) => entry.Strings.GetSafe(key).ReadString();
}
public class EntryToPwEntryDictionaryConverter : ITypeConverter<EntryEntity, PwEntry>
{
public PwEntry Convert(EntryEntity source, PwEntry destination, ResolutionContext context)
{
//destination.Uuid = new PwUuid(System.Convert.FromBase64String(source.Id));
destination.ExpiryTime = source.ExpirationDate.DateTime;
destination.Expires = source.HasExpirationDate;
destination.LastModificationTime = source.LastModificationDate.DateTime;
destination.BackgroundColor = source.BackgroundColor;
destination.ForegroundColor = source.ForegroundColor;
destination.IconId = IconMapper.MapIconToPwIcon(source.Icon);
SetEntryValue(destination, PwDefs.TitleField, source.Name);
SetEntryValue(destination, PwDefs.UserNameField, source.UserName);
SetEntryValue(destination, PwDefs.PasswordField, source.Password);
SetEntryValue(destination, PwDefs.UrlField, source.Url?.ToString());
SetEntryValue(destination, PwDefs.NotesField, source.Notes);
foreach (var additionalField in source.AdditionalFields)
{
SetEntryValue(destination, additionalField.Key, additionalField.Value);
}
return destination;
}
private void SetEntryValue(PwEntry entry, string key, string newValue)
{
if (newValue != null) entry.Strings.Set(key, new ProtectedString(true, newValue));
}
}
}

10
ModernKeePass.Infrastructure/KeePass/GroupMappingProfile.cs
View File

@@ -7,12 +7,6 @@ namespace ModernKeePass.Infrastructure.KeePass
public class GroupMappingProfile : Profile
{
public GroupMappingProfile()
{
FromModelToDto();
FromDtoToModel();
}
private void FromDtoToModel()
{
CreateMap<PwGroup, GroupEntity>()
.ForMember(d => d.ParentId, opts => opts.MapFrom(s => s.ParentGroup.Uuid.ToHexString()))
@@ -25,9 +19,5 @@ namespace ModernKeePass.Infrastructure.KeePass
.ForMember(d => d.SubGroups, opts => opts.MapFrom(s => s.Groups))
.MaxDepth(2);
}
private void FromModelToDto()
{
}
}
}

19
ModernKeePass.Infrastructure/KeePass/KeePassDatabaseClient.cs
View File

@@ -23,6 +23,8 @@ namespace ModernKeePass.Infrastructure.KeePass
private readonly IDateTime _dateTime;
private readonly PwDatabase _pwDatabase = new PwDatabase();
private Credentials _credentials;
// Flag: Has Dispose already been called?
private bool _disposed;
public string ZeroId => PwUuid.Zero.ToHexString();
@@ -317,7 +319,22 @@ namespace ModernKeePass.Infrastructure.KeePass
public void Dispose()
{
if (IsOpen) CloseDatabase();
Dispose(true);
GC.SuppressFinalize(this);
}
// Protected implementation of Dispose pattern.
protected virtual void Dispose(bool disposing)
{
if (_disposed)
return;
if (disposing)
{
_pwDatabase.Close();
}
_disposed = true;
}
}
}