ADIX7/FileTime
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Async core refactor

Browse Source
This commit is contained in:
Ádám Kovács
2022-01-20 18:16:01 +01:00
parent 016100a565
commit 215503a4e3
33 changed files with 761 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/Providers/FileTime.Providers.Smb/SmbShare.cs
View File

@@ -1,3 +1,4 @@
using AsyncEvent;
using FileTime.Core.Interactions;
using FileTime.Core.Models;
using FileTime.Core.Providers;
@@ -11,42 +12,9 @@ namespace FileTime.Providers.Smb
private IReadOnlyList<IItem>? _items;
private IReadOnlyList<IContainer>? _containers;
private IReadOnlyList<IElement>? _elements;
private Func<ISMBClient> _getSmbClient;
private Func<Task<ISMBClient>> _getSmbClient;
private readonly IContainer? _parent;
public IReadOnlyList<IItem> Items
{
get
{
if (_items == null) Refresh();
return _items!;
}
private set => _items = value;
}
public IReadOnlyList<IContainer> Containers
{
get
{
if (_containers == null) Refresh();
return _containers!;
}
private set => _containers = value;
}
public IReadOnlyList<IElement> Elements
{
get
{
if (_elements == null) Refresh();
return _elements!;
}
private set => _elements = value;
}
public string Name { get; }
public string? FullName { get; }
@@ -56,9 +24,9 @@ namespace FileTime.Providers.Smb
public SmbContentProvider Provider { get; }
IContentProvider IItem.Provider => Provider;
public event EventHandler? Refreshed;
public AsyncEventHandler Refreshed { get; } = new();
public SmbShare(string name, SmbContentProvider contentProvider, IContainer parent, Func<ISMBClient> getSmbClient)
public SmbShare(string name, SmbContentProvider contentProvider, IContainer parent, Func<Task<ISMBClient>> getSmbClient)
{
_parent = parent;
_getSmbClient = getSmbClient;
@@ -68,26 +36,42 @@ namespace FileTime.Providers.Smb
Provider = contentProvider;
}
public IContainer CreateContainer(string name)
public async Task<IReadOnlyList<IItem>?> GetItems(CancellationToken token = default)
{
if (_items == null) await Refresh();
return _items;
}
public async Task<IReadOnlyList<IContainer>?> GetContainers(CancellationToken token = default)
{
if (_containers == null) await Refresh();
return _containers;
}
public async Task<IReadOnlyList<IElement>?> GetElements(CancellationToken token = default)
{
if (_elements == null) await Refresh();
return _elements;
}
public Task<IContainer> CreateContainer(string name)
{
throw new NotImplementedException();
}
public IElement CreateElement(string name)
public Task<IElement> CreateElement(string name)
{
throw new NotImplementedException();
}
public void Delete()
public Task Delete()
{
throw new NotImplementedException();
}
public IItem? GetByPath(string path)
public async Task<IItem?> GetByPath(string path)
{
var paths = path.Split(Constants.SeparatorChar);
var item = Items.FirstOrDefault(i => i.Name == paths[0]);
var item = (await GetItems())?.FirstOrDefault(i => i.Name == paths[0]);
if (paths.Length == 1)
{
@@ -96,7 +80,7 @@ namespace FileTime.Providers.Smb
if (item is IContainer container)
{
return container.GetByPath(string.Join(Constants.SeparatorChar, paths.Skip(1)));
return await container.GetByPath(string.Join(Constants.SeparatorChar, paths.Skip(1)));
}
return null;
@@ -104,19 +88,19 @@ namespace FileTime.Providers.Smb
public IContainer? GetParent() => _parent;
public bool IsExists(string name)
public Task<bool> IsExists(string name)
{
throw new NotImplementedException();
}
public void Refresh()
public async Task Refresh()
{
var containers = new List<IContainer>();
var elements = new List<IElement>();
try
{
(containers, elements) = ListFolder(this, Name, string.Empty);
(containers, elements) = await ListFolder(this, Name, string.Empty);
}
catch { }
@@ -124,15 +108,15 @@ namespace FileTime.Providers.Smb
_elements = elements.AsReadOnly();
_items = _containers.Cast<IItem>().Concat(_elements).ToList().AsReadOnly();
Refreshed?.Invoke(this, EventArgs.Empty);
await Refreshed?.InvokeAsync(this, AsyncEventArgs.Empty);
}
public (List<IContainer> containers, List<IElement> elements) ListFolder(IContainer parent, string shareName, string folderName)
public async Task<(List<IContainer> containers, List<IElement> elements)> ListFolder(IContainer parent, string shareName, string folderName)
{
var containers = new List<IContainer>();
var elements = new List<IElement>();
var client = _getSmbClient();
var client = await _getSmbClient();
ISMBFileStore fileStore = client.TreeConnect(shareName, out var status);
if (status == NTStatus.STATUS_SUCCESS)
{
@@ -148,11 +132,11 @@ namespace FileTime.Providers.Smb
{
if ((fileDirectoryInformation.FileAttributes & SMBLibrary.FileAttributes.Directory) == SMBLibrary.FileAttributes.Directory)
{
containers.Add(new SmbFolder(fileDirectoryInformation.FileName, Provider, this, parent, _getSmbClient));
containers.Add(new SmbFolder(fileDirectoryInformation.FileName, Provider, this, parent));
}
else
{
elements.Add(new SmbFile(fileDirectoryInformation.FileName, Provider, parent, _getSmbClient));
elements.Add(new SmbFile(fileDirectoryInformation.FileName, Provider, parent));
}
}
}