v1.5.0.12 - Compress within same library

RevoLand · Aug 12, 2018 · 2250d06 · 2250d06
1 parent 1153709
commit 2250d06
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 9 deletions.
diff --git a/Binaries/Steam Library Manager.exe b/Binaries/Steam Library Manager.exe
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
+## [1.5.0.12] - 2018-08-12
+
+### Added
+
+- Compress/Decompress within the same library.
+- Support for Origin manifest file version 3.0
+
 ## [1.5.0.11] - 2018-06-29
 
 ### Added

diff --git a/Source/Steam Library Manager/Definitions/Enums/Enums.cs b/Source/Steam Library Manager/Definitions/Enums/Enums.cs
@@ -73,7 +73,8 @@ public enum GameType
     public enum TaskType
     {
         Copy,
-        Delete
+        Delete,
+        Compress
     }
 
     public enum ThemeAccents

diff --git a/Source/Steam Library Manager/Definitions/SteamAppInfo.cs b/Source/Steam Library Manager/Definitions/SteamAppInfo.cs
@@ -55,11 +55,11 @@ public List<FrameworkElement> ContextMenuItems
                 {
                     foreach (ContextMenuItem cItem in List.AppCMenuItems.Where(x => x.IsActive && x.LibraryType == Enums.LibraryType.Steam))
                     {
-                        if (IsCompressed && !cItem.ShowToCompressed)
+                        if (IsCompressed && cItem.ShowToCompressed)
                         {
                             continue;
                         }
-                        else if (!cItem.ShowToNormal)
+                        else if (IsSteamBackup && !cItem.ShowToSteamBackup)
                         {
                             continue;
                         }
@@ -111,6 +111,18 @@ public async void ParseMenuItemActionAsync(string Action)
                         Process.Start(string.Format(Action, AppID, SLM.UserSteamID64));
                         break;
 
+                    case "compress":
+                        if (Framework.TaskManager.TaskList.ToList().Count(x => x.SteamApp == this && x.TargetLibrary == Library) == 0)
+                        {
+                            Framework.TaskManager.AddTask(new List.TaskInfo
+                            {
+                                SteamApp = this,
+                                TargetLibrary = Library,
+                                TaskType = Enums.TaskType.Compress
+                            });
+                        }
+                        break;
+
                     case "disk":
                         CommonFolder.Refresh();
 
@@ -271,9 +283,9 @@ public async Task CopyFilesAsync(List.TaskInfo CurrentTask, CancellationToken ca
                 logger.Info("File list populated, total files to move: {0} - total size to move: {1}", AppFiles.Count, Functions.FileSystem.FormatBytes(TotalFileSize));
 
                 // If the game is not compressed and user would like to compress it
-                if (!IsCompressed && CurrentTask.Compress)
+                if (!IsCompressed && (CurrentTask.Compress || CurrentTask.TaskType == Enums.TaskType.Compress))
                 {
-                    FileInfo CompressedArchive = new FileInfo(CompressedArchiveName.FullName.Replace(Library.Steam.SteamAppsFolder.FullName, CurrentTask.TargetLibrary.Steam.SteamAppsFolder.FullName));
+                    FileInfo CompressedArchive = (CurrentTask.TaskType == Enums.TaskType.Compress) ? CompressedArchiveName : new FileInfo(CompressedArchiveName.FullName.Replace(Library.Steam.SteamAppsFolder.FullName, CurrentTask.TargetLibrary.Steam.SteamAppsFolder.FullName));
 
                     if (CompressedArchive.Exists)
                     {
@@ -336,13 +348,13 @@ await Main.FormAccessor.AppView.AppPanel.Dispatcher.Invoke(async delegate
                     }
                 }
                 // If the game is compressed and user would like to decompress it
-                else if (IsCompressed && !CurrentTask.Compress)
+                else if (IsCompressed && (!CurrentTask.Compress || CurrentTask.TaskType == Enums.TaskType.Compress))
                 {
                     foreach (ZipArchiveEntry CurrentFile in ZipFile.OpenRead(CompressedArchiveName.FullName).Entries)
                     {
                         CurrentTask.mre.WaitOne();
 
-                        FileInfo NewFile = new FileInfo(Path.Combine(CurrentTask.TargetLibrary.Steam.SteamAppsFolder.FullName, CurrentFile.FullName));
+                        FileInfo NewFile = new FileInfo(Path.Combine((CurrentTask.TaskType == Enums.TaskType.Compress) ? CurrentTask.SteamApp.Library.Steam.SteamAppsFolder.FullName : CurrentTask.TargetLibrary.Steam.SteamAppsFolder.FullName, CurrentFile.FullName));
 
                         if (!NewFile.Directory.Exists)
                         {

diff --git a/Source/Steam Library Manager/Functions/Steam.cs b/Source/Steam Library Manager/Functions/Steam.cs
@@ -132,6 +132,7 @@ public static void PopulateAppCMenuItems()
                 Action = "steam://run/{0}",
                 Icon = FontAwesome.WPF.FontAwesomeIcon.Play,
                 LibraryType = Definitions.Enums.LibraryType.Steam,
+                ShowToSteamBackup = false,
                 ShowToCompressed = false
             });
 
@@ -140,7 +141,27 @@ public static void PopulateAppCMenuItems()
             {
                 ShowToCompressed = false,
                 LibraryType = Definitions.Enums.LibraryType.Steam,
-                IsSeparator = true
+                IsSeparator = true,
+                ShowToSteamBackup = false
+            });
+
+            // Compress
+            Definitions.List.AppCMenuItems.Add(new Definitions.ContextMenuItem
+            {
+                Header = "(De)Compress",
+                Action = "Compress",
+                LibraryType = Definitions.Enums.LibraryType.Steam,
+                ShowToCompressed = false,
+                ShowToSteamBackup = false,
+                Icon = FontAwesome.WPF.FontAwesomeIcon.FileZipOutline
+            });
+            // Separator
+            Definitions.List.AppCMenuItems.Add(new Definitions.ContextMenuItem
+            {
+                ShowToCompressed = false,
+                LibraryType = Definitions.Enums.LibraryType.Steam,
+                IsSeparator = true,
+                ShowToSteamBackup = false
             });
 
             // Show on disk
@@ -149,6 +170,7 @@ public static void PopulateAppCMenuItems()
                 Header = "{0} ({1})",
                 Action = "Disk",
                 LibraryType = Definitions.Enums.LibraryType.Steam,
+                ShowToCompressed = true,
                 Icon = FontAwesome.WPF.FontAwesomeIcon.FolderOpen
             });
 

diff --git a/Source/Steam Library Manager/Properties/AssemblyInfo.cs b/Source/Steam Library Manager/Properties/AssemblyInfo.cs
@@ -51,6 +51,6 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.11")]
+[assembly: AssemblyFileVersion("1.5.0.12")]
 [assembly: NeutralResourcesLanguage("en")]
-Original file line number
+Diff line change
@@ Expand Up / @@ -73,7 +73,8 @@ public enum GameType @@
         public enum TaskType
         {
             Copy,
-            Delete
+            Delete,
+            Compress
         }
         public enum ThemeAccents
@@ Expand Down @@