Add performance enhancements, better error checking, IsLoading checks, and correct RomModel updating

NVRemoteDev · NVRemoteDev · commit 2fde6d23d356 · 2015-05-19T20:24:46.000-07:00
diff --git a/EmulationManager/EmulationManager/Commands/FixRomStreamingCompatibilityCommand.cs b/EmulationManager/EmulationManager/Commands/FixRomStreamingCompatibilityCommand.cs
@@ -24,11 +24,11 @@ public bool CanExecute(object parameter)
 
         public event EventHandler CanExecuteChanged { add { } remove { } }
 
-        public void Execute(object parameter)
+        public async void Execute(object parameter)
         {
             if (CanExecute(parameter))
             {
-                _viewModel.FixRomStreamingCompatibilityAsync();
+                await _viewModel.FixRomStreamingCompatibilityAsync();
             }
         }
         #endregion
diff --git a/EmulationManager/EmulationManager/Helpers/IOHelper.cs b/EmulationManager/EmulationManager/Helpers/IOHelper.cs
@@ -220,14 +220,23 @@ public static RomModel[] FixRomsForStreaming(RomModel[] roms)
             int i = 0;
             foreach (var rom in roms)
             {
-                if (!string.IsNullOrEmpty(rom.Path) && !string.IsNullOrEmpty(rom.StreamingCompatiblePath))
+                try
                 {
-                    if (rom.Path != rom.StreamingCompatiblePath)
+                    if (rom != null
+                        && !string.IsNullOrEmpty(rom.Path) && !string.IsNullOrEmpty(rom.StreamingCompatiblePath))
                     {
-                        File.Move(rom.Path, rom.StreamingCompatiblePath);
+                        if (rom.Path != rom.StreamingCompatiblePath)
+                        {
+                            File.Move(rom.Path, rom.StreamingCompatiblePath);
+                        }
+                        rom.UseStreamingCompatiblePath = true;
+                        newRoms[i] = rom;
                     }
-                    rom.UseStreamingCompatiblePath = true;
-                    roms[i] = rom;
+                }
+                catch (System.IO.IOException)
+                {
+                    i++;
+                    continue; // This hits randomly but still works?
                 }
                 i++;
             }
@@ -244,16 +253,25 @@ public static RomModel[] RevertRomsFromStreaming(RomModel[] roms)
             int i = 0;
             foreach (var rom in roms)
             {
-                if (!string.IsNullOrEmpty(rom.Path) && !string.IsNullOrEmpty(rom.StreamingCompatiblePath))
+                try
                 {
-                    rom.Path = rom.StreamingCompatiblePath.Replace(ConfigurationHelper.GetStreamingCompatiblityReplacementName(), " ");
-                    if (rom.Path != rom.StreamingCompatiblePath)
+                    if (rom != null
+                        && !string.IsNullOrEmpty(rom.Path) && !string.IsNullOrEmpty(rom.StreamingCompatiblePath))
                     {
-                        File.Move(rom.StreamingCompatiblePath, rom.Path);
+                        rom.Path = rom.StreamingCompatiblePath.Replace(ConfigurationHelper.GetStreamingCompatiblityReplacementName(), " ");
+                        if (rom.Path != rom.StreamingCompatiblePath)
+                        {
+                            File.Move(rom.StreamingCompatiblePath, rom.Path);
+                        }
+                        rom.UseStreamingCompatiblePath = false;
+
+                        newRoms[i] = rom;
                     }
-                    rom.UseStreamingCompatiblePath = false;
-                    
-                    newRoms[i] = rom;
+                }
+                catch (System.IO.IOException)
+                {
+                    i++;
+                    continue; // This hits randomly but still works?
                 }
                 i++;
             }
diff --git a/EmulationManager/EmulationManager/ViewModels/EmuManagerViewModel.cs b/EmulationManager/EmulationManager/ViewModels/EmuManagerViewModel.cs
@@ -124,7 +124,7 @@ public EmuManagerViewModel()
 
         public async Task LoadRomsAndEmulatorsAsync(bool showError = true)
         {
-            if (CheckRomAndEmulatorDirectories())
+            if (CheckRomAndEmulatorDirectories() && CheckCanDoWork())
             {
                 // Use a Task.Run() here to get these methods off the UI thread as they're slow and it will lock up responsiveness.
                 await Task.Run(() =>
@@ -166,12 +166,12 @@ public void CleanRomNames()
 
         public async Task RevertRomStreamingCompatibilityAsync()
         {
-            if (CheckModelValidity())
+            if (CheckModelValidity() && CheckCanDoWork())
             {
                 await Task.Run(() =>
                 {
                     IsLoading = true;
-                    LoadingText = "Fixing rom streaming compatibility...";
+                    LoadingText = "Reverting rom streaming compatibility...";
 
                     RomModels = IOHelper.RevertRomsFromStreaming(RomModels);
 
@@ -187,12 +187,12 @@ await Task.Run(() =>
 
         public async Task FixRomStreamingCompatibilityAsync()
         {
-            if (CheckModelValidity())
+            if (CheckModelValidity() && CheckCanDoWork())
             {
                 await Task.Run(() =>
                 {
                     IsLoading = true;
-                    LoadingText = "Reverting rom streaming compatibility...";
+                    LoadingText = "Fixing rom streaming compatibility...";
 
                     RomModels = IOHelper.FixRomsForStreaming(RomModels);
 
@@ -208,7 +208,7 @@ await Task.Run(() =>
 
         public async Task CreateSteamShortcutsAsync()
         {
-            if (CheckModelValidity())
+            if (CheckModelValidity() && CheckCanDoWork())
             {
                 await LoadRomsAndEmulatorsAsync();
                 await Task.Run(() =>
@@ -242,5 +242,15 @@ public bool CheckModelValidity()
         {
             return EmulatorModels != null && EmulatorModels.Length > 0 && RomModels != null && RomModels.Length > 0;
         }
+
+        public bool CheckCanDoWork()
+        {
+            if (IsLoading)
+            {
+                DebugManager.ShowErrorDialog("Please wait for the current operation to finish before proceeding.", null);
+                return false;
+            }
+            return true;
+        }
     }
 }
diff --git a/EmulationManager/EmulationManager/Views/EmuManager.xaml b/EmulationManager/EmulationManager/Views/EmuManager.xaml
@@ -69,9 +69,9 @@
                 <StackPanel Name="ShieldFunctions" Margin="0,15,0,0" HorizontalAlignment="Left">
                     <TextBlock FontSize="14" FontWeight="Medium">Steam Link/Shield/Moonlight Big Picture Streaming Functions</TextBlock>
                     <StackPanel Orientation="Horizontal">
-                        <Button x:Name="FixRomsForStreamingCompatibilityButton" Command="{Binding FixRomStreamingCompatibilityCommand}" Margin="0,0,0,0" Padding="3" FontSize="16" Click="FixRomsForStreamingCompatibilityButton_Click">Fix Roms for Streaming Compatibility</Button>
+                        <Button x:Name="FixRomsForStreamingCompatibilityButton" Margin="0,0,0,0" Padding="3" FontSize="16" Click="FixRomsForStreamingCompatibilityButton_Click">Fix Roms for Streaming Compatibility</Button>
                         <TextBlock VerticalAlignment="Center" Margin="3,0,0,0"><Path Width="16" Height="16" Stretch="Uniform" Data="F1 M 15.6001,5.22C 17.3822,5.2515 18.82,5.87949 19.9133,7.104C 21.0067,8.32849 21.5689,9.96048 21.6,12C 21.5923,14.7711 20.4267,16.468 18.1031,17.0906L 18.1031,19.2L 13.1146,19.2L 13.1146,14.3069C 13.4637,14.3485 13.7175,14.3652 13.8762,14.3569C 15.7127,14.5413 16.6373,13.7557 16.65,12C 16.6584,10.3585 16.2917,9.5585 15.55,9.59998C 14.7667,9.59198 14.3834,10.392 14.4,12L 9.45001,12C 9.47205,7.54944 11.5221,5.28946 15.6001,5.22 Z M 15.6501,21.06C 16.4651,21.0844 17.1408,21.3759 17.6773,21.9342C 18.2138,22.4926 18.4919,23.1713 18.5118,23.9701C 18.492,24.769 18.2138,25.4475 17.6773,26.0059C 17.1408,26.5641 16.4651,26.8555 15.6501,26.88C 14.813,26.8555 14.1151,26.5641 13.5565,26.0059C 12.9979,25.4475 12.7079,24.769 12.6863,23.9701C 12.7079,23.1507 12.9979,22.4662 13.5565,21.9167C 14.1151,21.3671 14.813,21.0815 15.6501,21.06 Z M 15.6501,0C 11.2097,0.105347 7.51904,1.64291 4.57797,4.61276C 1.6369,7.58261 0.110931,11.3527 0,15.9231C 0.110931,20.2214 1.6369,23.8045 4.57797,26.6724C 7.51904,29.5402 11.2097,31.0294 15.6501,31.14C 19.9496,31.0294 23.5613,29.5402 26.4853,26.6724C 29.4093,23.8045 30.9309,20.2214 31.05,15.9231C 30.9309,11.3527 29.4093,7.58264 26.4853,4.61276C 23.5613,1.64291 19.9496,0.105347 15.6501,0 Z " Fill="{DynamicResource {x:Static SystemColors.ActiveCaptionBrushKey}}" Cursor="Hand"/></TextBlock>
-                        <Button x:Name="RevertRomStreamingCompatibilityButton" Command="{Binding RevertRomStreamingCompatibilityCommand}" Margin="10,0,0,0" Padding="3" FontSize="16" Click="RevertRomStreamingCompatibilityButton_Click">Revert Rom Names (Breaks Streaming)</Button>
+                        <Button x:Name="RevertRomStreamingCompatibilityButton" Margin="10,0,0,0" Padding="3" FontSize="16" Click="RevertRomStreamingCompatibilityButton_Click">Revert Rom Names (Breaks Streaming)</Button>
                         <TextBlock VerticalAlignment="Center" Margin="3,0,0,0"><Path Width="16" Height="16" Stretch="Uniform" Data="F1 M 15.6001,5.22C 17.3822,5.2515 18.82,5.87949 19.9133,7.104C 21.0067,8.32849 21.5689,9.96048 21.6,12C 21.5923,14.7711 20.4267,16.468 18.1031,17.0906L 18.1031,19.2L 13.1146,19.2L 13.1146,14.3069C 13.4637,14.3485 13.7175,14.3652 13.8762,14.3569C 15.7127,14.5413 16.6373,13.7557 16.65,12C 16.6584,10.3585 16.2917,9.5585 15.55,9.59998C 14.7667,9.59198 14.3834,10.392 14.4,12L 9.45001,12C 9.47205,7.54944 11.5221,5.28946 15.6001,5.22 Z M 15.6501,21.06C 16.4651,21.0844 17.1408,21.3759 17.6773,21.9342C 18.2138,22.4926 18.4919,23.1713 18.5118,23.9701C 18.492,24.769 18.2138,25.4475 17.6773,26.0059C 17.1408,26.5641 16.4651,26.8555 15.6501,26.88C 14.813,26.8555 14.1151,26.5641 13.5565,26.0059C 12.9979,25.4475 12.7079,24.769 12.6863,23.9701C 12.7079,23.1507 12.9979,22.4662 13.5565,21.9167C 14.1151,21.3671 14.813,21.0815 15.6501,21.06 Z M 15.6501,0C 11.2097,0.105347 7.51904,1.64291 4.57797,4.61276C 1.6369,7.58261 0.110931,11.3527 0,15.9231C 0.110931,20.2214 1.6369,23.8045 4.57797,26.6724C 7.51904,29.5402 11.2097,31.0294 15.6501,31.14C 19.9496,31.0294 23.5613,29.5402 26.4853,26.6724C 29.4093,23.8045 30.9309,20.2214 31.05,15.9231C 30.9309,11.3527 29.4093,7.58264 26.4853,4.61276C 23.5613,1.64291 19.9496,0.105347 15.6501,0 Z " Fill="{DynamicResource {x:Static SystemColors.ActiveCaptionBrushKey}}" Cursor="Hand"/></TextBlock>
                     </StackPanel>
                 </StackPanel>
diff --git a/EmulationManager/EmulationManager/Views/EmuManager.xaml.cs b/EmulationManager/EmulationManager/Views/EmuManager.xaml.cs
@@ -180,7 +180,7 @@ private void RevertRomStreamingCompatibilityButton_Click(object sender, RoutedEv
             var viewModel = mainGrid.DataContext as ViewModels.EmuManagerViewModel;
             if (viewModel != null && viewModel.FixRomStreamingCompatibilityCommand.CanExecute(null))
             {
-                viewModel.FixRomStreamingCompatibilityCommand.Execute(null);
+                viewModel.RevertRomStreamingCompatibilityCommand.Execute(null);
             }
             else
             {

Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,11 @@ public bool CanExecute(object parameter)`
`24`	`24`
`25`	`25`	`public event EventHandler CanExecuteChanged { add { } remove { } }`
`26`	`26`
`27`		`- public void Execute(object parameter)`
	`27`	`+ public async void Execute(object parameter)`
`28`	`28`	`{`
`29`	`29`	`if (CanExecute(parameter))`
`30`	`30`	`{`
`31`		`- _viewModel.FixRomStreamingCompatibilityAsync();`
	`31`	`+ await _viewModel.FixRomStreamingCompatibilityAsync();`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -220,14 +220,23 @@ public static RomModel[] FixRomsForStreaming(RomModel[] roms)`
`220`	`220`	`int i = 0;`
`221`	`221`	`foreach (var rom in roms)`
`222`	`222`	`{`
`223`		`- if (!string.IsNullOrEmpty(rom.Path) && !string.IsNullOrEmpty(rom.StreamingCompatiblePath))`
	`223`	`+ try`
`224`	`224`	`{`
`225`		`- if (rom.Path != rom.StreamingCompatiblePath)`
	`225`	`+ if (rom != null`
	`226`	`+ && !string.IsNullOrEmpty(rom.Path) && !string.IsNullOrEmpty(rom.StreamingCompatiblePath))`
`226`	`227`	`{`
`227`		`- File.Move(rom.Path, rom.StreamingCompatiblePath);`
	`228`	`+ if (rom.Path != rom.StreamingCompatiblePath)`
	`229`	`+ {`
	`230`	`+ File.Move(rom.Path, rom.StreamingCompatiblePath);`
	`231`	`+ }`
	`232`	`+ rom.UseStreamingCompatiblePath = true;`
	`233`	`+ newRoms[i] = rom;`
`228`	`234`	`}`
`229`		`- rom.UseStreamingCompatiblePath = true;`
`230`		`- roms[i] = rom;`
	`235`	`+ }`
	`236`	`+ catch (System.IO.IOException)`
	`237`	`+ {`
	`238`	`+ i++;`
	`239`	`+ continue; // This hits randomly but still works?`
`231`	`240`	`}`
`232`	`241`	`i++;`
`233`	`242`	`}`
`@@ -244,16 +253,25 @@ public static RomModel[] RevertRomsFromStreaming(RomModel[] roms)`
`244`	`253`	`int i = 0;`
`245`	`254`	`foreach (var rom in roms)`
`246`	`255`	`{`
`247`		`- if (!string.IsNullOrEmpty(rom.Path) && !string.IsNullOrEmpty(rom.StreamingCompatiblePath))`
	`256`	`+ try`
`248`	`257`	`{`
`249`		`- rom.Path = rom.StreamingCompatiblePath.Replace(ConfigurationHelper.GetStreamingCompatiblityReplacementName(), " ");`
`250`		`- if (rom.Path != rom.StreamingCompatiblePath)`
	`258`	`+ if (rom != null`
	`259`	`+ && !string.IsNullOrEmpty(rom.Path) && !string.IsNullOrEmpty(rom.StreamingCompatiblePath))`
`251`	`260`	`{`
`252`		`- File.Move(rom.StreamingCompatiblePath, rom.Path);`
	`261`	`+ rom.Path = rom.StreamingCompatiblePath.Replace(ConfigurationHelper.GetStreamingCompatiblityReplacementName(), " ");`
	`262`	`+ if (rom.Path != rom.StreamingCompatiblePath)`
	`263`	`+ {`
	`264`	`+ File.Move(rom.StreamingCompatiblePath, rom.Path);`
	`265`	`+ }`
	`266`	`+ rom.UseStreamingCompatiblePath = false;`
	`267`	`+`
	`268`	`+ newRoms[i] = rom;`
`253`	`269`	`}`
`254`		`- rom.UseStreamingCompatiblePath = false;`
`255`		`-`
`256`		`- newRoms[i] = rom;`
	`270`	`+ }`
	`271`	`+ catch (System.IO.IOException)`
	`272`	`+ {`
	`273`	`+ i++;`
	`274`	`+ continue; // This hits randomly but still works?`
`257`	`275`	`}`
`258`	`276`	`i++;`
`259`	`277`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public EmuManagerViewModel()`
`124`	`124`
`125`	`125`	`public async Task LoadRomsAndEmulatorsAsync(bool showError = true)`
`126`	`126`	`{`
`127`		`- if (CheckRomAndEmulatorDirectories())`
	`127`	`+ if (CheckRomAndEmulatorDirectories() && CheckCanDoWork())`
`128`	`128`	`{`
`129`	`129`	`// Use a Task.Run() here to get these methods off the UI thread as they're slow and it will lock up responsiveness.`
`130`	`130`	`await Task.Run(() =>`
`@@ -166,12 +166,12 @@ public void CleanRomNames()`
`166`	`166`
`167`	`167`	`public async Task RevertRomStreamingCompatibilityAsync()`
`168`	`168`	`{`
`169`		`- if (CheckModelValidity())`
	`169`	`+ if (CheckModelValidity() && CheckCanDoWork())`
`170`	`170`	`{`
`171`	`171`	`await Task.Run(() =>`
`172`	`172`	`{`
`173`	`173`	`IsLoading = true;`
`174`		`- LoadingText = "Fixing rom streaming compatibility...";`
	`174`	`+ LoadingText = "Reverting rom streaming compatibility...";`
`175`	`175`
`176`	`176`	`RomModels = IOHelper.RevertRomsFromStreaming(RomModels);`
`177`	`177`
`@@ -187,12 +187,12 @@ await Task.Run(() =>`
`187`	`187`
`188`	`188`	`public async Task FixRomStreamingCompatibilityAsync()`
`189`	`189`	`{`
`190`		`- if (CheckModelValidity())`
	`190`	`+ if (CheckModelValidity() && CheckCanDoWork())`
`191`	`191`	`{`
`192`	`192`	`await Task.Run(() =>`
`193`	`193`	`{`
`194`	`194`	`IsLoading = true;`
`195`		`- LoadingText = "Reverting rom streaming compatibility...";`
	`195`	`+ LoadingText = "Fixing rom streaming compatibility...";`
`196`	`196`
`197`	`197`	`RomModels = IOHelper.FixRomsForStreaming(RomModels);`
`198`	`198`
`@@ -208,7 +208,7 @@ await Task.Run(() =>`
`208`	`208`
`209`	`209`	`public async Task CreateSteamShortcutsAsync()`
`210`	`210`	`{`
`211`		`- if (CheckModelValidity())`
	`211`	`+ if (CheckModelValidity() && CheckCanDoWork())`
`212`	`212`	`{`
`213`	`213`	`await LoadRomsAndEmulatorsAsync();`
`214`	`214`	`await Task.Run(() =>`
`@@ -242,5 +242,15 @@ public bool CheckModelValidity()`
`242`	`242`	`{`
`243`	`243`	`return EmulatorModels != null && EmulatorModels.Length > 0 && RomModels != null && RomModels.Length > 0;`
`244`	`244`	`}`
	`245`	`+`
	`246`	`+ public bool CheckCanDoWork()`
	`247`	`+ {`
	`248`	`+ if (IsLoading)`
	`249`	`+ {`
	`250`	`+ DebugManager.ShowErrorDialog("Please wait for the current operation to finish before proceeding.", null);`
	`251`	`+ return false;`
	`252`	`+ }`
	`253`	`+ return true;`
	`254`	`+ }`
`245`	`255`	`}`
`246`	`256`	`}`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ private void RevertRomStreamingCompatibilityButton_Click(object sender, RoutedEv`
`180`	`180`	`var viewModel = mainGrid.DataContext as ViewModels.EmuManagerViewModel;`
`181`	`181`	`if (viewModel != null && viewModel.FixRomStreamingCompatibilityCommand.CanExecute(null))`
`182`	`182`	`{`
`183`		`- viewModel.FixRomStreamingCompatibilityCommand.Execute(null);`
	`183`	`+ viewModel.RevertRomStreamingCompatibilityCommand.Execute(null);`
`184`	`184`	`}`
`185`	`185`	`else`
`186`	`186`	`{`