Explicitly handle password-protected archives rather than repeatedly throwing exceptions

Author: HeroponRikiBestest

SabreTools.Serialization/Wrappers/PKZIP.Extraction.cs

@@ -43,6 +43,7 @@ public bool Extract(string outputDirectory, bool lookForHeader, bool includeDebu
                         zipFile = ZipArchive.Open(parts, readerOptions);
                 }
 
+                bool encrypted = false;
                 foreach (var entry in zipFile.Entries)
                 {
                     try
@@ -58,6 +59,17 @@ public bool Extract(string outputDirectory, bool lookForHeader, bool includeDebu
                         // If the entry is partial due to an incomplete multi-part archive, skip it
                         if (!entry.IsComplete)
                             continue;
+                        
+                        // If the entry is password-protected, skip it
+                        if (entry.IsEncrypted)
+                        {
+                            if (!encrypted)
+                            {
+                                if (includeDebug) Console.WriteLine("Some or all files in zip are password-protected!");
+                                encrypted = true;
+                            }
+                            continue;
+                        }
 
                         // Ensure directory separators are consistent
                         string filename = entry.Key;

SabreTools.Serialization/Wrappers/RAR.Extraction.cs

@@ -75,9 +75,17 @@ public bool Extract(string outputDirectory, bool lookForHeader, bool includeDebu
 
                         if (firstFile)
                             firstFile = false;
-                        else
+                        else if (entry.IsSolid)
                         {
-                            isSolid = entry.IsSolid;
+                            // If the RAR is solid and the first entry is password-protected, you won't be able to
+                            // extract the rest of the entries anyway, so just return early.
+                            if (entry.IsEncrypted)
+                            {
+                                if (includeDebug) Console.WriteLine("RAR is password-protected!");
+                                return false;
+                            }
+                            
+                            isSolid = true;
                             break;
                         }
                     }
@@ -200,6 +208,7 @@ public static List<string> FindParts(string firstPart)
         /// </summary>
         private static bool ExtractNonSolid(RarArchive rarFile, string outDir, bool includeDebug)
         {
+            bool encrypted = false;
             foreach (var entry in rarFile.Entries)
             {
                 try
@@ -215,6 +224,17 @@ private static bool ExtractNonSolid(RarArchive rarFile, string outDir, bool incl
                     // If we have a partial entry due to an incomplete multi-part archive, skip it
                     if (!entry.IsComplete)
                         continue;
+                    
+                    // If the entry is password-protected, skip it
+                    if (entry.IsEncrypted)
+                    {
+                        if (!encrypted)
+                        {
+                            if (includeDebug) Console.WriteLine("Some or all files in RAR are password-protected!");
+                            encrypted = true;
+                        }
+                        continue;
+                    }
 
                     // Ensure directory separators are consistent
                     string filename = entry.Key;

SabreTools.Serialization/Wrappers/SevenZip.Extraction.cs

@@ -74,9 +74,17 @@ public bool Extract(string outputDirectory, bool lookForHeader, bool includeDebu
 
                         if (firstFile)
                             firstFile = false;
-                        else
+                        else if (entry.IsSolid)
                         {
-                            isSolid = entry.IsSolid;
+                            // If the 7z is solid and the first entry is password-protected, you won't be able to
+                            // extract the rest of the entries anyway, so just return early.
+                            if (entry.IsEncrypted)
+                            {
+                                if (includeDebug) Console.WriteLine("7z is password-protected!");
+                                return false;
+                            }
+                            
+                            isSolid = true;
                             break;
                         }
                     }
@@ -168,6 +176,7 @@ public static List<string> FindParts(string firstPart)
         /// </summary>
         private static bool ExtractNonSolid(SevenZipArchive sevenZip, string outputDirectory, bool includeDebug)
         {
+            bool encrypted = false;
             foreach (var entry in sevenZip.Entries)
             {
                 try
@@ -183,6 +192,17 @@ private static bool ExtractNonSolid(SevenZipArchive sevenZip, string outputDirec
                     // If we have a partial entry due to an incomplete multi-part archive, skip it
                     if (!entry.IsComplete)
                         continue;
+                    
+                    // If the entry is password-protected, skip it
+                    if (entry.IsEncrypted)
+                    {
+                        if (!encrypted)
+                        {
+                            if (includeDebug) Console.WriteLine("Some or all files in 7z are password-protected!");
+                            encrypted = true;
+                        }
+                        continue;
+                    }
 
                     // Ensure directory separators are consistent
                     string filename = entry.Key;