Compare commits
No commits in common. "13a076ad791957cd1bf8ce15330425dda2c0ca15" and "b4ce64456e111e2be0d4984e724655623d0fcb5e" have entirely different histories.
13a076ad79
...
b4ce64456e
11 changed files with 236 additions and 550 deletions
|
|
@ -1,9 +0,0 @@
|
|||
using MetaforceInstaller.Core.Models;
|
||||
|
||||
namespace MetaforceInstaller.Core.Intefaces;
|
||||
|
||||
public interface IStorageService
|
||||
{
|
||||
AppData Load();
|
||||
void Save(AppData data);
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
namespace MetaforceInstaller.Core.Models;
|
||||
|
||||
public class AppData
|
||||
{
|
||||
public List<InstallationData> Installations { get; set; } = new();
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
namespace MetaforceInstaller.Core.Models;
|
||||
|
||||
public class InstallationData
|
||||
{
|
||||
public Guid Id { get; set; } = Guid.NewGuid();
|
||||
public string Title { get; set; }
|
||||
public string AndroidPackagePath { get; set; }
|
||||
public string WindowsServerPackagePath { get; set; }
|
||||
public string WindowsAdminPackagePath { get; set; }
|
||||
}
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
namespace MetaforceInstaller.Core.Models;
|
||||
|
||||
public record InstallationParts
|
||||
{
|
||||
public bool OculusClientExists { get; init; }
|
||||
public bool PicoClientExists { get; init; }
|
||||
public bool AndroidAdminExists { get; init; }
|
||||
public bool AndroidContentExists { get; init; }
|
||||
public bool WindowsContentExists { get; init; }
|
||||
public bool WindowsAdminExists { get; init; }
|
||||
public bool WindowsServerExists { get; init; }
|
||||
}
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
using System.Text.Json;
|
||||
using MetaforceInstaller.Core.Intefaces;
|
||||
using MetaforceInstaller.Core.Models;
|
||||
|
||||
namespace MetaforceInstaller.Core.Services;
|
||||
|
||||
public class StorageService : IStorageService
|
||||
{
|
||||
private readonly string _storagePath;
|
||||
|
||||
public StorageService()
|
||||
{
|
||||
var appData = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
|
||||
var appDirectory = Path.Combine(appData, "MetaforceInstaller");
|
||||
Directory.CreateDirectory(appDirectory);
|
||||
_storagePath = Path.Combine(appDirectory, "installations.json");
|
||||
}
|
||||
|
||||
public AppData Load()
|
||||
{
|
||||
if (!File.Exists(_storagePath))
|
||||
return new AppData();
|
||||
|
||||
var json = File.ReadAllText(_storagePath);
|
||||
return JsonSerializer.Deserialize<AppData>(json) ?? new AppData();
|
||||
}
|
||||
|
||||
public void Save(AppData data)
|
||||
{
|
||||
var json = JsonSerializer.Serialize(data, new JsonSerializerOptions
|
||||
{
|
||||
WriteIndented = true
|
||||
});
|
||||
File.WriteAllText(_storagePath, json);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,89 +0,0 @@
|
|||
using System.IO.Compression;
|
||||
using MetaforceInstaller.Core.Models;
|
||||
|
||||
namespace MetaforceInstaller.Core.Services;
|
||||
|
||||
public class ZipScrapper
|
||||
{
|
||||
public static InstallationParts PeekFiles(ZipArchive archive)
|
||||
{
|
||||
return new InstallationParts
|
||||
{
|
||||
AndroidContentExists = DoesAndroidContentExists(archive),
|
||||
OculusClientExists = DoesOculusClientExists(archive),
|
||||
PicoClientExists = DoesPicoClientExists(archive),
|
||||
AndroidAdminExists = DoesAndroidAdminExists(archive),
|
||||
WindowsAdminExists = DoesPcAdminExists(archive),
|
||||
WindowsContentExists = DoesWindowsContentExists(archive),
|
||||
WindowsServerExists = DoesServerExists(archive),
|
||||
};
|
||||
// Console.WriteLine($"Contents of {archive}:");
|
||||
// Console.WriteLine("----------------------------------");
|
||||
//
|
||||
// foreach (ZipArchiveEntry entry in archive.Entries)
|
||||
// {
|
||||
// // You can access properties like entry.Name, entry.FullName, entry.Length (uncompressed size), entry.CompressedLength
|
||||
// Console.WriteLine($"Entry: {entry.FullName}");
|
||||
// Console.WriteLine($" Uncompressed Size: {entry.Length} bytes");
|
||||
// Console.WriteLine($" Compressed Size: {entry.CompressedLength} bytes");
|
||||
// Console.WriteLine("----------------------------------");
|
||||
// }
|
||||
}
|
||||
|
||||
public static string ExtractZip(ZipArchive archive, string outputPath)
|
||||
{
|
||||
archive.ExtractToDirectory(outputPath);
|
||||
return outputPath;
|
||||
}
|
||||
|
||||
private static bool DoesPicoClientExists(ZipArchive archive)
|
||||
{
|
||||
return archive.Entries
|
||||
.Any(entry => entry.Name.Contains("MetaforcePico")
|
||||
&& entry.Name.EndsWith(".apk"));
|
||||
}
|
||||
|
||||
private static bool DoesOculusClientExists(ZipArchive archive)
|
||||
{
|
||||
return archive.Entries
|
||||
.Any(entry => entry.Name.Contains("MetaforceOculus")
|
||||
&& entry.Name.EndsWith(".apk"));
|
||||
}
|
||||
|
||||
private static bool DoesAndroidAdminExists(ZipArchive archive)
|
||||
{
|
||||
return archive.Entries
|
||||
.Any(entry => entry.Name.Contains("MetaforceAdmin")
|
||||
&& entry.Name.EndsWith(".apk"));
|
||||
}
|
||||
|
||||
private static bool DoesAndroidContentExists(ZipArchive archive)
|
||||
{
|
||||
return archive.Entries
|
||||
.Any(entry => entry.Name.Contains("Content_Android")
|
||||
&& entry.Name.EndsWith(".zip"));
|
||||
}
|
||||
|
||||
private static bool DoesWindowsContentExists(ZipArchive archive)
|
||||
{
|
||||
return archive.Entries
|
||||
.Any(entry => entry.Name.Contains("Content_StandaloneWindows")
|
||||
&& entry.Name.EndsWith(".zip"));
|
||||
}
|
||||
|
||||
private static bool DoesPcAdminExists(ZipArchive archive)
|
||||
{
|
||||
return archive.Entries
|
||||
.Any(entry => entry.FullName.Contains("MetaforceAdminPC")
|
||||
&& entry.Name.EndsWith(".exe") && !entry.Name.Contains("UnityCrashHandler") &&
|
||||
!entry.Name.Contains("crashpad_handler"));
|
||||
}
|
||||
|
||||
private static bool DoesServerExists(ZipArchive archive)
|
||||
{
|
||||
return archive.Entries
|
||||
.Any(entry => entry.FullName.Contains("MetaforceServer")
|
||||
&& entry.Name.EndsWith(".exe") && !entry.Name.Contains("UnityCrashHandler") &&
|
||||
!entry.Name.Contains("crashpad_handler"));
|
||||
}
|
||||
}
|
||||
|
|
@ -10,11 +10,11 @@
|
|||
<ResourceDictionary>
|
||||
<ResourceDictionary.ThemeDictionaries>
|
||||
<ResourceDictionary x:Key="Light">
|
||||
<SvgImage x:Key="Logo" Source="/Images/logo_red.svg" />
|
||||
<SvgImage x:Key="Logo" Source="/Images/logo_red.svg"/>
|
||||
</ResourceDictionary>
|
||||
|
||||
<ResourceDictionary x:Key="Dark">
|
||||
<SvgImage x:Key="Logo" Source="/Images/logo_red.svg" />
|
||||
<SvgImage x:Key="Logo" Source="/Images/logo_red.svg"/>
|
||||
</ResourceDictionary>
|
||||
</ResourceDictionary.ThemeDictionaries>
|
||||
</ResourceDictionary>
|
||||
|
|
@ -22,44 +22,49 @@
|
|||
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="96" />
|
||||
<RowDefinition Height="*" />
|
||||
<RowDefinition Height="Auto" />
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Image Grid.Row="0"
|
||||
Margin="20"
|
||||
VerticalAlignment="Center"
|
||||
Source="{DynamicResource Logo}"
|
||||
HorizontalAlignment="Left">
|
||||
</Image>
|
||||
<!-- Main Content Area -->
|
||||
<Grid Grid.Row="0" Margin="8">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="3*" /> <!-- 30% -->
|
||||
<ColumnDefinition Width="7*" /> <!-- 70% -->
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Button Grid.Row="0" Name="NewInstallationButton" Margin="20" VerticalAlignment="Center"
|
||||
HorizontalAlignment="Right">
|
||||
+ Add new installation
|
||||
</Button>
|
||||
<!-- Left Panel - Buttons -->
|
||||
<StackPanel Grid.Column="0" Margin="20" Spacing="15">
|
||||
<Button Name="ChooseApkButton" Content="Choose .apk"
|
||||
HorizontalAlignment="Stretch" />
|
||||
|
||||
<ScrollViewer Grid.Row="1">
|
||||
<StackPanel Margin="10">
|
||||
<Expander Header="Item 1" Margin="0,5" HorizontalAlignment="Stretch">
|
||||
<TextBlock Text="Content for item 1" Margin="10" />
|
||||
</Expander>
|
||||
<Button Name="ChooseContentButton" Content="Choose .zip"
|
||||
HorizontalAlignment="Stretch" />
|
||||
|
||||
<Expander Header="Item 2" Margin="0,5" HorizontalAlignment="Stretch">
|
||||
<TextBlock Text="Content for item 2" Margin="10" />
|
||||
</Expander>
|
||||
|
||||
<Expander Header="Item 3" Margin="0,5" HorizontalAlignment="Stretch">
|
||||
<TextBlock Text="Content for item 3" Margin="10" />
|
||||
</Expander>
|
||||
|
||||
<Expander Header="Item 4" Margin="0,5" HorizontalAlignment="Stretch">
|
||||
<TextBlock Text="Content for item 4" Margin="10" />
|
||||
</Expander>
|
||||
|
||||
<Expander Header="Item 5" Margin="0,5" HorizontalAlignment="Stretch">
|
||||
<TextBlock Text="Content for item 5" Margin="10" />
|
||||
</Expander>
|
||||
<Button Name="InstallButton" Content="Install"
|
||||
HorizontalAlignment="Stretch" />
|
||||
</StackPanel>
|
||||
</ScrollViewer>
|
||||
|
||||
<Image Grid.Column="0"
|
||||
Margin="20"
|
||||
VerticalAlignment="Bottom"
|
||||
Source="{DynamicResource Logo}"
|
||||
HorizontalAlignment="Center">
|
||||
</Image>
|
||||
|
||||
<!-- Right Panel - Logs -->
|
||||
<TextBox Grid.Column="1" Name="LogsTextBox"
|
||||
IsReadOnly="True"
|
||||
AcceptsReturn="True"
|
||||
TextWrapping="Wrap"
|
||||
FontFamily="Consolas,Courier New,monospace"
|
||||
Focusable="False"
|
||||
Margin="4,0,0,0" />
|
||||
</Grid>
|
||||
|
||||
<!-- Progress Bar at Bottom -->
|
||||
<ProgressBar Grid.Row="1" Name="InstallProgressBar"
|
||||
Height="20" Minimum="0" Maximum="100" Value="0"
|
||||
Margin="8" />
|
||||
</Grid>
|
||||
</Window>
|
||||
|
|
@ -26,211 +26,205 @@ public partial class MainWindow : Window
|
|||
public MainWindow()
|
||||
{
|
||||
InitializeComponent();
|
||||
NewInstallationButton.Click += OnNewInstalltionClick;
|
||||
// LogMessage("MetaforceInstaller by slavagm");
|
||||
//
|
||||
// _adbService = new AdbService();
|
||||
// _adbService.ProgressChanged += OnAdbProgressChanged;
|
||||
// _adbService.StatusChanged += OnAdbStatusChanged;
|
||||
//
|
||||
// CheckAndEnableInstallButton();
|
||||
//
|
||||
// ChooseApkButton.Click += OnChooseApkClicked;
|
||||
// ChooseContentButton.Click += OnChooseContentClicked;
|
||||
// InstallButton.Click += OnInstallClicked;
|
||||
|
||||
LogMessage("MetaforceInstaller by slavagm");
|
||||
|
||||
_adbService = new AdbService();
|
||||
_adbService.ProgressChanged += OnAdbProgressChanged;
|
||||
_adbService.StatusChanged += OnAdbStatusChanged;
|
||||
|
||||
CheckAndEnableInstallButton();
|
||||
|
||||
ChooseApkButton.Click += OnChooseApkClicked;
|
||||
ChooseContentButton.Click += OnChooseContentClicked;
|
||||
InstallButton.Click += OnInstallClicked;
|
||||
}
|
||||
|
||||
public async void OnNewInstalltionClick(object? sender, RoutedEventArgs e)
|
||||
private void OnAdbProgressChanged(object? sender, ProgressInfo e)
|
||||
{
|
||||
var newInstallationDialog = new NewInstallationDialog();
|
||||
await newInstallationDialog.ShowDialog<NewInstallationDialog>(this);
|
||||
Dispatcher.UIThread.InvokeAsync(() =>
|
||||
{
|
||||
if (e.PercentageComplete != _lastUpdatedProgress &&
|
||||
e.PercentageComplete % PROGRESS_UPDATE_STEP == 0)
|
||||
{
|
||||
InstallProgressBar.Value = e.PercentageComplete;
|
||||
_lastUpdatedProgress = e.PercentageComplete;
|
||||
}
|
||||
|
||||
if (e.PercentageComplete != _lastLoggedProgress &&
|
||||
e.PercentageComplete % PROGRESS_LOG_STEP == 0 || e.PercentageComplete == 100)
|
||||
{
|
||||
LogMessage(
|
||||
e.TotalBytes > 0
|
||||
? $"Прогресс: {e.PercentageComplete}% ({FormatBytes(e.BytesTransferred)} / {FormatBytes(e.TotalBytes)})"
|
||||
: $"Прогресс: {e.PercentageComplete}%");
|
||||
|
||||
_lastLoggedProgress = e.PercentageComplete;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// private void OnAdbProgressChanged(object? sender, ProgressInfo e)
|
||||
// {
|
||||
// Dispatcher.UIThread.InvokeAsync(() =>
|
||||
// {
|
||||
// if (e.PercentageComplete != _lastUpdatedProgress &&
|
||||
// e.PercentageComplete % PROGRESS_UPDATE_STEP == 0)
|
||||
// {
|
||||
// InstallProgressBar.Value = e.PercentageComplete;
|
||||
// _lastUpdatedProgress = e.PercentageComplete;
|
||||
// }
|
||||
//
|
||||
// if (e.PercentageComplete != _lastLoggedProgress &&
|
||||
// e.PercentageComplete % PROGRESS_LOG_STEP == 0 || e.PercentageComplete == 100)
|
||||
// {
|
||||
// LogMessage(
|
||||
// e.TotalBytes > 0
|
||||
// ? $"Прогресс: {e.PercentageComplete}% ({FormatBytes(e.BytesTransferred)} / {FormatBytes(e.TotalBytes)})"
|
||||
// : $"Прогресс: {e.PercentageComplete}%");
|
||||
//
|
||||
// _lastLoggedProgress = e.PercentageComplete;
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
//
|
||||
// private void OnProgressReport(ProgressInfo progressInfo)
|
||||
// {
|
||||
// Dispatcher.UIThread.InvokeAsync(() =>
|
||||
// {
|
||||
// if (progressInfo.PercentageComplete != _lastUpdatedProgress &&
|
||||
// progressInfo.PercentageComplete % PROGRESS_UPDATE_STEP == 0)
|
||||
// {
|
||||
// InstallProgressBar.Value = progressInfo.PercentageComplete;
|
||||
// _lastUpdatedProgress = progressInfo.PercentageComplete;
|
||||
// }
|
||||
//
|
||||
//
|
||||
// if (progressInfo.PercentageComplete != _lastLoggedProgress &&
|
||||
// (progressInfo.PercentageComplete % PROGRESS_LOG_STEP == 0 || progressInfo.PercentageComplete == 100))
|
||||
// {
|
||||
// LogMessage(
|
||||
// progressInfo.TotalBytes > 0
|
||||
// ? $"Прогресс: {progressInfo.PercentageComplete}% ({FormatBytes(progressInfo.BytesTransferred)} / {FormatBytes(progressInfo.TotalBytes)})"
|
||||
// : $"Прогресс: {progressInfo.PercentageComplete}%");
|
||||
//
|
||||
// _lastLoggedProgress = progressInfo.PercentageComplete;
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
//
|
||||
// private void OnAdbStatusChanged(object? sender, string e)
|
||||
// {
|
||||
// Dispatcher.UIThread.InvokeAsync(() =>
|
||||
// {
|
||||
// InstallProgressBar.Value = 0;
|
||||
// _lastLoggedProgress = -1;
|
||||
// _lastUpdatedProgress = -1;
|
||||
// LogMessage(e);
|
||||
// });
|
||||
// }
|
||||
//
|
||||
// private string FormatBytes(long bytes)
|
||||
// {
|
||||
// string[] suffixes = ["B", "KB", "MB", "GB", "TB"];
|
||||
// var counter = 0;
|
||||
// double number = bytes;
|
||||
//
|
||||
// while (Math.Round(number / 1024) >= 1)
|
||||
// {
|
||||
// number /= 1024;
|
||||
// counter++;
|
||||
// }
|
||||
//
|
||||
// return $"{number:N1} {suffixes[counter]}";
|
||||
// }
|
||||
//
|
||||
//
|
||||
// private async void CheckAndEnableInstallButton()
|
||||
// {
|
||||
// InstallButton.IsEnabled = !string.IsNullOrEmpty(_apkPath) && !string.IsNullOrEmpty(_zipPath);
|
||||
// }
|
||||
//
|
||||
// private async void OnChooseApkClicked(object? sender, RoutedEventArgs e)
|
||||
// {
|
||||
// var topLevel = GetTopLevel(this);
|
||||
// var files = await topLevel!.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
|
||||
// {
|
||||
// Title = "Выберите APK файл",
|
||||
// AllowMultiple = false,
|
||||
// FileTypeFilter = new[]
|
||||
// {
|
||||
// new FilePickerFileType("APK Files")
|
||||
// {
|
||||
// Patterns = new[] { "*.apk" }
|
||||
// }
|
||||
// }
|
||||
// });
|
||||
//
|
||||
// if (files.Count >= 1)
|
||||
// {
|
||||
// _apkPath = files[0].Path.LocalPath;
|
||||
// LogMessage($"APK выбран: {Path.GetFileName(_apkPath)}");
|
||||
// }
|
||||
//
|
||||
// CheckAndEnableInstallButton();
|
||||
// }
|
||||
//
|
||||
// private async void OnChooseContentClicked(object? sender, RoutedEventArgs e)
|
||||
// {
|
||||
// var topLevel = GetTopLevel(this);
|
||||
// var files = await topLevel!.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
|
||||
// {
|
||||
// Title = "Выберите архив с контентом",
|
||||
// AllowMultiple = false,
|
||||
// FileTypeFilter = new[]
|
||||
// {
|
||||
// new FilePickerFileType("ZIP Files")
|
||||
// {
|
||||
// Patterns = new[] { "*.zip" }
|
||||
// }
|
||||
// }
|
||||
// });
|
||||
//
|
||||
// if (files.Count >= 1)
|
||||
// {
|
||||
// _zipPath = files[0].Path.LocalPath;
|
||||
// LogMessage($"Контент выбран: {Path.GetFileName(_zipPath)}");
|
||||
// }
|
||||
//
|
||||
// CheckAndEnableInstallButton();
|
||||
// }
|
||||
//
|
||||
// private async void OnInstallClicked(object? sender, RoutedEventArgs e)
|
||||
// {
|
||||
// if (string.IsNullOrEmpty(_apkPath) || string.IsNullOrEmpty(_zipPath))
|
||||
// {
|
||||
// LogMessage("Ошибка: Выберите APK файл и папку с контентом");
|
||||
// return;
|
||||
// }
|
||||
//
|
||||
// _adbService.RefreshDeviceData();
|
||||
//
|
||||
// InstallButton.IsEnabled = false;
|
||||
// InstallProgressBar.Value = 0;
|
||||
//
|
||||
// try
|
||||
// {
|
||||
// LogMessage("Начинаем установку...");
|
||||
//
|
||||
// var deviceInfo = _adbService.GetDeviceInfo();
|
||||
// LogMessage($"Найдено устройство: {deviceInfo.SerialNumber}");
|
||||
// LogMessage($"Состояние: {deviceInfo.State}");
|
||||
// LogMessage($"Модель: {deviceInfo.Model} - {deviceInfo.Name}");
|
||||
//
|
||||
// var progress = new Progress<ProgressInfo>(OnProgressReport);
|
||||
//
|
||||
// await _adbService.InstallApkAsync(_apkPath, progress);
|
||||
//
|
||||
// var apkInfo = ApkScrapper.GetApkInfo(_apkPath);
|
||||
// LogMessage($"Ставим {apkInfo.PackageName} версии {apkInfo.VersionName}");
|
||||
// var zipName = Path.GetFileName(_zipPath);
|
||||
// var outputPath =
|
||||
// @$"/storage/emulated/0/Android/data/{apkInfo.PackageName}/files/{zipName}";
|
||||
// LogMessage($"Начинаем копирование контента в {outputPath}");
|
||||
//
|
||||
// await _adbService.CopyFileAsync(_zipPath, outputPath, progress);
|
||||
//
|
||||
// LogMessage("Установка завершена успешно!");
|
||||
// }
|
||||
// catch (Exception ex)
|
||||
// {
|
||||
// LogMessage($"Ошибка установки: {ex.Message}");
|
||||
// }
|
||||
// finally
|
||||
// {
|
||||
// InstallButton.IsEnabled = true;
|
||||
// InstallProgressBar.Value = 0;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// private void LogMessage(string message)
|
||||
// {
|
||||
// var timestamp = DateTime.Now.ToString("HH:mm:ss");
|
||||
// LogsTextBox.Text += $"[{timestamp}] {message}\n";
|
||||
//
|
||||
// var scrollViewer = LogsTextBox.FindAncestorOfType<ScrollViewer>();
|
||||
// scrollViewer?.ScrollToEnd();
|
||||
// }
|
||||
private void OnProgressReport(ProgressInfo progressInfo)
|
||||
{
|
||||
Dispatcher.UIThread.InvokeAsync(() =>
|
||||
{
|
||||
if (progressInfo.PercentageComplete != _lastUpdatedProgress &&
|
||||
progressInfo.PercentageComplete % PROGRESS_UPDATE_STEP == 0)
|
||||
{
|
||||
InstallProgressBar.Value = progressInfo.PercentageComplete;
|
||||
_lastUpdatedProgress = progressInfo.PercentageComplete;
|
||||
}
|
||||
|
||||
|
||||
if (progressInfo.PercentageComplete != _lastLoggedProgress &&
|
||||
(progressInfo.PercentageComplete % PROGRESS_LOG_STEP == 0 || progressInfo.PercentageComplete == 100))
|
||||
{
|
||||
LogMessage(
|
||||
progressInfo.TotalBytes > 0
|
||||
? $"Прогресс: {progressInfo.PercentageComplete}% ({FormatBytes(progressInfo.BytesTransferred)} / {FormatBytes(progressInfo.TotalBytes)})"
|
||||
: $"Прогресс: {progressInfo.PercentageComplete}%");
|
||||
|
||||
_lastLoggedProgress = progressInfo.PercentageComplete;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void OnAdbStatusChanged(object? sender, string e)
|
||||
{
|
||||
Dispatcher.UIThread.InvokeAsync(() =>
|
||||
{
|
||||
InstallProgressBar.Value = 0;
|
||||
_lastLoggedProgress = -1;
|
||||
_lastUpdatedProgress = -1;
|
||||
LogMessage(e);
|
||||
});
|
||||
}
|
||||
|
||||
private string FormatBytes(long bytes)
|
||||
{
|
||||
string[] suffixes = ["B", "KB", "MB", "GB", "TB"];
|
||||
var counter = 0;
|
||||
double number = bytes;
|
||||
|
||||
while (Math.Round(number / 1024) >= 1)
|
||||
{
|
||||
number /= 1024;
|
||||
counter++;
|
||||
}
|
||||
|
||||
return $"{number:N1} {suffixes[counter]}";
|
||||
}
|
||||
|
||||
|
||||
private async void CheckAndEnableInstallButton()
|
||||
{
|
||||
InstallButton.IsEnabled = !string.IsNullOrEmpty(_apkPath) && !string.IsNullOrEmpty(_zipPath);
|
||||
}
|
||||
|
||||
private async void OnChooseApkClicked(object? sender, RoutedEventArgs e)
|
||||
{
|
||||
var topLevel = GetTopLevel(this);
|
||||
var files = await topLevel!.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
|
||||
{
|
||||
Title = "Выберите APK файл",
|
||||
AllowMultiple = false,
|
||||
FileTypeFilter = new[]
|
||||
{
|
||||
new FilePickerFileType("APK Files")
|
||||
{
|
||||
Patterns = new[] { "*.apk" }
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
if (files.Count >= 1)
|
||||
{
|
||||
_apkPath = files[0].Path.LocalPath;
|
||||
LogMessage($"APK выбран: {Path.GetFileName(_apkPath)}");
|
||||
}
|
||||
|
||||
CheckAndEnableInstallButton();
|
||||
}
|
||||
|
||||
private async void OnChooseContentClicked(object? sender, RoutedEventArgs e)
|
||||
{
|
||||
var topLevel = GetTopLevel(this);
|
||||
var files = await topLevel!.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
|
||||
{
|
||||
Title = "Выберите архив с контентом",
|
||||
AllowMultiple = false,
|
||||
FileTypeFilter = new[]
|
||||
{
|
||||
new FilePickerFileType("ZIP Files")
|
||||
{
|
||||
Patterns = new[] { "*.zip" }
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
if (files.Count >= 1)
|
||||
{
|
||||
_zipPath = files[0].Path.LocalPath;
|
||||
LogMessage($"Контент выбран: {Path.GetFileName(_zipPath)}");
|
||||
}
|
||||
|
||||
CheckAndEnableInstallButton();
|
||||
}
|
||||
|
||||
private async void OnInstallClicked(object? sender, RoutedEventArgs e)
|
||||
{
|
||||
if (string.IsNullOrEmpty(_apkPath) || string.IsNullOrEmpty(_zipPath))
|
||||
{
|
||||
LogMessage("Ошибка: Выберите APK файл и папку с контентом");
|
||||
return;
|
||||
}
|
||||
|
||||
_adbService.RefreshDeviceData();
|
||||
|
||||
InstallButton.IsEnabled = false;
|
||||
InstallProgressBar.Value = 0;
|
||||
|
||||
try
|
||||
{
|
||||
LogMessage("Начинаем установку...");
|
||||
|
||||
var deviceInfo = _adbService.GetDeviceInfo();
|
||||
LogMessage($"Найдено устройство: {deviceInfo.SerialNumber}");
|
||||
LogMessage($"Состояние: {deviceInfo.State}");
|
||||
LogMessage($"Модель: {deviceInfo.Model} - {deviceInfo.Name}");
|
||||
|
||||
var progress = new Progress<ProgressInfo>(OnProgressReport);
|
||||
|
||||
await _adbService.InstallApkAsync(_apkPath, progress);
|
||||
|
||||
var apkInfo = ApkScrapper.GetApkInfo(_apkPath);
|
||||
LogMessage($"Ставим {apkInfo.PackageName} версии {apkInfo.VersionName}");
|
||||
var zipName = Path.GetFileName(_zipPath);
|
||||
var outputPath =
|
||||
@$"/storage/emulated/0/Android/data/{apkInfo.PackageName}/files/{zipName}";
|
||||
LogMessage($"Начинаем копирование контента в {outputPath}");
|
||||
|
||||
await _adbService.CopyFileAsync(_zipPath, outputPath, progress);
|
||||
|
||||
LogMessage("Установка завершена успешно!");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
LogMessage($"Ошибка установки: {ex.Message}");
|
||||
}
|
||||
finally
|
||||
{
|
||||
InstallButton.IsEnabled = true;
|
||||
InstallProgressBar.Value = 0;
|
||||
}
|
||||
}
|
||||
|
||||
private void LogMessage(string message)
|
||||
{
|
||||
var timestamp = DateTime.Now.ToString("HH:mm:ss");
|
||||
LogsTextBox.Text += $"[{timestamp}] {message}\n";
|
||||
|
||||
var scrollViewer = LogsTextBox.FindAncestorOfType<ScrollViewer>();
|
||||
scrollViewer?.ScrollToEnd();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
<Window xmlns="https://github.com/avaloniaui"
|
||||
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"
|
||||
mc:Ignorable="d" d:DesignWidth="200" d:DesignHeight="400"
|
||||
x:Class="MetaforceInstaller.UI.NewInstallationDialog"
|
||||
Title="MetaforceInstaller">
|
||||
|
||||
<StackPanel Margin="24" Spacing="12">
|
||||
<Label FontSize="36">Add new installation</Label>
|
||||
<TextBox />
|
||||
<Button Name="ChooseZip">Choose .zip with installation</Button>
|
||||
<CheckBox Name="ServerCheckBox">Install server</CheckBox>
|
||||
<CheckBox Name="PcAdminCheckBox">Install admin</CheckBox>
|
||||
<CheckBox Name="AndroidAdminCheckbox">Save android admin</CheckBox>
|
||||
<CheckBox Name="VrClientCheckbox">Save VR client</CheckBox>
|
||||
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" Spacing="8">
|
||||
<Button Name="InstallButton">Install</Button>
|
||||
<Button Name="CancelButton">Cancel</Button>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
|
||||
</Window>
|
||||
|
|
@ -1,118 +0,0 @@
|
|||
using System.IO.Compression;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Interactivity;
|
||||
using Avalonia.Platform.Storage;
|
||||
using MetaforceInstaller.Core.Models;
|
||||
using MetaforceInstaller.Core.Services;
|
||||
|
||||
namespace MetaforceInstaller.UI;
|
||||
|
||||
public partial class NewInstallationDialog : Window
|
||||
{
|
||||
private string? _zipPath;
|
||||
private InstallationParts? _installationParts;
|
||||
|
||||
public NewInstallationDialog()
|
||||
{
|
||||
InitializeComponent();
|
||||
RefreshCheckboxes();
|
||||
CancelButton.Click += OnCancelClick;
|
||||
ChooseZip.Click += OnChooseZipClick;
|
||||
InstallButton.IsEnabled = false;
|
||||
InstallButton.Click += OnInstallClick;
|
||||
}
|
||||
|
||||
private async void RefreshCheckboxes()
|
||||
{
|
||||
var serverCheckbox = ServerCheckBox;
|
||||
var pcAdminCheckbox = PcAdminCheckBox;
|
||||
var androidAdminCheckbox = AndroidAdminCheckbox;
|
||||
var vrClientCheckbox = VrClientCheckbox;
|
||||
serverCheckbox.Content = TextDefaults.InstallServer;
|
||||
serverCheckbox.IsEnabled = true;
|
||||
pcAdminCheckbox.Content = TextDefaults.InstallAdmin;
|
||||
pcAdminCheckbox.IsEnabled = true;
|
||||
androidAdminCheckbox.Content = TextDefaults.SaveAndroidAdmin;
|
||||
androidAdminCheckbox.IsEnabled = true;
|
||||
vrClientCheckbox.Content = TextDefaults.SaveVRClient;
|
||||
vrClientCheckbox.IsEnabled = true;
|
||||
}
|
||||
|
||||
private async void OnChooseZipClick(object? sender, RoutedEventArgs e)
|
||||
{
|
||||
var topLevel = GetTopLevel(this);
|
||||
var files = await topLevel!.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
|
||||
{
|
||||
Title = "Выберите архив с контентом",
|
||||
AllowMultiple = false,
|
||||
FileTypeFilter =
|
||||
[
|
||||
new FilePickerFileType("ZIP Files")
|
||||
{
|
||||
Patterns = ["*.zip"]
|
||||
}
|
||||
]
|
||||
});
|
||||
|
||||
if (files.Count >= 1)
|
||||
{
|
||||
_zipPath = files[0].Path.LocalPath;
|
||||
using var archive = ZipFile.OpenRead(_zipPath);
|
||||
_installationParts = ZipScrapper.PeekFiles(archive);
|
||||
UpdateCheckboxes();
|
||||
archive.Dispose();
|
||||
}
|
||||
}
|
||||
|
||||
private async void OnInstallClick(object? sender, RoutedEventArgs e)
|
||||
{
|
||||
using var archive = ZipFile.OpenRead(_zipPath);
|
||||
|
||||
}
|
||||
|
||||
private void UpdateCheckboxes()
|
||||
{
|
||||
RefreshCheckboxes();
|
||||
var serverCheckbox = ServerCheckBox;
|
||||
var pcAdminCheckbox = PcAdminCheckBox;
|
||||
var androidAdminCheckbox = AndroidAdminCheckbox;
|
||||
var vrClientCheckbox = VrClientCheckbox;
|
||||
|
||||
if (!_installationParts.WindowsServerExists)
|
||||
{
|
||||
serverCheckbox.IsEnabled = false;
|
||||
serverCheckbox.Content += "\nCouldn't find directory with server";
|
||||
}
|
||||
|
||||
if (!_installationParts.WindowsAdminExists)
|
||||
{
|
||||
pcAdminCheckbox.IsEnabled = false;
|
||||
pcAdminCheckbox.Content += "\nCouldn't find directory with PC admin";
|
||||
}
|
||||
|
||||
if (!_installationParts.WindowsContentExists)
|
||||
{
|
||||
pcAdminCheckbox.IsEnabled = false;
|
||||
pcAdminCheckbox.Content += "\nCouldn't find windows content";
|
||||
}
|
||||
|
||||
if (!_installationParts.AndroidContentExists)
|
||||
{
|
||||
vrClientCheckbox.IsEnabled = false;
|
||||
vrClientCheckbox.Content += "\nCouldn't find android content";
|
||||
androidAdminCheckbox.IsEnabled = false;
|
||||
androidAdminCheckbox.Content += "\nCouldn't find android content";
|
||||
}
|
||||
|
||||
if (!_installationParts.PicoClientExists && !_installationParts.OculusClientExists)
|
||||
{
|
||||
vrClientCheckbox.IsEnabled = false;
|
||||
vrClientCheckbox.Content += "\nCouldn't find any VR clients";
|
||||
}
|
||||
}
|
||||
|
||||
private void OnCancelClick(object? sender, RoutedEventArgs e)
|
||||
{
|
||||
Close();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
namespace MetaforceInstaller.UI;
|
||||
|
||||
public static class TextDefaults
|
||||
{
|
||||
public static readonly string InstallServer = "Install Server";
|
||||
public static readonly string InstallAdmin = "Install Admin";
|
||||
public static readonly string SaveAndroidAdmin = "Save Android admin";
|
||||
public static readonly string SaveVRClient = "Save VR client";
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue