"Release Channel" Function

Flow.Launcher.Core/Updater.cs

@@ -21,16 +21,24 @@
 {
     public class Updater
     {
-        public string GitHubRepository { get; init; }
+        public string GitHubReleaseRepository { get; }
+        public string GitHubPrereleaseRepository { get; }
 
         private static readonly string ClassName = nameof(Updater);
 
+        public bool UpdateToPrerelease => _settings.PrereleaseUpdateSource;
+
+        public string GitHubRepository => UpdateToPrerelease ? GitHubPrereleaseRepository : GitHubReleaseRepository;
+
+        private readonly Settings _settings;
         private readonly IPublicAPI _api;
 
-        public Updater(IPublicAPI publicAPI, string gitHubRepository)
+        public Updater(Settings settings, IPublicAPI publicAPI, string gitHubReleaseRepository, string gitHubPrereleaseRepository)
         {
+            _settings = settings;
             _api = publicAPI;
-            GitHubRepository = gitHubRepository;
+            GitHubReleaseRepository = gitHubReleaseRepository;
+            GitHubPrereleaseRepository = gitHubPrereleaseRepository;
         }
 
         private SemaphoreSlim UpdateLock { get; } = new SemaphoreSlim(1);
@@ -102,7 +110,7 @@
                 {
                     _api.LogException(ClassName, $"Error Occurred", e);
                 }
-                
+
                 if (!silentUpdate)
                     _api.ShowMsg(_api.GetTranslation("update_flowlauncher_fail"),
                         _api.GetTranslation("update_flowlauncher_check_connection"));
@@ -138,7 +146,7 @@
             var latest = releases.Where(r => !r.Prerelease).OrderByDescending(r => r.PublishedAt).First();
             var latestUrl = latest.HtmlUrl.Replace("/tag/", "/download/");
 
             var client = new WebClient
             {
                 Proxy = Http.WebProxy
             };

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -134,6 +134,8 @@ public string SettingWindowFont
         public double? SettingWindowLeft { get; set; } = null;
         public WindowState SettingWindowState { get; set; } = WindowState.Normal;
 
+        public bool PrereleaseUpdateSource { get; set; }
+
         private bool _showPlaceholder { get; set; } = true;
         public bool ShowPlaceholder
         {

Flow.Launcher/App.xaml.cs

@@ -60,7 +60,7 @@
                 var storage = new FlowLauncherJsonStorage<Settings>();
                 _settings = storage.Load();
                 _settings.SetStorage(storage);
                 _settings.WMPInstalled = WindowsMediaPlayerHelper.IsWindowsMediaPlayerInstalled();
             }
             catch (Exception e)
             {
@@ -75,7 +75,11 @@
                     .UseContentRoot(AppContext.BaseDirectory)
                     .ConfigureServices(services => services
                         .AddSingleton(_ => _settings)
-                        .AddSingleton(sp => new Updater(sp.GetRequiredService<IPublicAPI>(), Launcher.Properties.Settings.Default.GithubRepo))
+                        .AddSingleton(sp => new Updater(
+                            _settings,
+                            sp.GetRequiredService<IPublicAPI>(),
+                            Launcher.Properties.Settings.Default.GithubRepo,
+                            Launcher.Properties.Settings.Default.PrereleaseRepo))
                         .AddSingleton<Portable>()
                         .AddSingleton<IAlphabet, PinyinAlphabet>()
                         .AddSingleton<StringMatcher>()
@@ -103,7 +107,7 @@
                         .AddTransient<SelectBrowserViewModel>()
                         .AddTransient<SelectFileManagerViewModel>()
                     ).Build();
                 Ioc.Default.ConfigureServices(host.Services);
             }
             catch (Exception e)
             {
@@ -114,9 +118,9 @@
             // Initialize the public API and Settings first
             try
             {
                 API = Ioc.Default.GetRequiredService<IPublicAPI>();
                 _settings.Initialize();
                 _mainVM = Ioc.Default.GetRequiredService<MainViewModel>();
             }
             catch (Exception e)
             {
@@ -173,7 +177,7 @@
 
                 Notification.Install();
 
                 Ioc.Default.GetRequiredService<Portable>().PreStartCleanUpAfterPortabilityUpdate();
 
                 API.LogInfo(ClassName, "Begin Flow Launcher startup ----------------------------------------------------");
                 API.LogInfo(ClassName, $"Runtime info:{ErrorReporting.RuntimeInfo()}");
@@ -198,7 +202,7 @@
                 // Change language after all plugins are initialized because we need to update plugin title based on their api
                 await Ioc.Default.GetRequiredService<Internationalization>().InitializeLanguageAsync();
 
                 await imageLoadertask;
 
                 _mainWindow = new MainWindow();
 
@@ -224,7 +228,7 @@
             });
         }
 
 #pragma warning restore VSTHRD100 // Avoid async void methods
 
         /// <summary>
         /// Check startup only for Release

Flow.Launcher/Flow.Launcher.csproj

@@ -123,6 +123,18 @@
     </Content>
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="Properties\Settings.Designer.cs">
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
+    <None Update="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+
   <ItemGroup>
     <None Update="Resources\dev.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

Flow.Launcher/Languages/en.xaml

@@ -356,6 +356,9 @@
     <system:String x:Key="clearcachefolderMessage">Are you sure you want to delete all caches?</system:String>
     <system:String x:Key="clearfolderfailMessage">Failed to clear part of folders and files. Please see log file for more information</system:String>
     <system:String x:Key="welcomewindow">Wizard</system:String>
+    <system:String x:Key="updateSource">Release Channel</system:String>
+    <system:String x:Key="release">Stable</system:String>
+    <system:String x:Key="prerelease">Pre-release</system:String>
     <system:String x:Key="userdatapath">User Data Location</system:String>
     <system:String x:Key="userdatapathToolTip">User settings and installed plugins are saved in the user data folder. This location may vary depending on whether it's in portable mode or not.</system:String>
     <system:String x:Key="userdatapathButton">Open Folder</system:String>

Flow.Launcher/Properties/Settings.settings

@@ -5,5 +5,8 @@
     <Setting Name="GithubRepo" Type="System.String" Scope="Application">
       <Value Profile="(Default)">https://github.com/Flow-Launcher/Flow.Launcher</Value>
     </Setting>
+      <Setting Name="PrereleaseRepo" Type="System.String" Scope="Application">
+          <Value Profile="(Default)">https://github.com/Flow-Launcher/Prereleases</Value>
+      </Setting>
   </Settings>
 </SettingsFile>

Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs

@@ -55,7 +55,17 @@
         App.API.GetTranslation("about_activate_times"),
         _settings.ActivateTimes
     );
-
+
+    public int PrereleaseSelectedIndex
+    {
+        get => _settings.PrereleaseUpdateSource ? 1 : 0;
+        set
+        {
+            _settings.PrereleaseUpdateSource = value == 1;
+            OnPropertyChanged();
+        }
+    }
+
     public class LogLevelData : DropdownDataGeneric<LOGLEVEL> { }
 
     public List<LogLevelData> LogLevels { get; } =
@@ -116,8 +126,8 @@
     private void AskClearCacheFolderConfirmation()
     {
         var confirmResult = App.API.ShowMsgBox(
             App.API.GetTranslation("clearcachefolderMessage"),
             App.API.GetTranslation("clearcachefolder"),
             MessageBoxButton.YesNo
         );
 
@@ -125,7 +135,7 @@
         {
             if (!ClearCacheFolder())
             {
                 App.API.ShowMsgBox(App.API.GetTranslation("clearfolderfailMessage"));
             }
         }
     }

Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml

@@ -36,10 +36,6 @@
                 Icon=""
                 Sub="{DynamicResource version}">
                 <StackPanel Orientation="Horizontal">
-                    <Button
-                        Margin="0 0 10 0"
-                        Command="{Binding UpdateAppCommand}"
-                        Content="{DynamicResource checkUpdates}" />
                     <Button Padding="0" Style="{StaticResource AccentButtonStyle}">
                         <Hyperlink
                             NavigateUri="{Binding SponsorPage}"
@@ -54,6 +50,16 @@
                 </StackPanel>
             </cc:Card>
 
+            <cc:Card Title="{DynamicResource updateSource}" Icon="&#xE777;">
+                <StackPanel Orientation="Horizontal">
+                    <ComboBox Margin="0 0 10 0" SelectedIndex="{Binding PrereleaseSelectedIndex}">
+                        <ComboBoxItem Content="{DynamicResource release}" />
+                        <ComboBoxItem Content="{DynamicResource prerelease}" />
+                    </ComboBox>
+                    <Button Command="{Binding UpdateAppCommand}" Content="{DynamicResource checkUpdates}" />
+                </StackPanel>
+            </cc:Card>
+
             <cc:Card Title="{DynamicResource releaseNotes}" Icon="&#xe8fd;">
                 <Button Command="{Binding OpenReleaseNotesCommand}" Content="{DynamicResource releaseNotes}" />
             </cc:Card>

Flow.Launcher/SettingWindow.xaml

@@ -1,4 +1,4 @@
-<Window
+<Window
     x:Class="Flow.Launcher.SettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"