add setting for using unoffical releases list

Author: unitycoder

UnityLauncherPro/GetUnityUpdates.cs

@@ -19,28 +19,29 @@ public static class GetUnityUpdates
 
         static Dictionary<string, string> unofficialReleaseURLs = new Dictionary<string, string>();
 
-        public static async Task<List<UnityVersion>> FetchAll()
+        public static async Task<List<UnityVersion>> FetchAll(bool useUnofficialList = false)
         {
             var cachedVersions = LoadCachedVersions();
             var newVersions = await FetchNewVersions(cachedVersions);
 
-            var unofficialVersions = await FetchUnofficialVersions(cachedVersions);
+            var allVersions = newVersions.Concat(cachedVersions).ToList();
 
-            unofficialReleaseURLs.Clear();
-            // TODO modify FetchUnofficialVersions to put items in this dictionary directly
-            foreach (var version in unofficialVersions)
+            if (useUnofficialList == true)
             {
-                //Console.WriteLine("unofficial: " + version.Version + " , " + version.directURL);
-                if (unofficialReleaseURLs.ContainsKey(version.Version) == false)
+                var unofficialVersions = await FetchUnofficialVersions(cachedVersions);
+                unofficialReleaseURLs.Clear();
+                // TODO modify FetchUnofficialVersions to put items in this dictionary directlys
+                foreach (var version in unofficialVersions)
                 {
-                    unofficialReleaseURLs.Add(version.Version, version.directURL);
+                    //Console.WriteLine("unofficial: " + version.Version + " , " + version.directURL);
+                    if (unofficialReleaseURLs.ContainsKey(version.Version) == false)
+                    {
+                        unofficialReleaseURLs.Add(version.Version, version.directURL);
+                    }
                 }
+                allVersions = unofficialVersions.Concat(allVersions).ToList();
             }
 
-            var allVersions = newVersions.Concat(unofficialVersions).Concat(cachedVersions).ToList();
-            //var allVersions = newVersions.Concat(cachedVersions).ToList();
-
-            // TODO save unofficial versions to cache also? or maybe not, they will appear in official list later
             if (newVersions.Count > 0)
             {
                 SaveCachedVersions(allVersions);
@@ -168,9 +169,9 @@ private static async Task<string> ExtractDownloadUrlAsync(string json, string un
                     Console.WriteLine("Unofficial release found in the list.");
 
                     string unityHash = ParseHashCodeFromURL(unofficialReleaseURLs[unityVersion]);
-                   // Console.WriteLine(unityHash);
+                    // Console.WriteLine(unityHash);
                     string downloadURL = Tools.ParseDownloadURLFromWebpage(unityVersion, unityHash, false, true);
-                   // Console.WriteLine("direct download url: "+downloadURL);
+                    // Console.WriteLine("direct download url: "+downloadURL);
                     return downloadURL;
                 }
 

UnityLauncherPro/MainWindow.xaml

@@ -810,6 +810,7 @@
                                     <CheckBox  x:Name="chkQuitAfterCommandline" Content="Close after launching from Explorer"  Unchecked="ChkQuitAfterCommandline_CheckedChanged" Checked="ChkQuitAfterCommandline_CheckedChanged" ToolTip="Close launcher after running from commandline or Explorer (recommended)" HorizontalAlignment="Left"/>
                                     <CheckBox  x:Name="chkAllowSingleInstanceOnly" Content="Allow single instance only"  Checked="ChkAllowSingleInstanceOnly_CheckedChanged" Unchecked="ChkAllowSingleInstanceOnly_CheckedChanged" ToolTip="Activates already running instance, instead of starting new exe (not working if app is minized to taskbar)" HorizontalAlignment="Left"/>
                                     <CheckBox x:Name="useAlphaReleaseNotesSite" Content="Use Unity Alpha Release Notes Site (only for final versions) "  ToolTip="Use the superior (but alpha) Unity Release Notes (https://alpha.release-notes.ds.unity3d.com/) site when clicking on the ReleaseNotes button. Otherwise will default to the normal build page." Checked="UseAlphaReleaseNotes_Checked" Unchecked="UseAlphaReleaseNotes_Checked"/>
+                                    <CheckBox x:Name="useUnofficialReleaseList" Content="Use Unofficial Release Watch List (for latest downloads)"  ToolTip="Checks latest releases from https://github.com/unitycoder/UnofficialUnityReleasesWatcher (if not yet available in The Unity Releases API)" Checked="useUnofficialReleaseList_Checked" Unchecked="useUnofficialReleaseList_Checked"/>
                                     <CheckBox x:Name="chkStreamerMode" Content="Streamer Mode (hide project names and folders)"  ToolTip="Hide project names and folders in main view" Checked="ChkStreamerMode_Checked" Unchecked="ChkStreamerMode_Checked" HorizontalAlignment="Left"/>
                                     <!--<StackPanel Orientation="Horizontal" Margin="0,0,0,4">
                                 <TextBox x:Name="txtTemplatePackagesFolder" BorderBrush="Transparent" CaretBrush="{DynamicResource ThemeSearchCaret}" Background="{DynamicResource ThemeTextBoxBackground}" SelectionBrush="{DynamicResource ThemeSearchSelection}" Foreground="{DynamicResource ThemeSearchForeground}" ToolTip="Folder for your custom unitypackage templates (for new project)" Padding="0,3,0,0" Width="110" TextChanged="TxtTemplatePackagesFolder_TextChanged" />

UnityLauncherPro/MainWindow.xaml.cs

@@ -459,6 +459,7 @@ void LoadSettings()
                 txtWebglRelativePath.Text = Settings.Default.webglBuildPath;
                 txtCustomThemeFile.Text = Settings.Default.themeFile;
                 useAlphaReleaseNotesSite.IsChecked = Settings.Default.useAlphaReleaseNotes;
+                useUnofficialReleaseList.IsChecked = Settings.Default.useUnofficialReleaseList;
 
                 chkEnablePlatformSelection.IsChecked = Settings.Default.enablePlatformSelection;
                 chkRunAutomatically.IsChecked = Settings.Default.runAutomatically;
@@ -783,7 +784,7 @@ void AddUnityInstallationRootFolder()
         async Task CallGetUnityUpdates()
         {
             dataGridUpdates.ItemsSource = null;
-            var task = GetUnityUpdates.FetchAll();
+            var task = GetUnityUpdates.FetchAll((bool)useUnofficialReleaseList.IsChecked);
             var items = await task;
             updatesSource = items.ToArray();
             if (updatesSource == null) return;
@@ -1105,7 +1106,7 @@ private async void OnTabSelectionChanged(object sender, SelectionChangedEventArg
                 // if we dont have previous results yet, TODO scan again if previous was 24hrs ago
                 if (updatesSource == null)
                 {
-                    var task = GetUnityUpdates.FetchAll();
+                    var task = GetUnityUpdates.FetchAll((bool)useUnofficialReleaseList.IsChecked);
                     var items = await task;
                     if (task.IsCompleted == false || task.IsFaulted == true) return;
                     if (items == null) return;
@@ -3832,6 +3833,14 @@ private void chkCheckSRP_Checked(object sender, RoutedEventArgs e)
             Settings.Default.Save();
             RefreshRecentProjects();
         }
+
+        private void useUnofficialReleaseList_Checked(object sender, RoutedEventArgs e)
+        {
+            if (this.IsActive == false) return; // dont run code on window init
+
+            Settings.Default.useUnofficialReleaseList = (bool)useUnofficialReleaseList.IsChecked;
+            Settings.Default.Save();
+        }
         //private void menuProjectProperties_Click(object sender, RoutedEventArgs e)
         //{
         //    var proj = GetSelectedProject();

UnityLauncherPro/Properties/Settings.Designer.cs

@@ -148,5 +148,8 @@
     <Setting Name="checkSRP" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="useUnofficialReleaseList" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>