Fixed issue with missing files while decompressing SPC archives

redssu · May 7, 2022 · b4daa71 · b4daa71
1 parent 0465846
commit b4daa71
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/ExplorerExtension/Program.cs b/ExplorerExtension/Program.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using Microsoft.Win32;
+using Microsoft.Win32.Registry;
 
 namespace ExplorerExtension {
     class Program {

diff --git a/Spc/Program.cs b/Spc/Program.cs
@@ -1,14 +1,11 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Text;
-using System.Threading.Tasks;
 using System.Security;
 using System.Text.Json;
 using V3Lib;
 using V3Lib.Spc;
-using System.Linq;
 
 namespace Spc {
     class SpcInfo {
@@ -104,17 +101,13 @@ class Program {
                 spcFile.Unknown2 = spcInfo.Unknown2;
 
                 List<String> targetFiles = new List<string>( Directory.GetFiles( filePath ) );
-                Task[] insertTasks = new Task[ targetFiles.Count - 1 ]; // Because we don't count the __spc_info.json file
 
                 foreach ( string subfileName in targetFiles ) {
-                    if ( subfileName.EndsWith( "__spc_info.json" ) ) { 
+                    if ( subfileName.EndsWith( "__spc_info.json" ) )
                         continue;
-                    }
 
-                    insertTasks[ targetFiles.IndexOf( subfileName ) ] = Task.Factory.StartNew( () => spcFile.InsertSubfile( subfileName ) );
+                    spcFile.InsertSubfile(subfileName);
                 }
-
-                Task.WaitAll( insertTasks );
 
                 string originalPath = filePath;
 
@@ -166,14 +159,10 @@ class Program {
                 string directoryBasePath = fileInfo.FullName;
                 Directory.CreateDirectory( directoryBasePath + ".decompressed" );
 
-                Task[] extractTasks = new Task[ spcFile.Subfiles.Count ];
-
                 foreach ( SpcSubfile subfile in spcFile.Subfiles ) { 
-                    extractTasks[ spcFile.Subfiles.IndexOf( subfile ) ] = Task.Factory.StartNew( () => spcFile.ExtractSubfile( subfile.Name, directoryBasePath + ".decompressed" ) );
+                    spcFile.ExtractSubfile( subfile.Name, directoryBasePath + ".decompressed" );
                 }
 
-                Task.WaitAll( extractTasks );
-
                 SpcInfo spcInfo = new SpcInfo {
                     Unknown1 = spcFile.Unknown1,
                     Unknown2 = spcFile.Unknown2