claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow wildcarded paths for inputs

Browse Source
This commit is contained in:
Matt Nadareski
2020-08-08 21:53:34 -07:00
parent ff8aebd3f0
commit 98a8c9cbfd
4 changed files with 48 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SabreTools.Library/Help/Feature.cs
View File

@@ -519,6 +519,10 @@ namespace SabreTools.Library.Help
if (!valid) if (!valid)
valid = File.Exists(input) || Directory.Exists(input); valid = File.Exists(input) || Directory.Exists(input);
// If we're not valid at this point, we weant to check if the flag is a wildcarded input
if (!valid)
valid = input.Contains("*") || input.Contains("?");
return valid; return valid;
} }

10
SabreTools.Library/Help/TopLevel.cs
View File

@@ -1,14 +1,8 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using SabreTools.Library.Data; using SabreTools.Library.Data;
using SabreTools.Library.DatFiles;
using SabreTools.Library.Help;
using SabreTools.Library.Tools;
namespace SabreTools.Library.Help namespace SabreTools.Library.Help
{ {
@@ -38,6 +32,10 @@ namespace SabreTools.Library.Help
// Special precautions for files and directories // Special precautions for files and directories
if (File.Exists(args[i]) || Directory.Exists(args[i])) if (File.Exists(args[i]) || Directory.Exists(args[i]))
Inputs.Add(args[i]); Inputs.Add(args[i]);
// Special precautions for wildcarded inputs (potential paths)
if (args[i].Contains("*") || args[i].Contains("?"))
Inputs.Add(args[i]);
} }
return true; return true;

55
SabreTools.Library/IO/DirectoryExtensions.cs
View File

@@ -67,14 +67,24 @@ namespace SabreTools.Library.IO
public static List<ParentablePath> GetDirectoriesOnly(List<string> inputs, bool appendparent = false) public static List<ParentablePath> GetDirectoriesOnly(List<string> inputs, bool appendparent = false)
{ {
List<ParentablePath> outputs = new List<ParentablePath>(); List<ParentablePath> outputs = new List<ParentablePath>();
foreach (string input in inputs) for (int i = 0; i < inputs.Count; i++)
{ {
string input = inputs[i];
// If we have a wildcard
string pattern = "*";
if (input.Contains("*") || input.Contains("?"))
{
pattern = Path.GetFileName(input);
input = input.Substring(0, input.Length - pattern.Length);
}
if (Directory.Exists(input)) if (Directory.Exists(input))
{ {
// Get the parent path in case of appending // Get the parent path in case of appending
string parentPath = Path.GetFullPath(input); string parentPath = Path.GetFullPath(input);
List<string> directories = GetDirectoriesOrdered(input); List<string> directories = GetDirectoriesOrdered(input, pattern);
foreach (string dir in directories) foreach (string dir in directories)
{ {
try try
@@ -100,10 +110,11 @@ namespace SabreTools.Library.IO
/// Retrieve a list of directories from a directory recursively in proper order /// Retrieve a list of directories from a directory recursively in proper order
/// </summary> /// </summary>
/// <param name="dir">Directory to parse</param> /// <param name="dir">Directory to parse</param>
/// <param name="pattern">Optional pattern to search for directory names</param>
/// <returns>List with all new files</returns> /// <returns>List with all new files</returns>
private static List<string> GetDirectoriesOrdered(string dir) private static List<string> GetDirectoriesOrdered(string dir, string pattern = "*")
{ {
return GetDirectoriesOrderedHelper(dir, new List<string>()); return GetDirectoriesOrderedHelper(dir, new List<string>(), pattern);
} }
/// <summary> /// <summary>
@@ -111,18 +122,19 @@ namespace SabreTools.Library.IO
/// </summary> /// </summary>
/// <param name="dir">Directory to parse</param> /// <param name="dir">Directory to parse</param>
/// <param name="infiles">List representing existing files</param> /// <param name="infiles">List representing existing files</param>
/// <param name="pattern">Optional pattern to search for directory names</param>
/// <returns>List with all new files</returns> /// <returns>List with all new files</returns>
private static List<string> GetDirectoriesOrderedHelper(string dir, List<string> infiles) private static List<string> GetDirectoriesOrderedHelper(string dir, List<string> infiles, string pattern)
{ {
// Take care of the files in the top directory // Take care of the files in the top directory
List<string> toadd = Directory.EnumerateDirectories(dir, "*", SearchOption.TopDirectoryOnly).ToList(); List<string> toadd = Directory.EnumerateDirectories(dir, pattern, SearchOption.TopDirectoryOnly).ToList();
toadd.Sort(new NaturalComparer()); toadd.Sort(new NaturalComparer());
infiles.AddRange(toadd); infiles.AddRange(toadd);
// Then recurse through and add from the directories // Then recurse through and add from the directories
foreach (string subDir in toadd) foreach (string subDir in toadd)
{ {
infiles = GetDirectoriesOrderedHelper(subDir, infiles); infiles = GetDirectoriesOrderedHelper(subDir, infiles, pattern);
} }
// Return the new list // Return the new list
@@ -138,14 +150,24 @@ namespace SabreTools.Library.IO
public static List<ParentablePath> GetFilesOnly(List<string> inputs, bool appendparent = false) public static List<ParentablePath> GetFilesOnly(List<string> inputs, bool appendparent = false)
{ {
List<ParentablePath> outputs = new List<ParentablePath>(); List<ParentablePath> outputs = new List<ParentablePath>();
foreach (string input in inputs) for (int i = 0; i < inputs.Count; i++)
{ {
string input = inputs[i];
// If we have a wildcard
string pattern = "*";
if (input.Contains("*") || input.Contains("?"))
{
pattern = Path.GetFileName(input);
input = input.Substring(0, input.Length - pattern.Length);
}
// Get the parent path in case of appending // Get the parent path in case of appending
string parentPath = Path.GetFullPath(input); string parentPath = Path.GetFullPath(input);
if (Directory.Exists(input)) if (Directory.Exists(input))
{ {
List<string> files = GetFilesOrdered(input); List<string> files = GetFilesOrdered(input, pattern);
foreach (string file in files) foreach (string file in files)
{ {
try try
@@ -186,11 +208,11 @@ namespace SabreTools.Library.IO
/// Retrieve a list of files from a directory recursively in proper order /// Retrieve a list of files from a directory recursively in proper order
/// </summary> /// </summary>
/// <param name="dir">Directory to parse</param> /// <param name="dir">Directory to parse</param>
/// <param name="infiles">List representing existing files</param> /// <param name="pattern">Optional pattern to search for directory names</param>
/// <returns>List with all new files</returns> /// <returns>List with all new files</returns>
public static List<string> GetFilesOrdered(string dir) public static List<string> GetFilesOrdered(string dir, string pattern = "*")
{ {
return GetFilesOrderedHelper(dir, new List<string>()); return GetFilesOrderedHelper(dir, new List<string>(), pattern);
} }
/// <summary> /// <summary>
@@ -198,20 +220,21 @@ namespace SabreTools.Library.IO
/// </summary> /// </summary>
/// <param name="dir">Directory to parse</param> /// <param name="dir">Directory to parse</param>
/// <param name="infiles">List representing existing files</param> /// <param name="infiles">List representing existing files</param>
/// <param name="pattern">Optional pattern to search for directory names</param>
/// <returns>List with all new files</returns> /// <returns>List with all new files</returns>
private static List<string> GetFilesOrderedHelper(string dir, List<string> infiles) private static List<string> GetFilesOrderedHelper(string dir, List<string> infiles, string pattern)
{ {
// Take care of the files in the top directory // Take care of the files in the top directory
List<string> toadd = Directory.EnumerateFiles(dir, "*", SearchOption.TopDirectoryOnly).ToList(); List<string> toadd = Directory.EnumerateFiles(dir, pattern, SearchOption.TopDirectoryOnly).ToList();
toadd.Sort(new NaturalComparer()); toadd.Sort(new NaturalComparer());
infiles.AddRange(toadd); infiles.AddRange(toadd);
// Then recurse through and add from the directories // Then recurse through and add from the directories
List<string> subDirs = Directory.EnumerateDirectories(dir, "*", SearchOption.TopDirectoryOnly).ToList(); List<string> subDirs = Directory.EnumerateDirectories(dir, pattern, SearchOption.TopDirectoryOnly).ToList();
subDirs.Sort(new NaturalComparer()); subDirs.Sort(new NaturalComparer());
foreach (string subdir in subDirs) foreach (string subdir in subDirs)
{ {
infiles = GetFilesOrderedHelper(subdir, infiles); infiles = GetFilesOrderedHelper(subdir, infiles, pattern);
} }
// Return the new list // Return the new list

2
SabreTools.Library/IO/PathExtensions.cs
View File

@@ -55,7 +55,7 @@ namespace SabreTools.Library.IO
public static bool HasValidArchiveExtension(string path) public static bool HasValidArchiveExtension(string path)
{ {
// Get the extension from the path, if possible // Get the extension from the path, if possible
string ext = PathExtensions.GetNormalizedExtension(path); string ext = GetNormalizedExtension(path);
// Check against the list of known archive extensions // Check against the list of known archive extensions
switch (ext) switch (ext)