diff --git a/README.md b/README.md
index 6580e79..3ff010a 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@ Handle all your Unity versions and Projects easily!
## Features
- Automagically Open Projects with Correct Unity Version
- Display Recent Projects list with last modified date and project version info
+- List more than 40 recent projects!
- Quickly Explore Project Folders
- List installed Unity versions, can easily Run, Explore installation folder, View release notes
- Download Missing Unity Versions in Browser
@@ -33,28 +34,29 @@ https://forum.unity.com/threads/unity-launcher-launch-correct-unity-versions-for
https://github.com/unitycoder/UnityLauncherPro/wiki
### Development
-See DEV branch for latest commits https://github.com/unitycoder/UnityLauncherPro/tree/dev
+See DEV branch for latest commits https://github.com/unitycoder/UnityLauncherPro/tree/dev
@@ -121,10 +121,10 @@
diff --git a/UnityLauncherPro/GetProjects.cs b/UnityLauncherPro/GetProjects.cs
index 836d509..95f7051 100644
--- a/UnityLauncherPro/GetProjects.cs
+++ b/UnityLauncherPro/GetProjects.cs
@@ -101,7 +101,6 @@ public static List Scan(bool getGitBranch = false, bool getPlasticBranc
}
// sometimes projects are in wrong order, seems to be related to messing up your unity registry, the keys are received in created order (so if you had removed/modified them manually, it might return wrong order instead of 0 - 40)
- // thats why need to sort projects list by modified date
// sort by modified date, projects without modified date are put to last, NOTE: this would remove projects without modified date (if they become last items, before trimming list on next step)
projectsFound.Sort((x, y) =>
{
@@ -112,7 +111,7 @@ public static List Scan(bool getGitBranch = false, bool getPlasticBranc
//return x.Modified.Value.CompareTo(y.Modified.Value); // BUG this breaks something, so that last item platform is wrong (for project that is missing from disk) ?
});
- // trim list to max amount
+ // trim list to max amount (older ones are dropped)
if (projectsFound.Count > MainWindow.maxProjectCount)
{
//Console.WriteLine("Trimming projects list to " + MainWindow.maxProjectCount + " projects");
@@ -146,8 +145,12 @@ static Project GetProjectInfo(string projectPath, bool getGitBranch = false, boo
//Console.WriteLine("valueName="+ valueName+" , projectName =" + projectName);
- // get last modified date from folder
- DateTime? lastUpdated = folderExists ? Tools.GetLastModifiedTime(projectPath) : null;
+ // get last modified date from most recent date of solution or folder
+ string solutionPath = Path.Combine(projectPath, $"{projectName}.sln");
+ bool solutionExists = File.Exists(solutionPath);
+ DateTime? solutionLastUpdated = solutionExists ? Tools.GetLastModifiedTime(solutionPath) : null;
+ DateTime? folderLastUpdated = folderExists ? Tools.GetLastModifiedTime(projectPath) : null;
+ DateTime? lastUpdated = solutionLastUpdated > folderLastUpdated ? solutionLastUpdated : folderLastUpdated;
// get project version
string projectVersion = folderExists ? Tools.GetProjectVersion(projectPath) : null;
diff --git a/UnityLauncherPro/GetUnityInstallations.cs b/UnityLauncherPro/GetUnityInstallations.cs
index cbae708..f12bc77 100644
--- a/UnityLauncherPro/GetUnityInstallations.cs
+++ b/UnityLauncherPro/GetUnityInstallations.cs
@@ -65,6 +65,25 @@ public static List Scan()
unity.IsPreferred = (version == MainWindow.preferredVersion);
unity.ProjectCount = GetProjectCountForUnityVersion(version);
+ if (Tools.IsAlpha(version))
+ {
+ unity.ReleaseType = "Alpha";
+ }
+ else if (Tools.IsBeta(version))
+ {
+ unity.ReleaseType = "Beta";
+ }
+ else
+ if (Tools.IsLTS(version))
+
+ {
+ unity.ReleaseType = "LTS";
+ }
+ else
+ {
+ unity.ReleaseType = ""; // cannot be null for UnitysFilter to work properly
+ }
+
// get platforms, NOTE if this is slow, do it later, or skip for commandline
var platforms = GetPlatforms(dataFolder);
// this is for editor tab, show list of all platforms in cell
diff --git a/UnityLauncherPro/MainWindow.xaml b/UnityLauncherPro/MainWindow.xaml
index 48e5cb1..681df19 100644
--- a/UnityLauncherPro/MainWindow.xaml
+++ b/UnityLauncherPro/MainWindow.xaml
@@ -50,7 +50,21 @@
-
+
+
+
+
+
+
@@ -81,9 +95,15 @@
-
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
@@ -266,11 +326,12 @@
-
-
+
+
+
+
@@ -414,19 +486,23 @@
-
+
+
-
+
-
+
@@ -472,6 +548,9 @@
+
+
@@ -501,10 +580,22 @@
-
+
+
+
+
@@ -646,10 +737,12 @@
-
+
@@ -662,7 +755,6 @@
-
diff --git a/UnityLauncherPro/MainWindow.xaml.cs b/UnityLauncherPro/MainWindow.xaml.cs
index 421b059..59b7e85 100644
--- a/UnityLauncherPro/MainWindow.xaml.cs
+++ b/UnityLauncherPro/MainWindow.xaml.cs
@@ -10,6 +10,7 @@
using System.Drawing; // for notifyicon
using System.IO;
using System.Runtime.InteropServices;
+using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
@@ -36,6 +37,7 @@ public partial class MainWindow : Window
public static readonly string projectNameFile = "ProjectName.txt";
public static string preferredVersion = null;
public static int projectNameSetting = 0; // 0 = folder or ProjectName.txt if exists, 1=ProductName
+ public static readonly string initScriptFileFullPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Scripts", "InitializeProject.cs");
const string contextRegRoot = "Software\\Classes\\Directory\\Background\\shell";
const string githubURL = "https://github.com/unitycoder/UnityLauncherPro";
@@ -46,6 +48,9 @@ public partial class MainWindow : Window
Updates[] updatesSource;
string _filterString = null;
+ bool multiWordSearch = false;
+ string[] searchWords;
+
int lastSelectedProjectIndex = 0;
Mutex myMutex;
ThemeEditor themeEditorWindow;
@@ -58,6 +63,7 @@ public partial class MainWindow : Window
Dictionary origResourceColors = new Dictionary();
string currentBuildReportProjectPath = null;
+ string currentBuildPluginsRelativePath = null;
//List> buildReports = new List>();
List buildReports = new List(); // multiple reports, each contains their own stats and items
int currentBuildReport = 0;
@@ -128,8 +134,9 @@ void Start()
// clear updates grid
dataGridUpdates.Items.Clear();
- // clear buildreport grid
+ // clear buildreport grids
gridBuildReport.Items.Clear();
+ gridBuildReportData.Items.Clear();
// build notifyicon (using windows.forms)
notifyIcon = new System.Windows.Forms.NotifyIcon();
@@ -145,15 +152,15 @@ void Start()
ApplyTheme(txtCustomThemeFile.Text);
// for autostart with minimized
- if (Properties.Settings.Default.runAutomatically == true && Properties.Settings.Default.runAutomaticallyMinimized == true)
+ if (Settings.Default.runAutomatically == true && Settings.Default.runAutomaticallyMinimized == true)
{
- // if application got started by the system, then hide, otherwise dont hide (user started it)
+ // if application was system started, then hide, otherwise dont hide (when user started it)
if (Directory.GetCurrentDirectory().ToLower() == @"c:\windows\system32")
{
+ this.ShowInTaskbar = false; // for some reason, otherwise it will show in taskbar only at start
notifyIcon.Visible = true;
this.Hide();
}
-
}
// TEST
@@ -250,6 +257,18 @@ void FilterRecentProjects()
{
// https://www.wpftutorial.net/DataViews.html
_filterString = txtSearchBox.Text;
+
+ if (_filterString.IndexOf(' ') > -1)
+ {
+ multiWordSearch = true;
+ searchWords = _filterString.Split(' ');
+ }
+ else
+ {
+ multiWordSearch = false;
+ }
+
+
ICollectionView collection = CollectionViewSource.GetDefaultView(projectsSource);
collection.Filter = ProjectFilter;
// set first row selected, if only 1 row
@@ -295,7 +314,26 @@ void FilterBuildReport()
private bool ProjectFilter(object item)
{
Project proj = item as Project;
- return (proj.Title.IndexOf(_filterString, 0, StringComparison.CurrentCultureIgnoreCase) != -1) || (searchProjectPathAlso && (proj.Path.IndexOf(_filterString, 0, StringComparison.CurrentCultureIgnoreCase) != -1));
+
+ // split search string by space, if it contains space
+ if (multiWordSearch == true)
+ {
+ bool found = true;
+ foreach (var word in searchWords)
+ {
+ bool titleMatched = proj.Title.IndexOf(word, 0, StringComparison.CurrentCultureIgnoreCase) != -1;
+ bool pathMatched = searchProjectPathAlso && proj.Path.IndexOf(word, 0, StringComparison.CurrentCultureIgnoreCase) != -1;
+ found = found && (titleMatched || pathMatched);
+ }
+ return found;
+ }
+ else // single word search
+ {
+ bool titleMatched = proj.Title.IndexOf(_filterString, 0, StringComparison.CurrentCultureIgnoreCase) != -1;
+ bool pathMatched = searchProjectPathAlso && proj.Path.IndexOf(_filterString, 0, StringComparison.CurrentCultureIgnoreCase) != -1;
+
+ return titleMatched || pathMatched;
+ }
}
private bool UpdatesFilter(object item)
@@ -334,7 +372,7 @@ private bool UpdatesFilter(object item)
private bool UnitysFilter(object item)
{
UnityInstallation unity = item as UnityInstallation;
- return (unity.Version.IndexOf(_filterString, 0, StringComparison.CurrentCultureIgnoreCase) != -1);
+ return (unity.Version?.IndexOf(_filterString, 0, StringComparison.CurrentCultureIgnoreCase) != -1) || (unity.ReleaseType?.IndexOf(_filterString, 0, StringComparison.CurrentCultureIgnoreCase) != -1) || (unity.PlatformsCombined?.IndexOf(_filterString, 0, StringComparison.CurrentCultureIgnoreCase) != -1);
}
private bool BuildReportFilter(object item)
@@ -361,6 +399,7 @@ void LoadSettings()
chkQuitAfterOpen.IsChecked = Properties.Settings.Default.closeAfterProject;
chkShowLauncherArgumentsColumn.IsChecked = Properties.Settings.Default.showArgumentsColumn;
chkShowGitBranchColumn.IsChecked = Properties.Settings.Default.showGitBranchColumn;
+ chkCheckPlasticBranch.IsChecked = Properties.Settings.Default.checkPlasticBranch;
chkShowMissingFolderProjects.IsChecked = Properties.Settings.Default.showProjectsMissingFolder;
chkAllowSingleInstanceOnly.IsChecked = Properties.Settings.Default.AllowSingleInstanceOnly;
chkAskNameForQuickProject.IsChecked = Properties.Settings.Default.askNameForQuickProject;
@@ -440,61 +479,61 @@ void LoadSettings()
}
// other setting vars
- preferredVersion = Properties.Settings.Default.preferredVersion;
+ preferredVersion = Settings.Default.preferredVersion;
// get last modified date format
- chkUseCustomLastModified.IsChecked = Properties.Settings.Default.useCustomLastModified;
- txtCustomDateTimeFormat.Text = Properties.Settings.Default.customDateFormat;
+ chkUseCustomLastModified.IsChecked = Settings.Default.useCustomLastModified;
+ txtCustomDateTimeFormat.Text = Settings.Default.customDateFormat;
- if (Properties.Settings.Default.useCustomLastModified)
+ if (Settings.Default.useCustomLastModified)
{
- currentDateFormat = Properties.Settings.Default.customDateFormat;
+ currentDateFormat = Settings.Default.customDateFormat;
}
else // use default
{
currentDateFormat = defaultDateFormat;
}
- chkHumanFriendlyDateTime.IsChecked = Properties.Settings.Default.useHumandFriendlyLastModified;
+ chkHumanFriendlyDateTime.IsChecked = Settings.Default.useHumandFriendlyLastModified;
// if both enabled, then disable custom
if (chkHumanFriendlyDateTime.IsChecked == true && chkUseCustomLastModified.IsChecked == true)
{
chkUseCustomLastModified.IsChecked = false;
}
- useHumanFriendlyDateFormat = Properties.Settings.Default.useHumandFriendlyLastModified;
- searchProjectPathAlso = Properties.Settings.Default.searchProjectPathAlso;
+ useHumanFriendlyDateFormat = Settings.Default.useHumandFriendlyLastModified;
+ searchProjectPathAlso = Settings.Default.searchProjectPathAlso;
chkSearchProjectPath.IsChecked = searchProjectPathAlso;
// recent grid column display index order
- var order = Properties.Settings.Default.recentColumnsOrder;
+ var order = Settings.Default.recentColumnsOrder;
// if we dont have any values, get & set them now
// also, if user has disabled optional columns, saved order must be reset to default
- if (order == null || gridRecent.Columns.Count != Properties.Settings.Default.recentColumnsOrder.Length)
+ if (order == null || gridRecent.Columns.Count != Settings.Default.recentColumnsOrder.Length)
{
- Properties.Settings.Default.recentColumnsOrder = new Int32[gridRecent.Columns.Count];
+ Settings.Default.recentColumnsOrder = new Int32[gridRecent.Columns.Count];
for (int i = 0; i < gridRecent.Columns.Count; i++)
{
- Properties.Settings.Default.recentColumnsOrder[i] = gridRecent.Columns[i].DisplayIndex;
+ Settings.Default.recentColumnsOrder[i] = gridRecent.Columns[i].DisplayIndex;
}
- Properties.Settings.Default.Save();
+ Settings.Default.Save();
}
else // load existing order
{
for (int i = 0; i < gridRecent.Columns.Count; i++)
{
- if (Properties.Settings.Default.recentColumnsOrder[i] > -1)
+ if (Settings.Default.recentColumnsOrder[i] > -1)
{
- gridRecent.Columns[i].DisplayIndex = Properties.Settings.Default.recentColumnsOrder[i];
+ gridRecent.Columns[i].DisplayIndex = Settings.Default.recentColumnsOrder[i];
}
}
}
- adbLogCatArgs = Properties.Settings.Default.adbLogCatArgs;
+ adbLogCatArgs = Settings.Default.adbLogCatArgs;
txtLogCatArgs.Text = adbLogCatArgs;
- projectNameSetting = Properties.Settings.Default.projectName;
+ projectNameSetting = Settings.Default.projectName;
switch (projectNameSetting)
{
case 0:
@@ -511,22 +550,22 @@ void LoadSettings()
// set default .bat folder location to appdata/.., if nothing is set, or current one is invalid
if (string.IsNullOrEmpty(txtShortcutBatchFileFolder.Text) || Directory.Exists(txtShortcutBatchFileFolder.Text) == false)
{
- Properties.Settings.Default.shortcutBatchFileFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), appName);
- txtShortcutBatchFileFolder.Text = Properties.Settings.Default.shortcutBatchFileFolder;
+ Settings.Default.shortcutBatchFileFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), appName);
+ txtShortcutBatchFileFolder.Text = Settings.Default.shortcutBatchFileFolder;
}
- chkUseInitScript.IsChecked = Properties.Settings.Default.useInitScript;
- txtCustomInitFile.Text = Properties.Settings.Default.customInitFile;
+ chkUseInitScript.IsChecked = Settings.Default.useInitScript;
+ txtCustomInitFileURL.Text = Settings.Default.customInitFileURL;
// load webgl port
- txtWebglPort.Text = "" + Properties.Settings.Default.webglPort;
- webglPort = Properties.Settings.Default.webglPort;
+ txtWebglPort.Text = "" + Settings.Default.webglPort;
+ webglPort = Settings.Default.webglPort;
- txtMaxProjectCount.Text = Properties.Settings.Default.maxProjectCount.ToString();
- chkOverride40ProjectCount.IsChecked = Properties.Settings.Default.override40ProjectCount;
+ txtMaxProjectCount.Text = Settings.Default.maxProjectCount.ToString();
+ chkOverride40ProjectCount.IsChecked = Settings.Default.override40ProjectCount;
if ((bool)chkOverride40ProjectCount.IsChecked)
{
- maxProjectCount = Properties.Settings.Default.maxProjectCount;
+ maxProjectCount = Settings.Default.maxProjectCount;
}
else
{
@@ -710,11 +749,10 @@ async void GoLookForUpdatesForThisUnity()
var unity = GetSelectedUnity();
if (unity == null) return;
-
- // NOTE if updates are not loaded, should wait for that
if (dataGridUpdates.ItemsSource != null)
{
tabControl.SelectedIndex = 2;
+ txtSearchBoxUpdates.Text = ""; // need to clear old results first
// NOTE for now, just set filter to current version, minus patch version "2021.1.7f1" > "2021.1"
txtSearchBoxUpdates.Text = unity.Version.Substring(0, unity.Version.LastIndexOf('.'));
@@ -728,12 +766,24 @@ public void RefreshRecentProjects()
// take currently selected project row
lastSelectedProjectIndex = gridRecent.SelectedIndex;
// rescan recent projects
- // projectsSource = GetProjects.Scan(getGitBranch: (bool)chkShowGitBranchColumn.IsChecked, getPlasticBranch: (bool)chkCheckPlasticBranch.IsChecked, getArguments: (bool)chkShowLauncherArgumentsColumn.IsChecked, showMissingFolders: (bool)chkShowMissingFolderProjects.IsChecked, showTargetPlatform: (bool)chkShowPlatform.IsChecked);
- projectsSource = GetProjects.Scan(getGitBranch: (bool)chkShowGitBranchColumn.IsChecked, getPlasticBranch: (bool)chkCheckPlasticBranch.IsChecked, getArguments: (bool)chkShowLauncherArgumentsColumn.IsChecked, showMissingFolders: (bool)chkShowMissingFolderProjects.IsChecked, showTargetPlatform: (bool)chkShowPlatform.IsChecked, AllProjectPaths: Properties.Settings.Default.projectPaths);
+ projectsSource = GetProjects.Scan(getGitBranch: (bool)chkShowGitBranchColumn.IsChecked, getPlasticBranch: (bool)chkCheckPlasticBranch.IsChecked, getArguments: (bool)chkShowLauncherArgumentsColumn.IsChecked, showMissingFolders: (bool)chkShowMissingFolderProjects.IsChecked, showTargetPlatform: (bool)chkShowPlatform.IsChecked, AllProjectPaths: Settings.Default.projectPaths);
gridRecent.ItemsSource = projectsSource;
+
+ // fix sorting on refresh
+ foreach (DataGridColumn column in gridRecent.Columns)
+ {
+ if (column.Header.ToString() == Settings.Default.currentSortColumn)
+ {
+ // TODO FIXME, hack for correct direction on refresh only
+ Settings.Default.currentSortDirectionAscending = !Settings.Default.currentSortDirectionAscending;
+ var g = new DataGridSortingEventArgs(column);
+ SortHandlerRecentProjects(gridRecent, g);
+ break;
+ }
+ }
+
// focus back
Tools.SetFocusToGrid(gridRecent, lastSelectedProjectIndex);
- //Console.WriteLine("RefreshRecentProjects: " + projectsSource.Count);
SetStatus("Ready (" + projectsSource.Count + " projects)");
}
@@ -748,6 +798,7 @@ void NotifyIcon_MouseClick(object sender, System.Windows.Forms.MouseEventArgs e)
{
this.Show();
this.WindowState = WindowState.Normal;
+ this.ShowInTaskbar = true;
notifyIcon.Visible = false;
// NOTE workaround for grid not focused when coming back from minimized window
Tools.SetFocusToGrid(gridRecent, gridRecent.SelectedIndex);
@@ -772,9 +823,13 @@ private void BtnAddProjectFolder_Click(object sender, RoutedEventArgs e)
if (string.IsNullOrEmpty(folder) == false)
{
var proj = GetNewProjectData(folder);
- AddNewProjectToList(proj);
+ //AddNewProjectToList(proj);
+ Tools.AddProjectToHistory(proj.Path);
// clear search, so can see added project
txtSearchBox.Text = "";
+ RefreshRecentProjects();
+ // NOTE 0 works for sort-by-date only
+ Tools.SetFocusToGrid(gridRecent, 0);
}
}
@@ -784,7 +839,7 @@ Project GetNewProjectData(string folder)
p.Path = folder;
p.Title = Path.GetFileName(folder);
p.Version = Tools.GetProjectVersion(folder);
- p.Arguments = Tools.ReadCustomProjectData(folder, MainWindow.launcherArgumentsFile);
+ p.Arguments = Tools.ReadCustomProjectData(folder, launcherArgumentsFile);
if ((bool)chkShowPlatform.IsChecked == true) p.TargetPlatform = Tools.GetTargetPlatform(folder);
if ((bool)chkShowGitBranchColumn.IsChecked == true) p.GITBranch = Tools.ReadGitBranchInfo(folder);
return p;
@@ -793,9 +848,11 @@ Project GetNewProjectData(string folder)
void AddNewProjectToList(Project proj)
{
projectsSource.Insert(0, proj);
- gridRecent.Items.Refresh();
- Tools.SetFocusToGrid(gridRecent); // force focus
gridRecent.SelectedIndex = 0;
+ Tools.SetFocusToGrid(gridRecent);
+ // force refresh
+ txtSearchBox.Text = proj.Title;
+ txtSearchBox.Text = "";
}
private void BtnClose_Click(object sender, RoutedEventArgs e)
@@ -828,6 +885,8 @@ private void OnGetUnityUpdatesClick(object sender, RoutedEventArgs e)
// refresh installations, if already added some new ones
UpdateUnityInstallationsList();
txtSearchBoxUpdates.Text = "";
+ // clear filters, since right now they are not used after updates are loaded
+ rdoAll.IsChecked = true;
CallGetUnityUpdates();
button.IsEnabled = true;
@@ -888,13 +947,14 @@ private void OnWindowKeyDown(object sender, KeyEventArgs e)
gridRecent.BeginEdit();
}
break;
- default: // any key
+ default: // any key anykey
// cancel if editing cell
IEditableCollectionView itemsView = gridRecent.Items;
if (itemsView.IsAddingNew || itemsView.IsEditingItem) return;
// skip these keys
if (Keyboard.Modifiers == ModifierKeys.Alt) return;
+ if (Keyboard.Modifiers == ModifierKeys.Control) return;
// activate searchbar if not active and we are in tab#1
if (txtSearchBox.IsFocused == false)
@@ -906,7 +966,7 @@ private void OnWindowKeyDown(object sender, KeyEventArgs e)
}
break;
- case 1: // Unitys
+ case 1: // Unitys/Editors
switch (e.Key)
{
@@ -916,6 +976,13 @@ private void OnWindowKeyDown(object sender, KeyEventArgs e)
case Key.Escape: // clear project search
txtSearchBoxUnity.Text = "";
break;
+ default:
+ if (txtSearchBoxUnity.IsFocused == false)
+ {
+ txtSearchBoxUnity.Focus();
+ txtSearchBoxUnity.Select(txtSearchBoxUnity.Text.Length, 0);
+ }
+ break;
}
break;
@@ -950,7 +1017,7 @@ private void OnWindowKeyDown(object sender, KeyEventArgs e)
private async void OnTabSelectionChanged(object sender, SelectionChangedEventArgs e)
{
// if going into updates tab, fetch list (first time only)
- if (((TabControl)sender).SelectedIndex == (int)Tabs.Updates)
+ if (tabControl.SelectedIndex == (int)Tabs.Updates)
{
// if we dont have previous results yet, TODO scan again if previous was 24hrs ago
if (updatesSource == null)
@@ -1081,9 +1148,33 @@ private void BtnUpgradeProject_Click(object sender, RoutedEventArgs e)
private void GridRecent_Loaded(object sender, RoutedEventArgs e)
{
- Tools.SetFocusToGrid(gridRecent);
// if coming from explorer launch, and missing unity version, projectsource is still null?
if (projectsSource != null) SetStatus("Ready (" + projectsSource.Count + " projects)");
+ RefreshSorting();
+ Tools.SetFocusToGrid(gridRecent);
+ }
+
+ void RefreshSorting()
+ {
+ // use saved sort columns
+ if (string.IsNullOrEmpty(Settings.Default.currentSortColumn) == false)
+ {
+ // check if that column exists in headers
+ foreach (DataGridColumn column in gridRecent.Columns)
+ {
+ if (column.Header.ToString() == Settings.Default.currentSortColumn)
+ {
+ // TODO FIXME Project binding is to Title, not projects
+ Settings.Default.currentSortColumn = Settings.Default.currentSortColumn.Replace("Project", "Title");
+
+ // TODO FIXME, hack for correct direction on this refresh
+ Settings.Default.currentSortDirectionAscending = !Settings.Default.currentSortDirectionAscending;
+ var g = new DataGridSortingEventArgs(column);
+ SortHandlerRecentProjects(gridRecent, g);
+ break;
+ }
+ }
+ }
}
private void BtnExploreUnity_Click(object sender, RoutedEventArgs e)
@@ -1114,8 +1205,6 @@ private void BtnUpdateUnity_Click(object sender, RoutedEventArgs e)
GoLookForUpdatesForThisUnity();
}
-
-
// if press up/down in search box, move to first item in results
private void TxtSearchBox_PreviewKeyDown(object sender, KeyEventArgs e)
{
@@ -1400,6 +1489,21 @@ private void BtnDownloadInBrowser_Click(object sender, RoutedEventArgs e)
}
}
+ private void BtnDownloadInBrowserFull_Click(object sender, RoutedEventArgs e)
+ {
+ var unity = GetSelectedUpdate();
+ string url = Tools.GetUnityReleaseURL(unity?.Version);
+ if (string.IsNullOrEmpty(url) == false)
+ {
+ Tools.DownloadInBrowser(url, unity.Version, true);
+ }
+ else
+ {
+ Console.WriteLine("Failed getting Unity Installer URL for " + unity?.Version);
+ SetStatus("Failed getting Unity Installer URL for " + unity?.Version);
+ }
+ }
+
private void btnDownloadInstallUpdate_Click(object sender, RoutedEventArgs e)
{
var unity = GetSelectedUpdate();
@@ -1422,8 +1526,8 @@ private void BtnOpenWebsite_Click(object sender, RoutedEventArgs e)
private void ChkMinimizeToTaskbar_CheckedChanged(object sender, RoutedEventArgs e)
{
- Properties.Settings.Default.minimizeToTaskbar = (bool)chkMinimizeToTaskbar.IsChecked;
- Properties.Settings.Default.Save();
+ Settings.Default.minimizeToTaskbar = (bool)chkMinimizeToTaskbar.IsChecked;
+ Settings.Default.Save();
}
private void ChkRegisterExplorerMenu_CheckedChanged(object sender, RoutedEventArgs e)
@@ -1437,35 +1541,38 @@ private void ChkRegisterExplorerMenu_CheckedChanged(object sender, RoutedEventAr
Tools.RemoveContextMenuRegistry(contextRegRoot);
}
- Properties.Settings.Default.registerExplorerMenu = (bool)chkRegisterExplorerMenu.IsChecked;
- Properties.Settings.Default.Save();
+ Settings.Default.registerExplorerMenu = (bool)chkRegisterExplorerMenu.IsChecked;
+ Settings.Default.Save();
}
private void ChkShowLauncherArgumentsColumn_CheckedChanged(object sender, RoutedEventArgs e)
{
- Properties.Settings.Default.showArgumentsColumn = (bool)chkShowLauncherArgumentsColumn.IsChecked;
- Properties.Settings.Default.Save();
+ if (this.IsActive == false) return; // dont run code on window init
+ Settings.Default.showArgumentsColumn = (bool)chkShowLauncherArgumentsColumn.IsChecked;
+ Settings.Default.Save();
gridRecent.Columns[4].Visibility = (bool)chkShowLauncherArgumentsColumn.IsChecked ? Visibility.Visible : Visibility.Collapsed;
+ RefreshRecentProjects();
}
private void ChkShowGitBranchColumn_CheckedChanged(object sender, RoutedEventArgs e)
{
- Properties.Settings.Default.showGitBranchColumn = (bool)chkShowGitBranchColumn.IsChecked;
- Properties.Settings.Default.Save();
+ if (this.IsActive == false) return; // dont run code on window init
+ Settings.Default.showGitBranchColumn = (bool)chkShowGitBranchColumn.IsChecked;
+ Settings.Default.Save();
gridRecent.Columns[5].Visibility = (bool)chkShowGitBranchColumn.IsChecked ? Visibility.Visible : Visibility.Collapsed;
+ RefreshRecentProjects();
}
-
private void ChkQuitAfterOpen_CheckedChanged(object sender, RoutedEventArgs e)
{
- Properties.Settings.Default.closeAfterProject = (bool)chkQuitAfterOpen.IsChecked;
- Properties.Settings.Default.Save();
+ Settings.Default.closeAfterProject = (bool)chkQuitAfterOpen.IsChecked;
+ Settings.Default.Save();
}
private void ChkQuitAfterCommandline_CheckedChanged(object sender, RoutedEventArgs e)
{
- Properties.Settings.Default.closeAfterExplorer = (bool)chkQuitAfterCommandline.IsChecked;
- Properties.Settings.Default.Save();
+ Settings.Default.closeAfterExplorer = (bool)chkQuitAfterCommandline.IsChecked;
+ Settings.Default.Save();
}
private void MenuItemShowProjectInExplorer_Click(object sender, RoutedEventArgs e)
@@ -1686,14 +1793,14 @@ private void DataGridUpdates_PreviewMouseDoubleClick(object sender, MouseButtonE
private void ChkShowMissingFolderProjects_CheckedChanged(object sender, RoutedEventArgs e)
{
- Properties.Settings.Default.showProjectsMissingFolder = (bool)chkShowMissingFolderProjects.IsChecked;
- Properties.Settings.Default.Save();
+ Settings.Default.showProjectsMissingFolder = (bool)chkShowMissingFolderProjects.IsChecked;
+ Settings.Default.Save();
}
private void ChkAllowSingleInstanceOnly_CheckedChanged(object sender, RoutedEventArgs e)
{
- Properties.Settings.Default.AllowSingleInstanceOnly = (bool)chkAllowSingleInstanceOnly.IsChecked;
- Properties.Settings.Default.Save();
+ Settings.Default.AllowSingleInstanceOnly = (bool)chkAllowSingleInstanceOnly.IsChecked;
+ Settings.Default.Save();
}
private void BtnAssetPackages_Click(object sender, RoutedEventArgs e)
@@ -1705,8 +1812,8 @@ private void BtnAssetPackages_Click(object sender, RoutedEventArgs e)
private void MenuItemSetPreferredUnityVersion_Click(object sender, RoutedEventArgs e)
{
var ver = GetSelectedUnity().Version;
- Properties.Settings.Default.preferredVersion = ver;
- Properties.Settings.Default.Save();
+ Settings.Default.preferredVersion = ver;
+ Settings.Default.Save();
preferredVersion = ver;
// TODO update unity list or just set value?
@@ -1827,7 +1934,7 @@ void CreateNewEmptyProject(string targetFolder = null)
Console.WriteLine("Create project " + NewProject.newVersion + " : " + rootFolder);
if (string.IsNullOrEmpty(rootFolder)) return;
- var p = Tools.FastCreateProject(NewProject.newVersion, rootFolder, NewProject.newProjectName, NewProject.templateZipPath, NewProject.platformsForThisUnity, NewProject.selectedPlatform, (bool)chkUseInitScript.IsChecked, txtCustomInitFile.Text);
+ var p = Tools.FastCreateProject(NewProject.newVersion, rootFolder, NewProject.newProjectName, NewProject.templateZipPath, NewProject.platformsForThisUnity, NewProject.selectedPlatform, (bool)chkUseInitScript.IsChecked, initScriptFileFullPath);
// add to list (just in case new project fails to start, then folder is already generated..)
if (p != null) AddNewProjectToList(p);
@@ -1850,7 +1957,7 @@ void CreateNewEmptyProject(string targetFolder = null)
{
newVersion = GetSelectedUnity().Version == null ? preferredVersion : GetSelectedUnity().Version;
}
- var p = Tools.FastCreateProject(newVersion, rootFolder, null, null, null, null, (bool)chkUseInitScript.IsChecked, txtCustomInitFile.Text);
+ var p = Tools.FastCreateProject(newVersion, rootFolder, null, null, null, null, (bool)chkUseInitScript.IsChecked, initScriptFileFullPath);
if (p != null) AddNewProjectToList(p);
}
@@ -1875,7 +1982,7 @@ private void ChkStreamerMode_Checked(object sender, RoutedEventArgs e)
Style cellStyle = new Style(typeof(DataGridCell));
cellStyle.Setters.Add(new Setter(FontSizeProperty, 1.0));
txtColumnTitle.CellStyle = isChecked ? cellStyle : null;
- txtColumnName.CellStyle = isChecked ? cellStyle : null;
+ txtColumnPath.CellStyle = isChecked ? cellStyle : null;
txtColumnGitBranch.CellStyle = isChecked ? cellStyle : null;
Style txtBoxStyle = new Style(typeof(TextBox));
@@ -1894,8 +2001,8 @@ private void ChkShowPlatform_Checked(object sender, RoutedEventArgs e)
{
var isChecked = (bool)((CheckBox)sender).IsChecked;
- Properties.Settings.Default.showTargetPlatform = isChecked;
- Properties.Settings.Default.Save();
+ Settings.Default.showTargetPlatform = isChecked;
+ Settings.Default.Save();
gridRecent.Columns[6].Visibility = (bool)chkShowPlatform.IsChecked ? Visibility.Visible : Visibility.Collapsed;
@@ -2034,6 +2141,7 @@ void RefreshBuildReports()
try
{
+ // read editor.log file
using (FileStream fs = new FileStream(logFile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
{
using (StreamReader sr = new StreamReader(fs))
@@ -2043,6 +2151,8 @@ void RefreshBuildReports()
bool collectedBuildTime = false;
bool gotProjectPath = false;
+ bool hasTimeStamps = false;
+ bool gotOutputPluginsPath = false;
// TODO cleanup here
while (!sr.EndOfStream)
@@ -2055,8 +2165,44 @@ void RefreshBuildReports()
currentBuildReportProjectPath = line;
gotProjectPath = false;
}
- if (line == "-projectPath") gotProjectPath = true;
+ if (gotOutputPluginsPath == true)
+ {
+ // get output plugins folder relative path, this might not always work, if there is not copyfiles line in log
+ string pattern = @"CopyFiles\s+(.+?)/\w+\.\w+$";
+ Match match = Regex.Match(line, pattern);
+ if (match.Success)
+ {
+ string folder = match.Groups[1].Value;//.Replace("CopyFiles ", "");
+ if (folder.IndexOf("_Data/Plugins") > -1)
+ {
+ currentBuildPluginsRelativePath = folder;
+ }
+ }
+
+ gotOutputPluginsPath = false;
+ }
+
+ // if have timestamps, trim until 2nd | char at start
+
+ // check arguments
+ if (line.IndexOf("-projectPath") > -1) gotProjectPath = true;
+
+ // NOTE only works if your build path is inside Assets/Builds/ folder
+ if (line.IndexOf("CopyFiles") > -1 && line.ToLower().IndexOf("builds/") > -1) gotOutputPluginsPath = true;
+
+ if (hasTimeStamps == false && line.IndexOf("-timestamps") > -1)
+ {
+ hasTimeStamps = true;
+ // need to fix projectpath then
+ currentBuildReportProjectPath = currentBuildReportProjectPath.Substring(currentBuildReportProjectPath.IndexOf("|", currentBuildReportProjectPath.IndexOf("|") + 1) + 1);
+ }
+
+ // remove timestamp from line, NOTE if | character exists somewhere else than timestamp, causes issue
+ if (hasTimeStamps && line.IndexOf("|") > -1)
+ {
+ line = line.Substring(line.IndexOf("|", line.IndexOf("|") + 1) + 1).Trim();
+ }
// build report starts
if (collectRows == false && line.IndexOf("Used Assets and files from the Resources folder, sorted by uncompressed size:") == 0)
@@ -2098,17 +2244,46 @@ void RefreshBuildReports()
{
// it wasnt clean build, no report
if (singleReport == null) continue;
+ int start = line.IndexOf("(") + 1;
+ int end = line.IndexOf(" ms)", start);
- var ms = line.Substring(line.IndexOf("(") + 1, line.IndexOf(")") - line.IndexOf("(") - 1).Trim().Replace(" ms", "");
- singleReport.ElapsedTimeMS = long.Parse(ms);
- collectedBuildTime = true;
+ if (start > 0 && end > start)
+ {
+ string numberString = line.Substring(start, end - start);
+ singleReport.ElapsedTimeMS = long.Parse(numberString);
+ collectedBuildTime = true;
+ }
if (string.IsNullOrEmpty(currentBuildReportProjectPath) == false)
{
- // get streamingassets folder size and add to report, NOTE need to recalculate sizes then?
+ // get streamingassets folder size and add as last item to report, NOTE need to recalculate sizes then?
string streamingAssetPath = Path.Combine(currentBuildReportProjectPath, "Assets", "StreamingAssets");
var streamingAssetFolderSize = Tools.GetFolderSizeInBytes(streamingAssetPath);
singleReport.Stats.Insert(singleReport.Stats.Count - 1, new BuildReportItem() { Category = "StreamingAssets", Size = Tools.GetBytesReadable(streamingAssetFolderSize) });
+
+
+ // get total Plugins/ folder size from build! (but how to get last build output folder, its not mentioned in editor log (except some lines for CopyFiles/ but are those always there?)
+ // Library\PlayerDataCache\Linux641\ScriptsOnlyCache.yaml also contains output path
+ if (string.IsNullOrEmpty(currentBuildPluginsRelativePath) == false)
+ {
+ //Console.WriteLine("Getting output plugins folder size: "+ currentBuildPluginsRelativePath);
+ string pluginFolder = Path.Combine(currentBuildReportProjectPath, currentBuildPluginsRelativePath);
+ long totalPluginFolderSize = Tools.GetFolderSizeInBytes(pluginFolder);
+ singleReport.Stats.Insert(singleReport.Stats.Count - 1, new BuildReportItem() { Category = "Plugins", Size = Tools.GetBytesReadable(totalPluginFolderSize) });
+ }
+ else // then show plugin folders from project (with * to mark this is not accurate)
+ {
+ // get plugin folder sizes (they are not included in build report!), NOTE need to iterate all subfolders, as they might contain Plugins/ folders
+ // find all plugin folders inside Assets/
+ var pluginFolders = Directory.GetDirectories(Path.Combine(currentBuildReportProjectPath, "Assets"), "Plugins", SearchOption.AllDirectories);
+ long totalPluginFolderSize = 0;
+ foreach (var pluginFolder in pluginFolders)
+ {
+ totalPluginFolderSize += Tools.GetFolderSizeInBytes(pluginFolder);
+ }
+ singleReport.Stats.Insert(singleReport.Stats.Count - 1, new BuildReportItem() { Category = "Plugins *in proj!", Size = Tools.GetBytesReadable(totalPluginFolderSize) });
+ }
+
}
else
{
@@ -2154,15 +2329,15 @@ void RefreshBuildReports()
r.Percentage = line2.Substring(space1 + 2, space2 - space1 - 1);
r.Path = line2.Substring(space2 + 2, line2.Length - space2 - 2);
r.Format = Path.GetExtension(r.Path);
-
singleReport.Items.Add(r);
}
-
if (collectStats == true)
{
+
+ //if (hasTimeStamps)
var line2 = line.Trim();
- // get 2xspace after category name
+ // get 2x space after category name
var space1 = line2.IndexOf(" ");
// get tab after first size
var space2 = line2.IndexOf('\t');
@@ -2189,9 +2364,10 @@ void RefreshBuildReports()
singleReport.Stats.Add(r);
}
- }
- }
- }
+
+ } // while endofstream
+ } // streamreader
+ } // filestream
}
catch (Exception e)
{
@@ -2431,7 +2607,11 @@ private void TxtCustomThemeFile_PreviewKeyDown(object sender, KeyEventArgs e)
private void BtnExploreFolder_Click(object sender, RoutedEventArgs e)
{
- Tools.LaunchExplorer(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Themes"));
+ var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Themes");
+ if (Tools.LaunchExplorer(path) == false)
+ {
+ Tools.LaunchExplorer(AppDomain.CurrentDomain.BaseDirectory);
+ }
}
private void ChkEnablePlatformSelection_Checked(object sender, RoutedEventArgs e)
@@ -2618,8 +2798,8 @@ private void ChkRunAutomaticallyMinimized_Checked(object sender, RoutedEventArgs
if (this.IsActive == false) return; // dont run code on window init
var isChecked = (bool)((CheckBox)sender).IsChecked;
- Properties.Settings.Default.runAutomaticallyMinimized = isChecked;
- Properties.Settings.Default.Save();
+ Settings.Default.runAutomaticallyMinimized = isChecked;
+ Settings.Default.Save();
}
private void MenuItemEditPackages_Click(object sender, RoutedEventArgs e)
@@ -2797,8 +2977,8 @@ private void ChkSearchProjectPath_Checked(object sender, RoutedEventArgs e)
var isChecked = (bool)((CheckBox)sender).IsChecked;
searchProjectPathAlso = isChecked;
- Properties.Settings.Default.searchProjectPathAlso = isChecked;
- Properties.Settings.Default.Save();
+ Settings.Default.searchProjectPathAlso = isChecked;
+ Settings.Default.Save();
}
private void BtnCrashDumps_Click(object sender, RoutedEventArgs e)
@@ -2830,8 +3010,10 @@ private void MenuBatchBuildIOS_Click(object sender, RoutedEventArgs e)
private void ChkCheckPlasticBranch_Checked(object sender, RoutedEventArgs e)
{
- Properties.Settings.Default.checkPlasticBranch = (bool)chkCheckPlasticBranch.IsChecked;
- Properties.Settings.Default.Save();
+ if (this.IsActive == false) return; // dont run code on window init
+ Settings.Default.checkPlasticBranch = (bool)chkCheckPlasticBranch.IsChecked;
+ Settings.Default.Save();
+ RefreshRecentProjects();
}
private void MenuCreateDesktopShortCut_Click(object sender, RoutedEventArgs e)
@@ -2850,8 +3032,8 @@ private void TxtShortcutBatchFileFolder_TextChanged(object sender, TextChangedEv
var folder = ((TextBox)sender).Text;
if (Directory.Exists(folder))
{
- Properties.Settings.Default.shortcutBatchFileFolder = folder;
- Properties.Settings.Default.Save();
+ Settings.Default.shortcutBatchFileFolder = folder;
+ Settings.Default.Save();
}
}
@@ -2905,7 +3087,6 @@ void SortHandlerUpdates(object sender, DataGridSortingEventArgs e)
{
DataGridColumn column = e.Column;
- //Console.WriteLine("Sorted by " + column.Header);
IComparer comparer = null;
@@ -2967,17 +3148,27 @@ private void gridRecent_Sorting(object sender, DataGridSortingEventArgs e)
// https://stackoverflow.com/a/2130557/5452781
void SortHandlerRecentProjects(object sender, DataGridSortingEventArgs e)
{
+ // TESTing fix for null ref in commandline start
+ if (gridRecent.ItemsSource == null) return;
+
DataGridColumn column = e.Column;
- //Console.WriteLine("Sorted by " + column.Header);
+ // save current sort to prefs
+ Settings.Default.currentSortColumn = column.Header.ToString();
IComparer comparer = null;
// prevent the built-in sort from sorting
e.Handled = true;
+ // load sort dir
+ column.SortDirection = Settings.Default.currentSortDirectionAscending ? ListSortDirection.Ascending : ListSortDirection.Descending;
+
ListSortDirection direction = (column.SortDirection != ListSortDirection.Ascending) ? ListSortDirection.Ascending : ListSortDirection.Descending;
+ // save
+ Settings.Default.currentSortDirectionAscending = (direction == ListSortDirection.Ascending);
+
//set the sort order on the column
column.SortDirection = direction;
@@ -3048,29 +3239,34 @@ public int Compare(Object a, Object b)
private void btnExploreScriptsFolder_Click(object sender, RoutedEventArgs e)
{
- // TODO later this script should be inside some unity project, for easier updating..
- if (Tools.LaunchExplorer(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Scripts")) == false)
+ if (Tools.LaunchExplorer(Path.GetDirectoryName(initScriptFileFullPath)) == false)
{
- Tools.LaunchExplorer(Path.Combine(AppDomain.CurrentDomain.BaseDirectory));
+ // if failed, open parent folder (probably path was using URL or no scripts yet)
+ var parentPath = Directory.GetParent(Path.GetDirectoryName(initScriptFileFullPath)).FullName;
+ if (Tools.LaunchExplorer(parentPath) == false)
+ {
+ // if still failed, open exe folder
+ Tools.LaunchExplorer(AppDomain.CurrentDomain.BaseDirectory);
+ }
}
}
- private void txtCustomInitFile_PreviewKeyDown(object sender, KeyEventArgs e)
+ private void txtCustomInitFileURL_PreviewKeyDown(object sender, KeyEventArgs e)
{
switch (e.Key)
{
case Key.Return: // pressed enter in theme file text box
- Properties.Settings.Default.customInitFile = txtCustomInitFile.Text;
- Properties.Settings.Default.Save();
+ Settings.Default.customInitFileURL = txtCustomInitFileURL.Text;
+ Settings.Default.Save();
break;
}
}
- private void txtCustomInitFile_LostFocus(object sender, RoutedEventArgs e)
+ private void txtCustomInitFileURL_LostFocus(object sender, RoutedEventArgs e)
{
var s = (TextBox)sender;
- Properties.Settings.Default.customInitFile = s.Text;
- Properties.Settings.Default.Save();
+ Settings.Default.customInitFileURL = s.Text;
+ Settings.Default.Save();
}
private void chkUseInitScript_Checked(object sender, RoutedEventArgs e)
@@ -3078,8 +3274,8 @@ private void chkUseInitScript_Checked(object sender, RoutedEventArgs e)
if (this.IsActive == false) return; // dont run code on window init
var isChecked = (bool)((CheckBox)sender).IsChecked;
- Properties.Settings.Default.useInitScript = isChecked;
- Properties.Settings.Default.Save();
+ Settings.Default.useInitScript = isChecked;
+ Settings.Default.Save();
}
private void Window_MouseDown(object sender, MouseButtonEventArgs e)
@@ -3350,26 +3546,15 @@ private void tabControl_PreviewKeyDown(object sender, KeyEventArgs e)
}
}
+ private void btnFetchLatestInitScript_Click(object sender, RoutedEventArgs e)
+ {
+ Tools.DownloadInitScript(initScriptFileFullPath, txtCustomInitFileURL.Text);
+ }
-
-
-
- //private void BtnBrowseTemplateUnityPackagesFolder_Click(object sender, RoutedEventArgs e)
- //{
- // var folder = Tools.BrowseForOutputFolder("Select unitypackage Templates folder");
- // if (string.IsNullOrEmpty(folder) == false)
- // {
- // txtTemplatePackagesFolder.Text = folder;
- // Properties.Settings.Default.templatePackagesFolder = folder;
- // Properties.Settings.Default.Save();
- // }
- //}
-
- //private void TxtTemplatePackagesFolder_TextChanged(object sender, TextChangedEventArgs e)
- //{
- // Properties.Settings.Default.templatePackagesFolder = txtTemplatePackagesFolder.Text;
- // Properties.Settings.Default.Save();
- //}
+ private void btnHubLogs_Click(object sender, RoutedEventArgs e)
+ {
+ Tools.OpenAppdataSpecialFolder("../Roaming/UnityHub/logs/");
+ }
} // class
} //namespace
diff --git a/UnityLauncherPro/NewProject.xaml b/UnityLauncherPro/NewProject.xaml
index aacc0e1..66b407a 100644
--- a/UnityLauncherPro/NewProject.xaml
+++ b/UnityLauncherPro/NewProject.xaml
@@ -10,7 +10,7 @@
+
- InitializeProject.cs
-
False
@@ -132,5 +129,14 @@
50
+
+ https://raw.githubusercontent.com/unitycoder/UnityInitializeProject/main/Assets/Editor/InitializeProject.cs
+
+
+
+
+ True
+
\ No newline at end of file
diff --git a/UnityLauncherPro/Tools.cs b/UnityLauncherPro/Tools.cs
index 10c7324..1f8dd82 100644
--- a/UnityLauncherPro/Tools.cs
+++ b/UnityLauncherPro/Tools.cs
@@ -544,9 +544,9 @@ public static void OpenURL(string url)
Process.Start(url);
}
- public static void DownloadInBrowser(string url, string version)
+ public static void DownloadInBrowser(string url, string version, bool preferFullInstaller = false)
{
- string exeURL = ParseDownloadURLFromWebpage(version);
+ string exeURL = ParseDownloadURLFromWebpage(version, preferFullInstaller);
Console.WriteLine("download exeURL= (" + exeURL + ")");
@@ -580,31 +580,25 @@ public static void DownloadAndInstall(string url, string version)
// TODO make async
if (DownloadFile(exeURL, tempFile) == true)
{
- // run installer, copy current existing version path to clipboard, NOTE this probably never happens? unless install same version again..
- if (MainWindow.unityInstalledVersions.ContainsKey(version) == true)
+ // get base version, to use for install path
+ string outputVersionFolder = "\\" + version.Split('.')[0] + "_" + version.Split('.')[1];
+ string targetPathArgs = " /D=" + Properties.Settings.Default.rootFolders[Properties.Settings.Default.rootFolders.Count - 1] + outputVersionFolder; ;
+
+ // if user clicks NO to UAC, this fails (so added try-catch)
+ try
{
- string path = MainWindow.unityInstalledVersions[version];
- if (string.IsNullOrEmpty(path) == false)
- {
- // copy to clipboard
- Clipboard.SetText(path);
- }
+ Process process = new Process();
+ process.StartInfo.FileName = tempFile;
+ process.StartInfo.Arguments = targetPathArgs;
+ process.EnableRaisingEvents = true;
+ process.Exited += (sender, e) => DeleteTempFile(tempFile);
+ process.Start();
}
- else // no same version, copy last item from root folders
+ catch (Exception)
{
- if (Properties.Settings.Default.rootFolders.Count > 0)
- {
- string path = Properties.Settings.Default.rootFolders[Properties.Settings.Default.rootFolders.Count - 1];
- if (string.IsNullOrEmpty(path) == false)
- {
- Clipboard.SetText(path);
- }
- }
+ Console.WriteLine("Failed to run exe: " + tempFile);
+ DeleteTempFile(tempFile);
}
-
- Process process = Process.Start(tempFile);
- process.EnableRaisingEvents = true;
- process.Exited += (sender, e) => DeleteTempFile(tempFile);
// TODO refresh upgrade dialog after installer finished
}
}
@@ -616,6 +610,77 @@ public static void DownloadAndInstall(string url, string version)
}
}
+ static readonly string initFileDefaultURL = "https://raw.githubusercontent.com/unitycoder/UnityInitializeProject/main/Assets/Editor/InitializeProject.cs";
+
+ public static void DownloadInitScript(string currentInitScriptFullPath, string currentInitScriptLocationOrURL)
+ {
+ string currentInitScriptFolder = Path.GetDirectoryName(currentInitScriptFullPath);
+ string currentInitScriptFile = Path.GetFileName(currentInitScriptFullPath);
+ string tempFile = Path.Combine(Path.GetTempPath(), currentInitScriptFile);
+ bool isLocalFile = false;
+
+ if (string.IsNullOrEmpty(currentInitScriptLocationOrURL) == true) currentInitScriptLocationOrURL = initFileDefaultURL;
+
+ // check if its URL or local file
+ if (currentInitScriptLocationOrURL.ToLower().StartsWith("http") == true)
+ {
+ // download into temp first
+ if (DownloadFile(currentInitScriptLocationOrURL, tempFile) == false) return;
+ }
+ else // file is in local folders/drives/projects
+ {
+ // check if file exists
+ if (File.Exists(currentInitScriptLocationOrURL) == false) return;
+ tempFile = currentInitScriptLocationOrURL;
+ isLocalFile = true;
+ }
+
+ // if got file
+ if (File.Exists(tempFile) == true)
+ {
+ // just in case file is locked
+ try
+ {
+ // small validation to check if its valid editor script
+ var tempContent = File.ReadAllText(tempFile);
+ if (tempContent.IndexOf("public class InitializeProject") > 0 && tempContent.IndexOf("namespace UnityLauncherProTools") > 0 && tempContent.IndexOf("public static void Init()") > 0)
+ {
+ // move old file as backup
+ if (File.Exists(currentInitScriptFullPath))
+ {
+ string oldScriptFullPath = Path.Combine(currentInitScriptFolder, currentInitScriptFile + ".bak");
+ if (File.Exists(oldScriptFullPath)) File.Delete(oldScriptFullPath);
+ File.Move(currentInitScriptFullPath, oldScriptFullPath);
+ }
+ // move new file here (need to delete old to overwrite)
+ if (File.Exists(currentInitScriptFullPath)) File.Delete(currentInitScriptFullPath);
+
+ // local file copy, not move
+ if (isLocalFile == true)
+ {
+ File.Copy(tempFile, currentInitScriptFullPath);
+ }
+ else
+ {
+ File.Move(tempFile, currentInitScriptFullPath);
+ }
+ }
+ else
+ {
+ Console.WriteLine("Invalid c# init file..(missing correct Namespace, Class or Method)");
+ }
+ }
+ catch (Exception e)
+ {
+ Console.WriteLine("File exception: " + e.Message);
+ }
+ }
+ else
+ {
+ Console.WriteLine("Failed to download init script from: " + currentInitScriptLocationOrURL);
+ }
+ }
+
static void DeleteTempFile(string path)
{
if (File.Exists(path) == true)
@@ -633,6 +698,7 @@ static bool DownloadFile(string url, string tempFile)
using (WebClient client = new WebClient())
{
client.DownloadFile(url, tempFile);
+ // TODO check if actually exists
result = true;
}
}
@@ -645,7 +711,7 @@ static bool DownloadFile(string url, string tempFile)
// parse Unity installer exe from release page
// thanks to https://github.com/softfruit
- public static string ParseDownloadURLFromWebpage(string version)
+ public static string ParseDownloadURLFromWebpage(string version, bool preferFullInstaller = false)
{
string url = "";
@@ -678,7 +744,7 @@ public static string ParseDownloadURLFromWebpage(string version)
string[] lines = sourceHTML.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
// patch version download assistant finder
- if (Tools.VersionIsPatch(version))
+ if (VersionIsPatch(version))
{
for (int i = 0; i < lines.Length; i++)
{
@@ -691,7 +757,7 @@ public static string ParseDownloadURLFromWebpage(string version)
}
}
}
- else if (Tools.VersionIsArchived(version))
+ else if (VersionIsArchived(version))
{
// archived version download assistant finder
for (int i = 0; i < lines.Length; i++)
@@ -729,6 +795,14 @@ public static string ParseDownloadURLFromWebpage(string version)
}
}
+ // download full installer instead
+ if (preferFullInstaller)
+ {
+ url = url.Replace("UnityDownloadAssistant-" + version + ".exe", "Windows64EditorInstaller/UnitySetup64-" + version + ".exe");
+ // handle alpha/beta
+ url = url.Replace("UnityDownloadAssistant.exe", "Windows64EditorInstaller/UnitySetup64-" + version + ".exe");
+ }
+
// didnt find installer
if (string.IsNullOrEmpty(url))
{
@@ -807,7 +881,7 @@ public static void HandleDataGridScrollKeys(object sender, KeyEventArgs e)
grid.SelectedIndex--;
}
// disable wrap around
-
+
//else
//{
// grid.SelectedIndex = grid.Items.Count - 1;
@@ -1085,14 +1159,14 @@ public static bool SaveCustomProjectData(string projectPath, string customFile,
public static bool HasFocus(DependencyObject obj, Control control, bool checkChildren)
{
- var oFocused = System.Windows.Input.FocusManager.GetFocusedElement(obj) as DependencyObject;
+ var oFocused = FocusManager.GetFocusedElement(obj) as DependencyObject;
if (!checkChildren)
return oFocused == control;
while (oFocused != null)
{
if (oFocused == control)
return true;
- oFocused = System.Windows.Media.VisualTreeHelper.GetParent(oFocused);
+ oFocused = VisualTreeHelper.GetParent(oFocused);
}
return false;
}
@@ -1119,23 +1193,32 @@ public static void SetFocusToGrid(DataGrid targetGrid, int index = -1)
if (row == null)
{
targetGrid.UpdateLayout();
- // scroll to view if outside
- targetGrid.ScrollIntoView(targetGrid.Items[index]);
- row = (DataGridRow)targetGrid.ItemContainerGenerator.ContainerFromIndex(index);
+ if (index < targetGrid.Items.Count)
+ {
+ // scroll selected into view
+ targetGrid.ScrollIntoView(targetGrid.Items[index]);
+ row = (DataGridRow)targetGrid.ItemContainerGenerator.ContainerFromIndex(index);
+ }
+ else
+ {
+ Console.WriteLine("selected row out of bounds: " + index);
+ }
}
// NOTE does this causes move below?
//row.MoveFocus(new TraversalRequest(FocusNavigationDirection.Next));
- row.MoveFocus(new TraversalRequest(FocusNavigationDirection.Up)); // works better than Up
-
- row.Focus();
- Keyboard.Focus(row);
+ if (row != null)
+ {
+ row.MoveFocus(new TraversalRequest(FocusNavigationDirection.Up)); // works better than Up
+ row.Focus();
+ Keyboard.Focus(row);
+ }
}
public static string BrowseForOutputFolder(string title, string initialDirectory = null)
{
// https://stackoverflow.com/a/50261723/5452781
// Create a "Save As" dialog for selecting a directory (HACK)
- var dialog = new Microsoft.Win32.SaveFileDialog();
+ var dialog = new SaveFileDialog();
if (initialDirectory != null) dialog.InitialDirectory = initialDirectory;
dialog.Title = title;
dialog.Filter = "Project Folder|*.Folder"; // Prevents displaying files
@@ -1202,26 +1285,25 @@ public static Project FastCreateProject(string version, string baseFolder, strin
// copy init file into project
if (useInitScript == true)
{
- var initScriptFile = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Scripts", initScriptPath);
- Console.WriteLine("initScriptFile: " + initScriptFile);
- if (File.Exists(initScriptFile) == true)
+ if (File.Exists(initScriptPath) == true)
{
var editorTargetFolder = Path.Combine(baseFolder, projectName, "Assets", "Editor");
- Console.WriteLine(editorTargetFolder);
if (Directory.Exists(editorTargetFolder) == false) Directory.CreateDirectory(editorTargetFolder);
- var targetScriptFile = Path.Combine(editorTargetFolder, initScriptPath);
- if (File.Exists(targetScriptFile) == false) File.Copy(initScriptFile, targetScriptFile);
+ var targetScriptFile = Path.Combine(editorTargetFolder, Path.GetFileName(initScriptPath));
+ // TODO overwrite old file, there shouldnt be anything here
+ if (File.Exists(targetScriptFile) == false) File.Copy(initScriptPath, targetScriptFile);
}
}
// launch empty project
var proj = new Project();
proj.Title = projectName;
- proj.Path = Path.Combine(baseFolder, newPath);
+ proj.Path = Path.Combine(baseFolder, newPath).Replace("\\", "/");
proj.Version = version;
proj.TargetPlatforms = platformsForThisUnity;
proj.TargetPlatform = platform;
proj.Modified = DateTime.Now;
+ proj.folderExists = true; // have to set this value, so item is green on list
var proc = LaunchProject(proj, null, useInitScript);
ProcessHandler.Add(proj, proc);
@@ -1543,6 +1625,7 @@ static string[] GetScenes()
// create commandline string for building and launch it
//var buildcmd = $"\"{unityExePath}\" -quit -batchmode -nographics -projectPath \"{proj.Path}\" -executeMethod \"Builder.BuildAndroid\" -buildTarget android -logFile -";
+ // TODO test without nographics : https://forum.unity.com/threads/batch-build-one-scene-is-black-works-in-normal-file-build.1282823/#post-9456524
var buildParams = $" -quit -batchmode -nographics -projectPath \"{proj.Path}\" -executeMethod \"UnityLauncherProTools.Build{platform}\" -buildTarget {platform} -logFile \"{outputFolder}/../build.log\"";
Console.WriteLine("buildcmd= " + buildParams);
@@ -1898,13 +1981,17 @@ internal static void UninstallEditor(string path, string version)
Console.WriteLine("Cleanup firewall: " + cmd);
LaunchExe("cmd.exe", "/c " + cmd);
- if (int.Parse(version.Substring(0, 4)) <= 2017)
+ int year;
+ string[] parts = version.Split('.');
+ // TODO handle unity 6.x
+ if (parts.Length >= 1 && int.TryParse(parts[0], out year) && year <= 2017)
{
var nodeFolder = Path.Combine(installFolder, "Editor", "Data", "Tools", "nodejs", "node.exe");
cmd = "netsh advfirewall firewall delete rule name=all program=\"" + nodeFolder + "\"";
Console.WriteLine("Cleanup firewall <= 2017: " + cmd);
LaunchExe("cmd.exe", "/c " + cmd);
}
+
// remove registry entries
var unityKeyName = "HKEY_CURRENT_USER\\Software\\Unity Technologies\\Installer\\Unity " + version;
cmd = "reg delete " + unityKeyName + " /f";
diff --git a/UnityLauncherPro/UpgradeWindow.xaml b/UnityLauncherPro/UpgradeWindow.xaml
index 1e45905..9f175a3 100644
--- a/UnityLauncherPro/UpgradeWindow.xaml
+++ b/UnityLauncherPro/UpgradeWindow.xaml
@@ -5,12 +5,14 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:UnityLauncherPro"
mc:Ignorable="d"
- Title="Upgrade Project Version" Height="533.165" Width="419" Background="{DynamicResource ThemeDarkestBackground}" MinWidth="319" MinHeight="555" ResizeMode="NoResize" WindowStartupLocation="CenterOwner" HorizontalAlignment="Left" VerticalAlignment="Top" PreviewKeyDown="Window_PreviewKeyDown" ShowInTaskbar="False">
+ Title="Upgrade Project Version" Height="533.165" Width="455" Background="{DynamicResource ThemeDarkestBackground}" MinWidth="319" MinHeight="555" ResizeMode="NoResize" WindowStartupLocation="CenterOwner" HorizontalAlignment="Left" VerticalAlignment="Top" PreviewKeyDown="Window_PreviewKeyDown" ShowInTaskbar="False">
-->
-
+
-
diff --git a/UnityLauncherPro/UpgradeWindow.xaml.cs b/UnityLauncherPro/UpgradeWindow.xaml.cs
index 7953b89..bd747e5 100644
--- a/UnityLauncherPro/UpgradeWindow.xaml.cs
+++ b/UnityLauncherPro/UpgradeWindow.xaml.cs
@@ -19,7 +19,13 @@ public UpgradeWindow(string currentVersion, string projectPath, string commandLi
{
InitializeComponent();
txtCurrentVersion.Text = currentVersion;
- gridAvailableVersions.ItemsSource = MainWindow.unityInstalledVersions;
+ txtCurrentPlatform.Text = Tools.GetTargetPlatform(projectPath);
+
+ if (gridAvailableVersions.ItemsSource == null)
+ {
+ gridAvailableVersions.ItemsSource = MainWindow.unityInstallationsSource;
+ }
+
gridAvailableVersions.SelectedItem = null;
// we have current version info in project
@@ -40,17 +46,15 @@ public UpgradeWindow(string currentVersion, string projectPath, string commandLi
string nearestVersion = Tools.FindNearestVersion(currentVersion, MainWindow.unityInstalledVersions.Keys.ToList());
if (nearestVersion != null)
{
- // get correct row for nearest version
- var obj = Tools.GetEntry(MainWindow.unityInstalledVersions, nearestVersion);
- int index = gridAvailableVersions.Items.IndexOf(obj);
- if (index > -1)
+ // select nearest version
+ for (int i = 0; i < MainWindow.unityInstallationsSource.Count; i++)
{
- gridAvailableVersions.SelectedIndex = index;
- }
- else
- {
- // just select first item then
- gridAvailableVersions.SelectedIndex = 0;
+ if (MainWindow.unityInstallationsSource[i].Version == nearestVersion)
+ {
+ gridAvailableVersions.SelectedIndex = i;
+ gridAvailableVersions.ScrollIntoView(gridAvailableVersions.SelectedItem);
+ break;
+ }
}
}
}
@@ -83,7 +87,6 @@ public UpgradeWindow(string currentVersion, string projectPath, string commandLi
}
}
-
gridAvailableVersions.Focus();
}
@@ -135,8 +138,8 @@ private void Window_PreviewKeyDown(object sender, System.Windows.Input.KeyEventA
if (e.Key == Key.Return && e.KeyboardDevice.Modifiers == ModifierKeys.None)
{
e.Handled = true;
- var k = (gridAvailableVersions.SelectedItem) as KeyValuePair?;
- upgradeVersion = k.Value.Key;
+ var k = (UnityInstallation)gridAvailableVersions.SelectedItem;
+ upgradeVersion = k.Version;
DialogResult = true;
return;
}
@@ -183,8 +186,8 @@ private void GridAvailableVersions_PreviewMouseDoubleClick(object sender, MouseB
void Upgrade()
{
- var k = (gridAvailableVersions.SelectedItem) as KeyValuePair?;
- upgradeVersion = k.Value.Key;
+ var k = (UnityInstallation)gridAvailableVersions.SelectedItem;
+ upgradeVersion = k.Version;
DialogResult = true;
}
diff --git a/appveyor.yml b/appveyor.yml
index 9ad0c9b..fccb633 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,9 +1,5 @@
version: 1.0.{build}
-branches:
- only:
- - dev
skip_tags: true
-skip_branch_with_pr: true
image: Visual Studio 2022
configuration: Release
only_commits:
@@ -20,6 +16,3 @@ deploy:
auth_token:
secure: kmYSrl7Mx/PFDGcyC5gS/vpW2UJCVguEXZsQ0LtkfwmSzx+3noZOyPrbZQ8uWX2B
artifact: deploy
- prerelease: true
- on:
- branch: dev
\ No newline at end of file