v1.3.2, contains small fixes

RevoLand · Oct 22, 2016 · 53c9328 · 53c9328
1 parent 1533154
commit 53c9328
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 14 deletions.
diff --git a/Binaries/Steam Library Manager.exe b/Binaries/Steam Library Manager.exe
diff --git a/Binaries/Version.txt b/Binaries/Version.txt
@@ -1 +1 @@
-1.3.1.0|Fixes and improvements have been done, also done with Settings page for now.
+1.3.2.0|Fixes and improvements
diff --git a/Extras/Screenshots/Mainform.png b/Extras/Screenshots/Mainform.png
diff --git a/Extras/Screenshots/gameMovement.png b/Extras/Screenshots/gameMovement.png
diff --git a/Extras/Screenshots/settingsPage.png b/Extras/Screenshots/settingsPage.png
diff --git a/Source/Steam Library Manager/Definitions/Game.cs b/Source/Steam Library Manager/Definitions/Game.cs
@@ -185,7 +185,7 @@ public void copyGameFiles(Forms.MoveGameForm currentForm, Library targetLibrary,
                         totalMovenFileCount++;
                         movenFileSize += currentFile.Length;
 
-                        FileInfo newFile = new FileInfo(Path.Combine(installedLibrary.steamAppsPath.FullName, currentFile.FullName));
+                        FileInfo newFile = new FileInfo(Path.Combine(targetLibrary.steamAppsPath.FullName, currentFile.FullName));
 
                         if (!newFile.Directory.Exists)
                         {

diff --git a/Source/Steam Library Manager/Definitions/Library.cs b/Source/Steam Library Manager/Definitions/Library.cs
@@ -31,22 +31,22 @@ public void UpdateGameList()
 
                 // Foreach *.acf file found in library
                 //foreach (string game in Directory.EnumerateFiles(steamAppsPath.FullName, "*.acf", SearchOption.TopDirectoryOnly))
-                Parallel.ForEach(Directory.EnumerateFiles(steamAppsPath.FullName, "*.acf", SearchOption.TopDirectoryOnly), acfFilePath =>
+                Parallel.ForEach(steamAppsPath.EnumerateFiles("*.acf", SearchOption.TopDirectoryOnly), acfFilePath =>
                 {
                     // Define a new value and call KeyValue
                     Framework.KeyValue Key = new Framework.KeyValue();
 
                     // Read the *.acf file as text
-                    Key.ReadFileAsText(acfFilePath);
+                    Key.ReadFileAsText(acfFilePath.FullName);
 
                     // If key doesn't contains a child (value in acf file)
                     if (Key.Children.Count == 0)
                         return;
 
-                    Functions.Games.AddNewGame(acfFilePath, Convert.ToInt32(Key["appID"].Value), !string.IsNullOrEmpty(Key["name"].Value) ? Key["name"].Value : Key["UserConfig"]["name"].Value, Key["installdir"].Value, this, Convert.ToInt64(Key["SizeOnDisk"].Value), false);
+                    Functions.Games.AddNewGame(acfFilePath.FullName, Convert.ToInt32(Key["appID"].Value), !string.IsNullOrEmpty(Key["name"].Value) ? Key["name"].Value : Key["UserConfig"]["name"].Value, Key["installdir"].Value, this, Convert.ToInt64(Key["SizeOnDisk"].Value), false);
                 });
+
                 // Do a loop for each *.zip file in library
-                //foreach (string gameArchive in Directory.EnumerateFiles(steamAppsPath.FullName, "*.zip", SearchOption.TopDirectoryOnly))
                 Parallel.ForEach(Directory.EnumerateFiles(steamAppsPath.FullName, "*.zip", SearchOption.TopDirectoryOnly), gameArchive =>
                 {
                     Functions.Games.readGameDetailsFromZip(gameArchive, this);

diff --git a/Source/Steam Library Manager/Forms/MainWindow.xaml.cs b/Source/Steam Library Manager/Forms/MainWindow.xaml.cs
@@ -139,7 +139,7 @@ private void gameContextMenuItem_Click(object sender, RoutedEventArgs e)
 
         private void textBox_TextChanged(object sender, TextChangedEventArgs e)
         {
-            if (Definitions.SLM.selectedLibrary != null)
+            if (Definitions.SLM.selectedLibrary != null && !string.IsNullOrEmpty(searchText.Text) && searchText.Text != "Search in Library (by app Name or app ID)")
                 Functions.Games.UpdateMainForm(Definitions.SLM.selectedLibrary, searchText.Text);
         }
 
@@ -248,10 +248,7 @@ private void checkForUpdates_Click(object sender, RoutedEventArgs e)
             {
                 Functions.Updater.CheckForUpdates();
             }
-            catch
-            {
-
-            }
+            catch { }
         }
     }
 }
diff --git a/Source/Steam Library Manager/Forms/MoveGameForm.xaml b/Source/Steam Library Manager/Forms/MoveGameForm.xaml
@@ -40,15 +40,15 @@
 
         <Button x:Name="button" Content="Copy" Margin="10,319,10,0" VerticalAlignment="Top" Height="45" Click="button_Click"/>
 
-        <ListView x:Name="textBox" Margin="10,369,10,60" AllowDrop="False" IsTabStop="False" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" >
+        <ListView x:Name="textBox" Margin="10,369,10,15" AllowDrop="False" IsTabStop="False" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" >
             <ListView.ItemTemplate>
                 <DataTemplate>
                     <TextBlock MaxHeight="16" Text="{Binding}" />
                 </DataTemplate>
             </ListView.ItemTemplate>
         </ListView>
 
-        <ProgressBar x:Name="progressReport" Margin="10,0,10,25" Height="30" VerticalAlignment="Bottom" />
+        <!--<ProgressBar x:Name="progressReport" Margin="10,0,10,25" Height="30" VerticalAlignment="Bottom" />-->
         <Label x:Name="progressReportLabel" Margin="0,0,10,0" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" HorizontalAlignment="Right" VerticalAlignment="Bottom" />
     </Grid>
 </Window>
diff --git a/Source/Steam Library Manager/Forms/MoveGameForm.xaml.cs b/Source/Steam Library Manager/Forms/MoveGameForm.xaml.cs
@@ -59,6 +59,7 @@ public void reportFileMovement(string movenFileName, int movenFileCount, int tot
         {
             formLogs.Add(string.Format("[{0}/{1}] {2}\n", movenFileCount, totalFileCount, movenFileName));
 
+            /*
             if (progressReportLabel.Dispatcher.CheckAccess())
             {
                 progressReportLabel.Content = $"{Functions.fileSystem.FormatBytes(totalFileSize - movenFileSize)} left - {Functions.fileSystem.FormatBytes(movenFileSize)} / {Functions.fileSystem.FormatBytes(totalFileSize)}";
@@ -94,6 +95,7 @@ public void reportFileMovement(string movenFileName, int movenFileCount, int tot
                     textBox.ScrollIntoView(textBox.Items[textBox.Items.Count - 1]);
                 }, System.Windows.Threading.DispatcherPriority.Normal);
             }
+            */
 
         }
 

diff --git a/Source/Steam Library Manager/Properties/AssemblyInfo.cs b/Source/Steam Library Manager/Properties/AssemblyInfo.cs
@@ -50,4 +50,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.3.1.0")]
+[assembly: AssemblyFileVersion("1.3.2.0")]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		1.3.1.0\|Fixes and improvements have been done, also done with Settings page for now.
		1.3.2.0\|Fixes and improvements