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

RemoteItemMover, Startup/Exit handler refactor

Browse Source
This commit is contained in:
Ádám Kovács
2023-07-26 13:51:17 +02:00
parent 3de71cbdbe
commit 0b36fb939c
23 changed files with 210 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Server/FileTime.Server.Common.Abstractions/IRemoteConnection.cs
View File

@@ -8,4 +8,5 @@ public interface IRemoteConnection
Task CreateContainerAsync(string contentProviderId, FullName fullName);
Task CreateElementAsync(string contentProviderId, FullName fullName);
Task DeleteItemAsync(string contentProviderId, FullName fullName);
Task MoveItemAsync(string contentProviderId, FullName fullName, FullName newPath);
}

1
src/Server/FileTime.Server.Common/Connections/SignalR/ISignalRHub.cs
View File

@@ -6,4 +6,5 @@ public interface ISignalRHub
Task CreateContainerAsync(string contentProviderId, string fullName);
Task CreateElementAsync(string contentProviderId, string fullName);
Task DeleteItemAsync(string contentProviderId, string fullName);
Task MoveItemAsync(string contentProviderId, string fullName, string newPath);
}

44
src/Server/FileTime.Server.Common/Connections/SignalR/SignalRConnection.cs
View File

@@ -7,10 +7,10 @@ namespace FileTime.Server.Common.Connections.SignalR;
public class SignalRConnection : IRemoteConnection, IAsyncInitable<string>
{
private static readonly Dictionary<string, SignalRConnection> Connections = new();
private string _baseUrl = null!;
private HubConnection _connection = null!;
private ISignalRHub CreateClient() => _connection.CreateHubProxy<ISignalRHub>();
private ISignalRHub _client = null!;
public async Task InitAsync(string baseUrl)
{
@@ -20,29 +20,37 @@ public class SignalRConnection : IRemoteConnection, IAsyncInitable<string>
.WithUrl(_baseUrl)
.Build();
await _connection.StartAsync();
_client = _connection.CreateHubProxy<ISignalRHub>();
}
public static async Task<SignalRConnection> GetOrCreateForAsync(string baseUrl)
{
if (Connections.TryGetValue(baseUrl, out var connection))
{
if (connection._connection.State != HubConnectionState.Disconnected)
{
return connection;
}
Connections.Remove(baseUrl);
}
connection = new SignalRConnection();
Connections.Add(baseUrl, connection);
await connection.InitAsync(baseUrl);
return connection;
}
public async Task Exit()
{
var client = CreateClient();
await client.Exit();
}
=> await _client.Exit();
public async Task CreateContainerAsync(string contentProviderId, FullName fullName)
{
var client = CreateClient();
await client.CreateContainerAsync(contentProviderId, fullName.Path);
}
=> await _client.CreateContainerAsync(contentProviderId, fullName.Path);
public async Task CreateElementAsync(string contentProviderId, FullName fullName)
{
var client = CreateClient();
await client.CreateElementAsync(contentProviderId, fullName.Path);
}
=> await _client.CreateElementAsync(contentProviderId, fullName.Path);
public async Task DeleteItemAsync(string contentProviderId, FullName fullName)
{
var client = CreateClient();
await client.DeleteItemAsync(contentProviderId, fullName.Path);
}
=> await _client.DeleteItemAsync(contentProviderId, fullName.Path);
public async Task MoveItemAsync(string contentProviderId, FullName fullName, FullName newPath)
=> await _client.MoveItemAsync(contentProviderId, fullName.Path, newPath.Path);
}

7
src/Server/FileTime.Server.Web/ConnectionHub.cs
View File

@@ -49,4 +49,11 @@ public class ConnectionHub : Hub<ISignalRClient>, ISignalRHub
var itemDeleter = _contentAccessorFactory.GetItemDeleter(contentProvider);
await itemDeleter.DeleteAsync(contentProvider, new FullName(fullName));
}
public async Task MoveItemAsync(string contentProviderId, string fullName, string newPath)
{
var contentProvider = _contentProviderRegistry.ContentProviders.First(p => p.Name == contentProviderId);
var itemDeleter = _contentAccessorFactory.GetItemMover(contentProvider);
await itemDeleter.RenameAsync(contentProvider, new FullName(fullName), new FullName(newPath));
}
}