- consider filter when extracting files

Author: Zakamurite

CASCConsole/Program.cs

@@ -52,24 +52,19 @@ static void Main(string[] args)
             Console.WriteLine("    LocaleFlags: {0}", locale);
             Console.WriteLine("    ContentFlags: {0}", content);
 
-            Wildcard wildcard = new Wildcard(pattern, true, RegexOptions.IgnoreCase);
-
-            foreach (var file in CASCFolder.GetFiles(root.Entries.Select(kv => kv.Value)))
+            foreach (var file in CASCFolder.GetFiles(root.Entries.Select(kv => kv.Value), filter: pattern))
             {
-                if (wildcard.IsMatch(file.FullName))
+                Console.Write("Extracting '{0}'...", file.FullName);
+
+                try
+                {
+                    cascHandler.SaveFileTo(file.FullName, dest);
+                    Console.WriteLine(" Ok!");
+                }
+                catch (Exception exc)
                 {
-                    Console.Write("Extracting '{0}'...", file.FullName);
-
-                    try
-                    {
-                        cascHandler.SaveFileTo(file.FullName, dest);
-                        Console.WriteLine(" Ok!");
-                    }
-                    catch (Exception exc)
-                    {
-                        Console.WriteLine(" Error!");
-                        Logger.WriteLine(exc.Message);
-                    }
+                    Console.WriteLine(" Error!");
+                    Logger.WriteLine(exc.Message);
                 }
             }
 

CASCExplorer/CASCViewHelper.cs

@@ -41,7 +41,7 @@ class CASCViewHelper
 
         public List<ICASCEntry> DisplayedEntries => _displayedEntries;
 
-        public void ExtractFiles(NoFlickerListView filesList)
+        public void ExtractFiles(NoFlickerListView filesList, string filter)
         {
             if (_currentFolder == null)
                 return;
@@ -52,7 +52,7 @@ public void ExtractFiles(NoFlickerListView filesList)
             if (extractProgress == null)
                 extractProgress = new ExtractProgress();
 
-            var files = CASCFolder.GetFiles(_displayedEntries, filesList.SelectedIndices.Cast<int>()).ToList();
+            var files = CASCFolder.GetFiles(_displayedEntries, filesList.SelectedIndices.Cast<int>(), true, filter).ToList();
             extractProgress.SetExtractData(_casc, files);
             extractProgress.ShowDialog();
         }

CASCExplorer/MainForm.cs

@@ -216,7 +216,7 @@ private bool NavigateFolder()
 
         private void extractToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            viewHelper.ExtractFiles(fileList);
+            viewHelper.ExtractFiles(fileList, filterToolStripTextBox.Text);
         }
 
         private void contextMenuStrip1_Opening(object sender, CancelEventArgs e)

CascLib/CASCEntry.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 
 namespace CASCExplorer
 {
@@ -41,8 +42,10 @@ public ICASCEntry GetEntry(string name)
             return entry;
         }
 
-        public static IEnumerable<CASCFile> GetFiles(IEnumerable<ICASCEntry> entries, IEnumerable<int> selection = null, bool recursive = true)
+        public static IEnumerable<CASCFile> GetFiles(IEnumerable<ICASCEntry> entries, IEnumerable<int> selection = null, bool recursive = true, string filter = "")
         {
+            var wildcard = filter != string.Empty && filter != "*" ? new Wildcard(filter, false, RegexOptions.IgnoreCase) : null;
+
             if (selection != null)
             {
                 foreach (int index in selection)
@@ -51,6 +54,8 @@ public static IEnumerable<CASCFile> GetFiles(IEnumerable<ICASCEntry> entries, IE
 
                     if (entry is CASCFile)
                     {
+                        if (wildcard != null && !wildcard.IsMatch(entry.Name))
+                            continue;
                         yield return entry as CASCFile;
                     }
                     else
@@ -59,8 +64,10 @@ public static IEnumerable<CASCFile> GetFiles(IEnumerable<ICASCEntry> entries, IE
                         {
                             var folder = entry as CASCFolder;
 
-                            foreach (var file in GetFiles(folder.Entries.Select(kv => kv.Value)))
+                            foreach (var file in GetFiles(folder.Entries.Select(kv => kv.Value), filter: filter))
                             {
+                                if (wildcard != null && !wildcard.IsMatch(file.Name))
+                                    continue;
                                 yield return file;
                             }
                         }
@@ -73,6 +80,8 @@ public static IEnumerable<CASCFile> GetFiles(IEnumerable<ICASCEntry> entries, IE
                 {
                     if (entry is CASCFile)
                     {
+                        if (wildcard != null && !wildcard.IsMatch(entry.Name))
+                            continue;
                         yield return entry as CASCFile;
                     }
                     else
@@ -81,8 +90,10 @@ public static IEnumerable<CASCFile> GetFiles(IEnumerable<ICASCEntry> entries, IE
                         {
                             var folder = entry as CASCFolder;
 
-                            foreach (var file in GetFiles(folder.Entries.Select(kv => kv.Value)))
+                            foreach (var file in GetFiles(folder.Entries.Select(kv => kv.Value), filter: filter))
                             {
+                                if (wildcard != null && !wildcard.IsMatch(file.Name))
+                                    continue;
                                 yield return file;
                             }
                         }