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

Sftp, fullname+nativepath refactor

Browse Source
This commit is contained in:
Ádám Kovács
2022-02-17 23:24:41 +01:00
parent 15dc956064
commit 5072d828e6
30 changed files with 772 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/GuiApp/FileTime.Avalonia/App.axaml
View File

@@ -147,6 +147,7 @@
<converters:GetFileExtensionConverter x:Key="GetFileExtensionConverter"/>
<converters:CommandToCommandNameConverter x:Key="CommandToCommandNameConverter"/>
<converters:NamePartShrinkerConverter x:Key="NamePartShrinkerConverter"/>
<converters:StringReplaceConverter x:Key="PathPreformatter" OldValue="://" NewValue="/"/>
</ResourceDictionary>
</Application.Resources>

1
src/GuiApp/FileTime.Avalonia/App.axaml.cs
View File

@@ -21,7 +21,6 @@ namespace FileTime.Avalonia
.AddServices()
.RegisterLogging()
.AddViewModels()
.RegisterCommandHandlers()
.BuildServiceProvider()
.InitSerilog();

13
src/GuiApp/FileTime.Avalonia/Application/TabContainer.cs
View File

@@ -51,16 +51,11 @@ namespace FileTime.Avalonia.Application
{
if (!_updateFromCode && value != null)
{
/*try
{*/
/*var task = SetSelectedItemAsync(value, true);
Task.WaitAll(new Task[] { task }, 100);*/
Task.Run(async () => await SetSelectedItemAsync(value, true)).Wait();
/*}
catch
try
{
//TODO: Debug, linux start after restore 3 tabs
}*/
Task.Run(async () => await SetSelectedItemAsync(value, true)).Wait();
}
catch (AggregateException e) when (e.InnerExceptions.Count == 1 && e.InnerExceptions[0] is IndexOutOfRangeException) { }
}
}
}

19
src/GuiApp/FileTime.Avalonia/Converters/StringReplaceConverter.cs Normal file
View File

@@ -0,0 +1,19 @@
using System;
using System.Globalization;
using Avalonia.Data.Converters;
namespace FileTime.Avalonia.Converters
{
public class StringReplaceConverter : IValueConverter
{
public string? OldValue { get; set; }
public string? NewValue { get; set; }
public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
=> value is string s && OldValue != null && NewValue != null ? s.Replace(OldValue, NewValue) : value;
public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
}
}

11
src/GuiApp/FileTime.Avalonia/Startup.cs
View File

@@ -10,7 +10,6 @@ using FileTime.Avalonia.ViewModels;
using FileTime.Core.Command;
using FileTime.Core.Interactions;
using FileTime.Core.Persistence;
using FileTime.Providers.Smb;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Serilog;
@@ -39,7 +38,6 @@ namespace FileTime.Avalonia
.AddSingleton(new PersistenceSettings(Program.AppDataRoot))
.AddSingleton<ProgramsService>()
.AddSingleton<ToastMessageSink>()
.AddSmbServices()
.AddSingleton<IIconProvider, MaterialIconProvider>();
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
@@ -53,15 +51,6 @@ namespace FileTime.Avalonia
return serviceCollection;
}
internal static IServiceCollection RegisterCommandHandlers(this IServiceCollection serviceCollection)
{
foreach (var commandHandler in Providers.Local.Startup.GetCommandHandlers())
{
serviceCollection.AddTransient(typeof(ICommandHandler), commandHandler);
}
return serviceCollection;
}
internal static IServiceCollection RegisterLogging(this IServiceCollection serviceCollection)
{

2
src/GuiApp/FileTime.Avalonia/Views/MainWindow.axaml
View File

@@ -35,7 +35,7 @@
<Rectangle Fill="#01000000"/>
<StackPanel Margin="20,10" Orientation="Horizontal">
<local:PathPresenter DataContext="{Binding AppState.SelectedTab.CurrentLocation.Container.FullName}"/>
<local:PathPresenter DataContext="{Binding AppState.SelectedTab.CurrentLocation.Container.FullName,Converter={StaticResource PathPreformatter}}"/>
<TextBlock
Text="{Binding AppState.SelectedTab.SelectedItem.Item.Name}" Foreground="{StaticResource AccentBrush}" />
</StackPanel>