diff --git a/MetaforceInstaller.Cli/MetaforceInstaller.Cli.csproj b/MetaforceInstaller.Cli/MetaforceInstaller.Cli.csproj index dee32c2..a267acc 100644 --- a/MetaforceInstaller.Cli/MetaforceInstaller.Cli.csproj +++ b/MetaforceInstaller.Cli/MetaforceInstaller.Cli.csproj @@ -4,6 +4,8 @@ Exe net8.0 enable + true + true enable diff --git a/MetaforceInstaller.Core/Services/AdbService.cs b/MetaforceInstaller.Core/Services/AdbService.cs index e0e4920..ddf790f 100644 --- a/MetaforceInstaller.Core/Services/AdbService.cs +++ b/MetaforceInstaller.Core/Services/AdbService.cs @@ -2,6 +2,7 @@ using System.Reflection; using AdvancedSharpAdbClient; using AdvancedSharpAdbClient.DeviceCommands; using AdvancedSharpAdbClient.Models; +using AdvancedSharpAdbClient.Receivers; using MetaforceInstaller.Core.Intefaces; using MetaforceInstaller.Core.Models; using Microsoft.Extensions.Logging; @@ -154,6 +155,17 @@ public class AdbService : IAdbService TotalBytes = fileInfo.Length }); + var remoteDir = Path.GetDirectoryName(remotePath)?.Replace('\\', '/'); + if (!string.IsNullOrEmpty(remoteDir)) + { + var reciever = new ConsoleOutputReceiver(); + await Task.Run( + () => { _adbClient.ExecuteRemoteCommand($"mkdir -p \"{remoteDir}\"", _deviceData, reciever); }, + cancellationToken); + } + + _logger.LogInformation($"Ensured remote directory: {remoteDir}"); + await Task.Run(() => { using var fileStream = File.OpenRead(localPath); diff --git a/MetaforceInstaller.UI/Images/logo_black.svg b/MetaforceInstaller.UI/Images/logo_black.svg new file mode 100644 index 0000000..d41fcc9 --- /dev/null +++ b/MetaforceInstaller.UI/Images/logo_black.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MetaforceInstaller.UI/Images/logo_red.svg b/MetaforceInstaller.UI/Images/logo_red.svg new file mode 100644 index 0000000..1b73fdc --- /dev/null +++ b/MetaforceInstaller.UI/Images/logo_red.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + diff --git a/MetaforceInstaller.UI/Images/logo_white.svg b/MetaforceInstaller.UI/Images/logo_white.svg new file mode 100644 index 0000000..12ba8d1 --- /dev/null +++ b/MetaforceInstaller.UI/Images/logo_white.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MetaforceInstaller.UI/MainWindow.axaml b/MetaforceInstaller.UI/MainWindow.axaml index c1e1044..61a426d 100644 --- a/MetaforceInstaller.UI/MainWindow.axaml +++ b/MetaforceInstaller.UI/MainWindow.axaml @@ -5,45 +5,66 @@ mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="MetaforceInstaller.UI.MainWindow" Title="MetaforceInstaller"> - + + + + + + + + + + + + + + + - - + + - + - - + + - + -