Merge pull request #370 from Fooxboy/369-вернуть-обратно-кнопку-прове…

…рки-обновлений #369 вернуть обратно кнопку проверки обновлений
Fooxboy · Apr 26, 2024 · d8e0e3b · d8e0e3b
2 parents b018898 + 2e2e1f4
commit d8e0e3b
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 37 deletions.
diff --git a/MusicX/RootWindow.xaml.cs b/MusicX/RootWindow.xaml.cs
@@ -440,30 +440,10 @@ private async Task CheckUpdatesInStart()
             try
             {
                 await Task.Delay(2000);
-                /*var github = StaticService.Container.GetRequiredService<GithubService>();
-
-                var release = await github.GetLastRelease();
-
-                if (release.TagName != StaticService.Version)
-                    navigationService.OpenModal<AvalibleNewUpdateModal>(release);*/
-
-                var config = await configService.GetConfig();
-
-                var getBetaUpdates = config.GetBetaUpdates.GetValueOrDefault(false);
-                var manager = new UpdateManager(new GithubSource("https://github.com/Fooxboy/MusicX-WPF",
-                    string.Empty, getBetaUpdates, new HttpClientFileDownloader()), new()
-                {
-                    ExplicitChannel = getBetaUpdates ? "win-beta" : "win"
-                });
-
-                var updateInfo = await manager.CheckForUpdatesAsync();
 
-                if (updateInfo is null)
-                    return;
-
-                var viewModel = new AvailableNewUpdateModalViewModel(manager, updateInfo);
-
-                navigationService.OpenModal<AvailableNewUpdateModal>(viewModel);
+                var updateService = StaticService.Container.GetRequiredService<UpdateService>();
+
+                await updateService.CheckForUpdates();
             }catch(Exception ex)
             {
                 var properties = new Dictionary<string, string>

diff --git a/MusicX/Services/UpdateService.cs b/MusicX/Services/UpdateService.cs
@@ -0,0 +1,40 @@
+using System.Threading.Tasks;
+using MusicX.ViewModels.Modals;
+using MusicX.Views.Modals;
+using Velopack;
+using Velopack.Sources;
+
+namespace MusicX.Services;
+
+public class UpdateService
+{
+    private readonly ConfigService _configService;
+    private readonly NavigationService _navigationService;
+
+    public UpdateService(ConfigService configService, NavigationService navigationService)
+    {
+        _configService = configService;
+        _navigationService = navigationService;
+    }
+
+    public async Task<bool> CheckForUpdates()
+    {
+        var getBetaUpdates = _configService.Config.GetBetaUpdates.GetValueOrDefault();
+        var manager = new UpdateManager(new GithubSource("https://github.com/Fooxboy/MusicX-WPF",
+            string.Empty, getBetaUpdates, new HttpClientFileDownloader()), new()
+        {
+            ExplicitChannel = getBetaUpdates ? "win-beta" : "win"
+        });
+
+        var updateInfo = await manager.CheckForUpdatesAsync();
+
+        if (updateInfo is null)
+            return false;
+
+        var viewModel = new AvailableNewUpdateModalViewModel(manager, updateInfo);
+
+        _navigationService.OpenModal<AvailableNewUpdateModal>(viewModel);
+
+        return true;
+    }
+}
diff --git a/MusicX/Views/SettingsView.xaml b/MusicX/Views/SettingsView.xaml
@@ -334,6 +334,15 @@
                                 Opacity="0.6"
                                 Text="26 марта 2022" />
                         </StackPanel>
+
+                        <wpfui:Button
+                            x:Name="CheckUpdates"
+                            Width="250"
+                            Margin="0,10,0,0"
+                            Appearance="Secondary"
+                            Click="CheckUpdates_Click"
+                            Content="Проверить обновления"
+                            Icon="ArrowSync12" />
 
                         <TextBlock
                             Margin="0,20,0,0"

diff --git a/MusicX/Views/SettingsView.xaml.cs b/MusicX/Views/SettingsView.xaml.cs
@@ -213,32 +213,25 @@ private async void CheckUpdates_Click(object sender, RoutedEventArgs e)
         {
             var snackbarService = StaticService.Container.GetRequiredService<ISnackbarService>();
 
+#if !DEBUG
             try
             {
-                var navigation = StaticService.Container.GetRequiredService<NavigationService>();
-                var github = StaticService.Container.GetRequiredService<GithubService>();
-
-                var release = await github.GetLastRelease();
-
-
-
-                if (release.TagName == StaticService.Version)
+                var updateService = StaticService.Container.GetRequiredService<UpdateService>();
+
+                if (!await updateService.CheckForUpdates())
                 {
                     snackbarService.Show("Уже обновлено!",
                         "У Вас установлена последняя версия MusicX! Обновлений пока что нет");
-
-                }
-                else
-                {
-                    navigation.OpenModal<AvailableNewUpdateModal>(release);
                 }
             }
             catch (Exception ex)
             {
                 snackbarService.Show("Ошибка", "Произошла ошибка при проверке обновлений");
 
             }
-
+#else
+            snackbarService.Show("В режиме отладки", "Сервис обновлений отключен");
+#endif
         }
 
         private void TelegramButton_Click(object sender, RoutedEventArgs e)

diff --git a/MusicX/Views/StartingWindow.xaml.cs b/MusicX/Views/StartingWindow.xaml.cs
@@ -112,6 +112,7 @@ await Task.Run(async () =>
                 collection.AddSingleton<WindowsAudioMixerService>();
                 collection.AddSingleton<ICustomSectionsService, CustomSectionsService>();
                 collection.AddSingleton<ISnackbarService, MusicXSnackbarService>();
+                collection.AddSingleton<UpdateService>();
 
                 var container = StaticService.Container = collection.BuildServiceProvider();