diff --git a/MatrixRoomUtils.Desktop/App.axaml b/MatrixUtils.Desktop/App.axaml
index 9c99838..bc69400 100644
--- a/MatrixRoomUtils.Desktop/App.axaml
+++ b/MatrixUtils.Desktop/App.axaml
@@ -1,6 +1,6 @@
<Application xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- x:Class="MatrixRoomUtils.Desktop.App"
+ x:Class="MatrixUtils.Desktop.App"
RequestedThemeVariant="Default">
<!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
diff --git a/MatrixRoomUtils.Desktop/App.axaml.cs b/MatrixUtils.Desktop/App.axaml.cs
index aeb154c..3a106ab 100644
--- a/MatrixRoomUtils.Desktop/App.axaml.cs
+++ b/MatrixUtils.Desktop/App.axaml.cs
@@ -3,34 +3,34 @@ using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml;
using Avalonia.Styling;
using LibMatrix.Services;
-using MatrixRoomUtils.Abstractions;
+using MatrixUtils.Abstractions;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
-namespace MatrixRoomUtils.Desktop;
+namespace MatrixUtils.Desktop;
public partial class App : Application {
public IHost host { get; set; }
public override void OnFrameworkInitializationCompleted() {
host = Host.CreateDefaultBuilder().ConfigureServices((ctx, services) => {
- services.AddSingleton<MRUDesktopConfiguration>();
+ services.AddSingleton<RMUDesktopConfiguration>();
services.AddSingleton<SentryService>();
services.AddSingleton<TieredStorageService>(x =>
new TieredStorageService(
- cacheStorageProvider: new FileStorageProvider(x.GetService<MRUDesktopConfiguration>()!.CacheStoragePath),
- dataStorageProvider: new FileStorageProvider(x.GetService<MRUDesktopConfiguration>()!.DataStoragePath)
+ cacheStorageProvider: new FileStorageProvider(x.GetService<RMUDesktopConfiguration>()!.CacheStoragePath),
+ dataStorageProvider: new FileStorageProvider(x.GetService<RMUDesktopConfiguration>()!.DataStoragePath)
)
);
services.AddSingleton(new RoryLibMatrixConfiguration {
- AppName = "MatrixRoomUtils.Desktop"
+ AppName = "MatrixUtils.Desktop"
});
services.AddRoryLibMatrixServices();
// foreach (var commandClass in new ClassCollector<ICommand>().ResolveFromAllAccessibleAssemblies()) {
// Console.WriteLine($"Adding command {commandClass.Name}");
// services.AddScoped(typeof(ICommand), commandClass);
// }
- services.AddSingleton<MRUStorageWrapper>();
+ services.AddSingleton<RMUStorageWrapper>();
services.AddSingleton<MainWindow>();
services.AddSingleton(this);
}).UseConsoleLifetime().Build();
diff --git a/MatrixRoomUtils.Desktop/Components/NavigationStack.axaml b/MatrixUtils.Desktop/Components/NavigationStack.axaml
index bc6b75d..b24895d 100644
--- a/MatrixRoomUtils.Desktop/Components/NavigationStack.axaml
+++ b/MatrixUtils.Desktop/Components/NavigationStack.axaml
@@ -3,7 +3,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
- x:Class="MatrixRoomUtils.Desktop.Components.NavigationStack">
+ x:Class="MatrixUtils.Desktop.Components.NavigationStack">
<StackPanel x:Name="dock">
<Label>NagivationStack</Label>
<StackPanel x:Name="navPanel" Orientation="Horizontal"></StackPanel>
diff --git a/MatrixRoomUtils.Desktop/Components/NavigationStack.axaml.cs b/MatrixUtils.Desktop/Components/NavigationStack.axaml.cs
index 92c617b..632ae3c 100644
--- a/MatrixRoomUtils.Desktop/Components/NavigationStack.axaml.cs
+++ b/MatrixUtils.Desktop/Components/NavigationStack.axaml.cs
@@ -2,7 +2,7 @@ using Avalonia.Controls;
using Avalonia.Interactivity;
using Avalonia.Markup.Xaml;
-namespace MatrixRoomUtils.Desktop.Components;
+namespace MatrixUtils.Desktop.Components;
public partial class NavigationStack : UserControl {
public NavigationStack() {
diff --git a/MatrixRoomUtils.Desktop/Components/Pages/RoomList.axaml b/MatrixUtils.Desktop/Components/Pages/RoomList.axaml
index 0e43d99..45778f3 100644
--- a/MatrixRoomUtils.Desktop/Components/Pages/RoomList.axaml
+++ b/MatrixUtils.Desktop/Components/Pages/RoomList.axaml
@@ -2,12 +2,12 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:components="clr-namespace:MatrixRoomUtils.Desktop.Components.Pages"
- xmlns:components1="clr-namespace:MatrixRoomUtils.Desktop.Components"
- xmlns:abstractions="clr-namespace:MatrixRoomUtils.Abstractions;assembly=MatrixRoomUtils.Abstractions"
+ xmlns:components="clr-namespace:MatrixUtils.Desktop.Components.Pages"
+ xmlns:components1="clr-namespace:MatrixUtils.Desktop.Components"
+ xmlns:abstractions="clr-namespace:MatrixUtils.Abstractions;assembly=MatrixUtils.Abstractions"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
- x:Class="MatrixRoomUtils.Desktop.Components.Pages.RoomList"
+ x:Class="MatrixUtils.Desktop.Components.Pages.RoomList"
x:DataType="components:RoomList"
DataContext="{Binding $self}"
>
diff --git a/MatrixRoomUtils.Desktop/Components/Pages/RoomList.axaml.cs b/MatrixUtils.Desktop/Components/Pages/RoomList.axaml.cs
index 53c3063..a0c9fcc 100644
--- a/MatrixRoomUtils.Desktop/Components/Pages/RoomList.axaml.cs
+++ b/MatrixUtils.Desktop/Components/Pages/RoomList.axaml.cs
@@ -2,9 +2,9 @@ using System.Collections.ObjectModel;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
-using MatrixRoomUtils.Abstractions;
+using MatrixUtils.Abstractions;
-namespace MatrixRoomUtils.Desktop.Components.Pages;
+namespace MatrixUtils.Desktop.Components.Pages;
public partial class RoomList : UserControl {
private ObservableCollection<RoomInfo> Rooms { get; set; } = new();
diff --git a/MatrixRoomUtils.Desktop/Components/RoomListEntry.axaml b/MatrixUtils.Desktop/Components/RoomListEntry.axaml
index db22ccc..97e6fdc 100644
--- a/MatrixRoomUtils.Desktop/Components/RoomListEntry.axaml
+++ b/MatrixUtils.Desktop/Components/RoomListEntry.axaml
@@ -2,9 +2,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:components="clr-namespace:MatrixRoomUtils.Desktop.Components"
+ xmlns:components="clr-namespace:MatrixUtils.Desktop.Components"
mc:Ignorable="d" d:DesignWidth="250" d:DesignHeight="32"
- x:Class="MatrixRoomUtils.Desktop.Components.RoomListEntry"
+ x:Class="MatrixUtils.Desktop.Components.RoomListEntry"
x:DataType="components:RoomListEntry"
DataContext="{Binding $self}"
diff --git a/MatrixRoomUtils.Desktop/Components/RoomListEntry.axaml.cs b/MatrixUtils.Desktop/Components/RoomListEntry.axaml.cs
index 73115a2..1e4a127 100644
--- a/MatrixRoomUtils.Desktop/Components/RoomListEntry.axaml.cs
+++ b/MatrixUtils.Desktop/Components/RoomListEntry.axaml.cs
@@ -7,11 +7,11 @@ using LibMatrix.EventTypes.Spec.State.RoomInfo;
using LibMatrix.Helpers;
using LibMatrix.Interfaces.Services;
using LibMatrix.Services;
-using MatrixRoomUtils.Abstractions;
+using MatrixUtils.Abstractions;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
-namespace MatrixRoomUtils.Desktop.Components;
+namespace MatrixUtils.Desktop.Components;
public partial class RoomListEntry : UserControl {
public RoomInfo Room { get; set; }
@@ -47,7 +47,7 @@ public partial class RoomListEntry : UserControl {
var resolvedUrl = await Room.Room.GetResolvedRoomAvatarUrlAsync();
// await using var svc = _serviceScopeFactory.CreateAsyncScope();
- // var hs = await svc.ServiceProvider.GetService<MRUStorageWrapper>()?.GetCurrentSessionOrPrompt()!;
+ // var hs = await svc.ServiceProvider.GetService<RMUStorageWrapper>()?.GetCurrentSessionOrPrompt()!;
// var hsResolver = svc.ServiceProvider.GetService<HomeserverResolverService>();
// var storage = svc.ServiceProvider.GetService<TieredStorageService>()?.CacheStorageProvider;
// var resolvedUrl = await hsResolver.ResolveMediaUri(hs.ServerName, mxcUrl);
diff --git a/MatrixRoomUtils.Desktop/LoginWindow.axaml b/MatrixUtils.Desktop/LoginWindow.axaml
index fc0ee6f..ecfa3f5 100644
--- a/MatrixRoomUtils.Desktop/LoginWindow.axaml
+++ b/MatrixUtils.Desktop/LoginWindow.axaml
@@ -2,10 +2,10 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:desktop="clr-namespace:MatrixRoomUtils.Desktop"
+ xmlns:desktop="clr-namespace:MatrixUtils.Desktop"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
Title="LoginWindow"
- x:Class="MatrixRoomUtils.Desktop.LoginWindow"
+ x:Class="MatrixUtils.Desktop.LoginWindow"
x:DataType="desktop:LoginWindow"
DataContext="{Binding $self}"
SizeToContent="WidthAndHeight" CanResize="False"
diff --git a/MatrixRoomUtils.Desktop/LoginWindow.axaml.cs b/MatrixUtils.Desktop/LoginWindow.axaml.cs
index 183c46b..ac59317 100644
--- a/MatrixRoomUtils.Desktop/LoginWindow.axaml.cs
+++ b/MatrixUtils.Desktop/LoginWindow.axaml.cs
@@ -4,12 +4,12 @@ using Avalonia.Interactivity;
using Avalonia.Markup.Xaml;
using Avalonia.VisualTree;
-namespace MatrixRoomUtils.Desktop;
+namespace MatrixUtils.Desktop;
public partial class LoginWindow : Window {
- private readonly MRUStorageWrapper _storage;
+ private readonly RMUStorageWrapper _storage;
- public LoginWindow(MRUStorageWrapper storage) {
+ public LoginWindow(RMUStorageWrapper storage) {
_storage = storage;
InitializeComponent();
#if DEBUG
diff --git a/MatrixRoomUtils.Desktop/MainWindow.axaml b/MatrixUtils.Desktop/MainWindow.axaml
index dd807b5..6457678 100644
--- a/MatrixRoomUtils.Desktop/MainWindow.axaml
+++ b/MatrixUtils.Desktop/MainWindow.axaml
@@ -2,11 +2,11 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:desktop="clr-namespace:MatrixRoomUtils.Desktop"
- xmlns:components="clr-namespace:MatrixRoomUtils.Desktop.Components"
+ xmlns:desktop="clr-namespace:MatrixUtils.Desktop"
+ xmlns:components="clr-namespace:MatrixUtils.Desktop.Components"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
- x:Class="MatrixRoomUtils.Desktop.MainWindow"
- Title="Rory&::MatrixRoomUtils">
+ x:Class="MatrixUtils.Desktop.MainWindow"
+ Title="Rory&::MatrixUtils">
<!-- <Interaction.Behaviors> -->
<!-- <EventTriggerBehavior EventName="Loaded"> -->
<!-- <InvokeCommandAction Command="{Binding LoadedCommand}"></InvokeCommandAction> -->
diff --git a/MatrixRoomUtils.Desktop/MainWindow.axaml.cs b/MatrixUtils.Desktop/MainWindow.axaml.cs
index 6ef573e..562ab1a 100644
--- a/MatrixRoomUtils.Desktop/MainWindow.axaml.cs
+++ b/MatrixUtils.Desktop/MainWindow.axaml.cs
@@ -1,25 +1,25 @@
using Avalonia.Controls;
using Avalonia.Interactivity;
-using MatrixRoomUtils.Abstractions;
-using MatrixRoomUtils.Desktop.Components;
+using MatrixUtils.Abstractions;
+using MatrixUtils.Desktop.Components;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
-namespace MatrixRoomUtils.Desktop;
+namespace MatrixUtils.Desktop;
public partial class MainWindow : Window {
private readonly ILogger<MainWindow> _logger;
private readonly IServiceScopeFactory _scopeFactory;
- private readonly MRUStorageWrapper _storageWrapper;
- private readonly MRUDesktopConfiguration _configuration;
+ private readonly RMUStorageWrapper _storageWrapper;
+ private readonly RMUDesktopConfiguration _configuration;
public static MainWindow Instance { get; private set; } = null!;
public MainWindow(ILogger<MainWindow> logger, IServiceScopeFactory scopeFactory, SentryService _) {
Instance = this;
_logger = logger;
_scopeFactory = scopeFactory;
- _configuration = scopeFactory.CreateScope().ServiceProvider.GetRequiredService<MRUDesktopConfiguration>();
- _storageWrapper = scopeFactory.CreateScope().ServiceProvider.GetRequiredService<MRUStorageWrapper>();
+ _configuration = scopeFactory.CreateScope().ServiceProvider.GetRequiredService<RMUDesktopConfiguration>();
+ _storageWrapper = scopeFactory.CreateScope().ServiceProvider.GetRequiredService<RMUStorageWrapper>();
_logger.LogInformation("Initialising MainWindow");
diff --git a/MatrixRoomUtils.Desktop/MatrixRoomUtils.Desktop.csproj b/MatrixUtils.Desktop/MatrixUtils.Desktop.csproj
index 94bf245..f1bd2b6 100644
--- a/MatrixRoomUtils.Desktop/MatrixRoomUtils.Desktop.csproj
+++ b/MatrixUtils.Desktop/MatrixUtils.Desktop.csproj
@@ -45,6 +45,6 @@
</Content>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\MatrixRoomUtils.Abstractions\MatrixRoomUtils.Abstractions.csproj" />
+ <ProjectReference Include="..\MatrixUtils.Abstractions\MatrixUtils.Abstractions.csproj" />
</ItemGroup>
</Project>
diff --git a/MatrixRoomUtils.Desktop/Program.cs b/MatrixUtils.Desktop/Program.cs
index aa1d9d3..0f4c09c 100644
--- a/MatrixRoomUtils.Desktop/Program.cs
+++ b/MatrixUtils.Desktop/Program.cs
@@ -2,7 +2,7 @@ using Avalonia;
using Microsoft.Extensions.Hosting;
using Tmds.DBus.Protocol;
-namespace MatrixRoomUtils.Desktop;
+namespace MatrixUtils.Desktop;
internal class Program {
private static IHost appHost;
diff --git a/MatrixRoomUtils.Desktop/Properties/launchSettings.json b/MatrixUtils.Desktop/Properties/launchSettings.json
index 36405e8..36405e8 100644
--- a/MatrixRoomUtils.Desktop/Properties/launchSettings.json
+++ b/MatrixUtils.Desktop/Properties/launchSettings.json
diff --git a/MatrixRoomUtils.Desktop/MRUDesktopConfiguration.cs b/MatrixUtils.Desktop/RMUDesktopConfiguration.cs
index c7a311d..62646ca 100644
--- a/MatrixRoomUtils.Desktop/MRUDesktopConfiguration.cs
+++ b/MatrixUtils.Desktop/RMUDesktopConfiguration.cs
@@ -5,16 +5,16 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
-namespace MatrixRoomUtils.Desktop;
+namespace MatrixUtils.Desktop;
-public class MRUDesktopConfiguration {
- private static ILogger<MRUDesktopConfiguration> _logger;
+public class RMUDesktopConfiguration {
+ private static ILogger<RMUDesktopConfiguration> _logger;
[RequiresUnreferencedCode("Uses reflection binding")]
- public MRUDesktopConfiguration(ILogger<MRUDesktopConfiguration> logger, IConfiguration config, HostBuilderContext host) {
+ public RMUDesktopConfiguration(ILogger<RMUDesktopConfiguration> logger, IConfiguration config, HostBuilderContext host) {
_logger = logger;
logger.LogInformation("Loading configuration for environment: {}...", host.HostingEnvironment.EnvironmentName);
- config.GetSection("MRUDesktop").Bind(this);
+ config.GetSection("RMUDesktop").Bind(this);
DataStoragePath = ExpandPath(DataStoragePath);
CacheStoragePath = ExpandPath(CacheStoragePath);
}
diff --git a/MatrixRoomUtils.Desktop/MRUStorageWrapper.cs b/MatrixUtils.Desktop/RMUStorageWrapper.cs
index b69c50d..c8172d0 100644
--- a/MatrixRoomUtils.Desktop/MRUStorageWrapper.cs
+++ b/MatrixUtils.Desktop/RMUStorageWrapper.cs
@@ -4,14 +4,14 @@ using LibMatrix.Homeservers;
using LibMatrix.Responses;
using LibMatrix.Services;
-namespace MatrixRoomUtils.Desktop;
+namespace MatrixUtils.Desktop;
-public class MRUStorageWrapper(TieredStorageService storageService, HomeserverProviderService homeserverProviderService) {
+public class RMUStorageWrapper(TieredStorageService storageService, HomeserverProviderService homeserverProviderService) {
public async Task<List<LoginResponse>?> GetAllTokens() {
- if (!await storageService.DataStorageProvider.ObjectExistsAsync("mru.tokens")) {
+ if (!await storageService.DataStorageProvider.ObjectExistsAsync("rmu.tokens")) {
return null;
}
- return await storageService.DataStorageProvider.LoadObjectAsync<List<LoginResponse>>("mru.tokens") ??
+ return await storageService.DataStorageProvider.LoadObjectAsync<List<LoginResponse>>("rmu.tokens") ??
new List<LoginResponse>();
}
@@ -41,7 +41,7 @@ public class MRUStorageWrapper(TieredStorageService storageService, HomeserverPr
var tokens = await GetAllTokens() ?? new List<LoginResponse>();
tokens.Add(loginResponse);
- await storageService.DataStorageProvider.SaveObjectAsync("mru.tokens", tokens);
+ await storageService.DataStorageProvider.SaveObjectAsync("rmu.tokens", tokens);
if (await GetCurrentToken() is null)
await SetCurrentToken(loginResponse);
}
@@ -103,7 +103,7 @@ public class MRUStorageWrapper(TieredStorageService storageService, HomeserverPr
}
tokens.RemoveAll(x => x.AccessToken == auth.AccessToken);
- await storageService.DataStorageProvider.SaveObjectAsync("mru.tokens", tokens);
+ await storageService.DataStorageProvider.SaveObjectAsync("rmu.tokens", tokens);
}
public async Task SetCurrentToken(LoginResponse? auth) => await storageService.DataStorageProvider.SaveObjectAsync("token", auth);
diff --git a/MatrixRoomUtils.Desktop/SentryService.cs b/MatrixUtils.Desktop/SentryService.cs
index 26212fa..c965632 100644
--- a/MatrixRoomUtils.Desktop/SentryService.cs
+++ b/MatrixUtils.Desktop/SentryService.cs
@@ -2,12 +2,12 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Sentry;
-namespace MatrixRoomUtils.Desktop;
+namespace MatrixUtils.Desktop;
public class SentryService : IDisposable {
private IDisposable? _sentrySdkDisposable;
public SentryService(IServiceScopeFactory scopeFactory, ILogger<SentryService> logger) {
- var config = scopeFactory.CreateScope().ServiceProvider.GetRequiredService<MRUDesktopConfiguration>();
+ var config = scopeFactory.CreateScope().ServiceProvider.GetRequiredService<RMUDesktopConfiguration>();
if (config.SentryDsn is null) {
logger.LogWarning("Sentry DSN is not set, skipping Sentry initialisation");
return;
diff --git a/MatrixRoomUtils.Desktop/app.manifest b/MatrixUtils.Desktop/app.manifest
index 35ffb0d..1c4a2e1 100644
--- a/MatrixRoomUtils.Desktop/app.manifest
+++ b/MatrixUtils.Desktop/app.manifest
@@ -3,7 +3,7 @@
<!-- This manifest is used on Windows only.
Don't remove it as it might cause problems with window transparency and embeded controls.
For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
- <assemblyIdentity version="1.0.0.0" name="MatrixRoomUtils.Desktop.Desktop"/>
+ <assemblyIdentity version="1.0.0.0" name="MatrixUtils.Desktop.Desktop"/>
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
diff --git a/MatrixRoomUtils.Desktop/appsettings.Development.json b/MatrixUtils.Desktop/appsettings.Development.json
index a00f349..a1add03 100644
--- a/MatrixRoomUtils.Desktop/appsettings.Development.json
+++ b/MatrixUtils.Desktop/appsettings.Development.json
@@ -6,9 +6,9 @@
"Microsoft": "Information"
}
},
- "MRUDesktop": {
- "DataStoragePath": "mru-desktop/data",
- "CacheStoragePath": "mru-desktop/cache",
+ "RMUDesktop": {
+ "DataStoragePath": "rmu-desktop/data",
+ "CacheStoragePath": "rmu-desktop/cache",
"SentryDsn": "https://a41e99dd2fdd45f699c432b21ebce632@sentry.thearcanebrony.net/15"
}
}
diff --git a/MatrixRoomUtils.Desktop/appsettings.json b/MatrixUtils.Desktop/appsettings.json
index 4164e87..058723c 100644
--- a/MatrixRoomUtils.Desktop/appsettings.json
+++ b/MatrixUtils.Desktop/appsettings.json
@@ -6,8 +6,8 @@
"Microsoft": "Information"
}
},
- "MRUDesktop": {
- "DataStoragePath": "~/.local/share/mru-desktop",
- "CacheStoragePath": "~/.cache/mru-desktop"
+ "RMUDesktop": {
+ "DataStoragePath": "~/.local/share/rmu-desktop",
+ "CacheStoragePath": "~/.cache/rmu-desktop"
}
}
|
