New syncronization (#11)

SuperJMN · Oct 17, 2023 · 7368fbe · 7368fbe
1 parent 2bc3e33
commit 7368fbe
Show file tree

Hide file tree

Showing 114 changed files with 1,110 additions and 1,702 deletions.
diff --git a/AvaloniaSyncer.Tests/AvaloniaSyncer.Tests.csproj b/AvaloniaSyncer.Tests/AvaloniaSyncer.Tests.csproj
@@ -19,10 +19,10 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Zafiro.FileSystem" Version="4.0.26" />
-    <PackageReference Include="Zafiro.FileSystem.Local" Version="4.0.26" />
-    <PackageReference Include="Zafiro.FileSystem.SeaweedFS" Version="4.0.26" />
-    <PackageReference Include="Zafiro.FileSystem.Sftp" Version="4.0.26" />
+    <PackageReference Include="Zafiro.FileSystem" Version="4.0.27" />
+    <PackageReference Include="Zafiro.FileSystem.Local" Version="4.0.27" />
+    <PackageReference Include="Zafiro.FileSystem.SeaweedFS" Version="4.0.27" />
+    <PackageReference Include="Zafiro.FileSystem.Sftp" Version="4.0.27" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\src\AvaloniaSyncer\AvaloniaSyncer.csproj" />

diff --git a/AvaloniaSyncer.sln b/AvaloniaSyncer.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvaloniaSyncer.Desktop", "s
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvaloniaSyncer.Tests", "AvaloniaSyncer.Tests\AvaloniaSyncer.Tests.csproj", "{258C4207-A2C7-4BF3-9266-45365ECDEAB6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvaloniaSyncer", "src\AvaloniaSyncer\AvaloniaSyncer.csproj", "{A95C689A-2A0E-4055-A85F-C416B05DED94}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvaloniaSyncer", "src\AvaloniaSyncer\AvaloniaSyncer.csproj", "{6DEB5CDE-A5D5-4893-80EE-B8E8C19EFC4C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -37,10 +37,10 @@ Global
 		{258C4207-A2C7-4BF3-9266-45365ECDEAB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{258C4207-A2C7-4BF3-9266-45365ECDEAB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{258C4207-A2C7-4BF3-9266-45365ECDEAB6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A95C689A-2A0E-4055-A85F-C416B05DED94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A95C689A-2A0E-4055-A85F-C416B05DED94}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A95C689A-2A0E-4055-A85F-C416B05DED94}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A95C689A-2A0E-4055-A85F-C416B05DED94}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6DEB5CDE-A5D5-4893-80EE-B8E8C19EFC4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6DEB5CDE-A5D5-4893-80EE-B8E8C19EFC4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6DEB5CDE-A5D5-4893-80EE-B8E8C19EFC4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6DEB5CDE-A5D5-4893-80EE-B8E8C19EFC4C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/AvaloniaSyncer/App.axaml b/src/AvaloniaSyncer/App.axaml
@@ -1,15 +1,15 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:misc="clr-namespace:Zafiro.Avalonia.Misc;assembly=Zafiro.Avalonia"
-             xmlns:interfaces="clr-namespace:Zafiro.Avalonia.Wizard.Interfaces;assembly=Zafiro.Avalonia"
              xmlns:controls="clr-namespace:Zafiro.Avalonia.Controls;assembly=Zafiro.Avalonia"
+             xmlns:wizard="clr-namespace:Zafiro.Avalonia.Wizard;assembly=Zafiro.Avalonia"
              x:Class="AvaloniaSyncer.App"
              RequestedThemeVariant="Default">
 	<!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
 
 	<Application.DataTemplates>
 		<misc:NamingConventionViewLocator />
-        <DataTemplate DataType="interfaces:IWizard">
+        <DataTemplate DataType="wizard:IWizard">
             <controls:WizardControl Wizard="{Binding}" />
         </DataTemplate>
     </Application.DataTemplates>

diff --git a/src/AvaloniaSyncer/App.axaml.cs b/src/AvaloniaSyncer/App.axaml.cs
@@ -27,14 +27,17 @@ public override void OnFrameworkInitializationCompleted()
         {
             var vm = new ViewModelFactory(ApplicationLifetime!, view, Maybe<ILogger>.From(Log.Logger));
 
-            var sections = new List<Section>
+            return new MainViewModel(async () =>
             {
-                new("Explore", vm.GetExploreSection()),
-                new("Synchronize", vm.GetSyncViewModel()),
-                new("Settings", vm.GetSettingsViewModel()),
-            };
+                var sections = new List<Section>
+                {
+                    new("Explore", vm.GetExploreSection()),
+                    new("Synchronize", await vm.GetSynchronizationSection()),
+                    new("Settings", await vm.GetConnectionsViewModel())
+                };
 
-            return new MainViewModel(sections);
+                return sections;
+            });
         }, () => new MainWindow());
 
         base.OnFrameworkInitializationCompleted();

diff --git a/src/AvaloniaSyncer/AvaloniaSyncer.csproj b/src/AvaloniaSyncer/AvaloniaSyncer.csproj
@@ -16,6 +16,7 @@
     <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
     <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="ByteSize" Version="2.1.1" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
     <PackageReference Include="Deadpikle.AvaloniaProgressRing" Version="0.10.3" />
     <PackageReference Include="HttpClient.Extensions.LoggingHttpMessageHandler" Version="1.0.3" />
@@ -24,13 +25,20 @@
     <PackageReference Include="ReactiveUI.Validation" Version="3.1.7" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-    <PackageReference Include="Zafiro.Avalonia" Version="3.0.41" />
-    <PackageReference Include="Zafiro.Avalonia.Dialogs" Version="3.0.41" />
-    <PackageReference Include="Zafiro.Avalonia.FileExplorer" Version="1.0.13" />
-    <PackageReference Include="Zafiro.Avalonia.FileExplorer.Pickers" Version="1.0.13" />
-    <PackageReference Include="Zafiro.FileSystem.Local" Version="4.0.26" />
-    <PackageReference Include="Zafiro.FileSystem.SeaweedFS" Version="4.0.26" />
-    <PackageReference Include="Zafiro.FileSystem.Sftp" Version="4.0.26" />
-    <PackageReference Include="Zafiro.UI" Version="4.0.10" />
+    <PackageReference Include="Zafiro.Avalonia" Version="3.0.42" />
+    <PackageReference Include="Zafiro.Avalonia.Dialogs" Version="3.0.42" />
+    <PackageReference Include="Zafiro.Avalonia.FileExplorer" Version="1.0.14" />
+    <PackageReference Include="Zafiro.FileSystem.Local" Version="4.0.27" />
+    <PackageReference Include="Zafiro.FileSystem.SeaweedFS" Version="4.0.27" />
+    <PackageReference Include="Zafiro.FileSystem.Sftp" Version="4.0.27" />
+    <PackageReference Include="Zafiro.UI" Version="4.0.11" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Sections\Connections\Configuration\Sftp\SftpConfigurationView.axaml.cs">
+      <DependentUpon>SftpConfigurationView.axaml</DependentUpon>
+    </Compile>
+    <Compile Update="Sections\Synchronization\TopBar.axaml.cs">
+      <DependentUpon>%(Filename)</DependentUpon>
+    </Compile>
   </ItemGroup>
 </Project>
diff --git a/src/AvaloniaSyncer/ByteRateConverter.cs b/src/AvaloniaSyncer/ByteRateConverter.cs
@@ -0,0 +1,9 @@
+using Avalonia.Data.Converters;
+using ByteSizeLib;
+
+namespace AvaloniaSyncer;
+
+public static class ByteConverters
+{
+    public static FuncValueConverter<ByteSize, string> ByteRateConverter = new FuncValueConverter<ByteSize, string>(size => size + "/s");
+}
diff --git a/src/AvaloniaSyncer/Plugins/IPlugin.cs b/src/AvaloniaSyncer/Plugins/IPlugin.cs
diff --git a/src/AvaloniaSyncer/Plugins/IPluginSettings.cs b/src/AvaloniaSyncer/Plugins/IPluginSettings.cs
diff --git a/src/AvaloniaSyncer/Plugins/ISession.cs b/src/AvaloniaSyncer/Plugins/ISession.cs
diff --git a/src/AvaloniaSyncer/Plugins/ISessionConfiguration.cs b/src/AvaloniaSyncer/Plugins/ISessionConfiguration.cs
diff --git a/src/AvaloniaSyncer/Plugins/Local/Plugin.cs b/src/AvaloniaSyncer/Plugins/Local/Plugin.cs
diff --git a/src/AvaloniaSyncer/Plugins/Local/SessionView.axaml b/src/AvaloniaSyncer/Plugins/Local/SessionView.axaml
diff --git a/src/AvaloniaSyncer/Plugins/Local/SessionView.axaml.cs b/src/AvaloniaSyncer/Plugins/Local/SessionView.axaml.cs
diff --git a/src/AvaloniaSyncer/Plugins/Local/SessionViewModel.cs b/src/AvaloniaSyncer/Plugins/Local/SessionViewModel.cs
diff --git a/src/AvaloniaSyncer/Plugins/SeaweedFS/Configuration/ConfigurationView.axaml b/src/AvaloniaSyncer/Plugins/SeaweedFS/Configuration/ConfigurationView.axaml
diff --git a/src/AvaloniaSyncer/Plugins/SeaweedFS/Configuration/ConfigurationView.axaml.cs b/src/AvaloniaSyncer/Plugins/SeaweedFS/Configuration/ConfigurationView.axaml.cs
diff --git a/src/AvaloniaSyncer/Plugins/SeaweedFS/Plugin.cs b/src/AvaloniaSyncer/Plugins/SeaweedFS/Plugin.cs
diff --git a/src/AvaloniaSyncer/Plugins/SeaweedFS/SessionView.axaml b/src/AvaloniaSyncer/Plugins/SeaweedFS/SessionView.axaml
diff --git a/src/AvaloniaSyncer/Plugins/SeaweedFS/SessionView.axaml.cs b/src/AvaloniaSyncer/Plugins/SeaweedFS/SessionView.axaml.cs