From 0fa768556aca00f4346ccd71917fad048def6323 Mon Sep 17 00:00:00 2001 From: Rory& Date: Thu, 30 May 2024 08:22:50 +0000 Subject: Move around some projects, further cleanup pending --- Tests/TestDataGenerator/Bot/DataFetcher.cs | 59 ---------------------- .../Bot/DataFetcherConfiguration.cs | 9 ---- Tests/TestDataGenerator/Program.cs | 27 ---------- .../Properties/launchSettings.json | 25 --------- Tests/TestDataGenerator/TestDataGenerator.csproj | 32 ------------ .../TestDataGenerator/appsettings.Development.json | 18 ------- Tests/TestDataGenerator/appsettings.json | 9 ---- 7 files changed, 179 deletions(-) delete mode 100644 Tests/TestDataGenerator/Bot/DataFetcher.cs delete mode 100644 Tests/TestDataGenerator/Bot/DataFetcherConfiguration.cs delete mode 100644 Tests/TestDataGenerator/Program.cs delete mode 100644 Tests/TestDataGenerator/Properties/launchSettings.json delete mode 100644 Tests/TestDataGenerator/TestDataGenerator.csproj delete mode 100644 Tests/TestDataGenerator/appsettings.Development.json delete mode 100644 Tests/TestDataGenerator/appsettings.json (limited to 'Tests/TestDataGenerator') diff --git a/Tests/TestDataGenerator/Bot/DataFetcher.cs b/Tests/TestDataGenerator/Bot/DataFetcher.cs deleted file mode 100644 index 66b8a03..0000000 --- a/Tests/TestDataGenerator/Bot/DataFetcher.cs +++ /dev/null @@ -1,59 +0,0 @@ -using ArcaneLibs.Extensions; -using LibMatrix.EventTypes.Spec; -using LibMatrix.Homeservers; -using LibMatrix.RoomTypes; -using LibMatrix.Utilities.Bot; -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; - -#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously - -namespace TestDataGenerator.Bot; - -public class DataFetcher(AuthenticatedHomeserverGeneric hs, ILogger logger, LibMatrixBotConfiguration botConfiguration) : IHostedService { - private Task? _listenerTask; - - private GenericRoom? _logRoom; - - /// Triggered when the application host is ready to start the service. - /// Indicates that the start process has been aborted. - public async Task StartAsync(CancellationToken cancellationToken) { - _listenerTask = Run(cancellationToken); - logger.LogInformation("Bot started!"); - } - - private async Task Run(CancellationToken cancellationToken) { - Directory.GetFiles("bot_data/cache").ToList().ForEach(File.Delete); - _logRoom = hs.GetRoom(botConfiguration.LogRoom!); - - await _logRoom.SendMessageEventAsync(new RoomMessageEventContent(body: "Test data collector started!")); - await _logRoom.SendMessageEventAsync(new RoomMessageEventContent(body: "Fetching rooms...")); - - var rooms = await hs.GetJoinedRooms(); - await _logRoom.SendMessageEventAsync(new RoomMessageEventContent(body: $"Fetched {rooms.Count} rooms!")); - - await _logRoom.SendMessageEventAsync(new RoomMessageEventContent(body: "Fetching room data...")); - - var roomAliasTasks = rooms.Select(room => room.GetCanonicalAliasAsync()).ToAsyncEnumerable(); - List> aliasResolutionTasks = new(); - await foreach (var @event in roomAliasTasks) - if (@event?.Alias != null) { - await _logRoom.SendMessageEventAsync(new RoomMessageEventContent(body: $"Fetched room alias {@event.Alias}!")); - aliasResolutionTasks.Add(Task.Run(async () => { - var alias = await hs.ResolveRoomAliasAsync(@event.Alias); - return (@event.Alias, alias.RoomId); - }, cancellationToken)); - } - - var aliasResolutionTaskEnumerator = aliasResolutionTasks.ToAsyncEnumerable(); - await foreach (var result in aliasResolutionTaskEnumerator) - await _logRoom.SendMessageEventAsync(new RoomMessageEventContent(body: $"Resolved room alias {result.Item1} to {result.Item2}!")); - } - - /// Triggered when the application host is performing a graceful shutdown. - /// Indicates that the shutdown process should no longer be graceful. - public async Task StopAsync(CancellationToken cancellationToken) { - logger.LogInformation("Shutting down bot!"); - _listenerTask?.Dispose(); - } -} \ No newline at end of file diff --git a/Tests/TestDataGenerator/Bot/DataFetcherConfiguration.cs b/Tests/TestDataGenerator/Bot/DataFetcherConfiguration.cs deleted file mode 100644 index 4f53a2a..0000000 --- a/Tests/TestDataGenerator/Bot/DataFetcherConfiguration.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Microsoft.Extensions.Configuration; - -namespace TestDataGenerator.Bot; - -public class DataFetcherConfiguration { - public DataFetcherConfiguration(IConfiguration config) => config.GetRequiredSection("DataFetcher").Bind(this); - - // public string -} \ No newline at end of file diff --git a/Tests/TestDataGenerator/Program.cs b/Tests/TestDataGenerator/Program.cs deleted file mode 100644 index 2583817..0000000 --- a/Tests/TestDataGenerator/Program.cs +++ /dev/null @@ -1,27 +0,0 @@ -// See https://aka.ms/new-console-template for more information - -using LibMatrix.Services; -using LibMatrix.Utilities.Bot; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using TestDataGenerator.Bot; - -Console.WriteLine("Hello, World!"); - -var host = Host.CreateDefaultBuilder(args).ConfigureServices((_, services) => { - services.AddScoped(_ => - new TieredStorageService( - new FileStorageProvider("bot_data/cache/"), - new FileStorageProvider("bot_data/data/") - ) - ); - // services.AddSingleton(); - services.AddSingleton(); - - services.AddRoryLibMatrixServices(); - services.AddMatrixBot();//.AddCommandHandler().AddCommands([typeof()]); - - services.AddHostedService(); -}).UseConsoleLifetime().Build(); - -await host.RunAsync(); \ No newline at end of file diff --git a/Tests/TestDataGenerator/Properties/launchSettings.json b/Tests/TestDataGenerator/Properties/launchSettings.json deleted file mode 100644 index 6c504ff..0000000 --- a/Tests/TestDataGenerator/Properties/launchSettings.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$schema": "http://json.schemastore.org/launchsettings.json", - "profiles": { - "Default": { - "commandName": "Project", - "dotnetRunMessages": true, - "environmentVariables": { - } - }, - "Development": { - "commandName": "Project", - "dotnetRunMessages": true, - "environmentVariables": { - "DOTNET_ENVIRONMENT": "Development" - } - }, - "Local config": { - "commandName": "Project", - "dotnetRunMessages": true, - "environmentVariables": { - "DOTNET_ENVIRONMENT": "Local" - } - } - } -} diff --git a/Tests/TestDataGenerator/TestDataGenerator.csproj b/Tests/TestDataGenerator/TestDataGenerator.csproj deleted file mode 100644 index 879693e..0000000 --- a/Tests/TestDataGenerator/TestDataGenerator.csproj +++ /dev/null @@ -1,32 +0,0 @@ - - - - Exe - net8.0 - preview - enable - enable - false - true - - - - - - - - - - - - - - Always - - - - - - - - diff --git a/Tests/TestDataGenerator/appsettings.Development.json b/Tests/TestDataGenerator/appsettings.Development.json deleted file mode 100644 index 38c45c4..0000000 --- a/Tests/TestDataGenerator/appsettings.Development.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" - } - }, - "LibMatrixBot": { - // The homeserver to connect to - "Homeserver": "rory.gay", - // The access token to use - "AccessToken": "syt_xxxxxxxxxxxxxxxxx", - // The command prefix - "Prefix": "?", - "LogRoom": "!xxxxxxxxxxxxxxxxxxxxxx:example.com" - } -} diff --git a/Tests/TestDataGenerator/appsettings.json b/Tests/TestDataGenerator/appsettings.json deleted file mode 100644 index e203e94..0000000 --- a/Tests/TestDataGenerator/appsettings.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" - } - } -} -- cgit 1.4.1