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

[SabreTools, DATFromDirParallel] Change var name, fix splits

Browse Source
This commit is contained in:
Matt Nadareski
2016-09-06 20:34:09 -07:00
parent e5c6ef2b8d
commit 61c9f7a76d
2 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
SabreTools.Helper/Objects/DATFromDirParallel.cs
View File

@@ -26,7 +26,7 @@ namespace SabreTools
private bool _archivesAsFiles; private bool _archivesAsFiles;
private bool _enableGzip; private bool _enableGzip;
private bool _addblanks; private bool _addblanks;
private int _maxParallelism; private int _maxDegreeOfParallelism;
// Other required variables // Other required variables
private Logger _logger; private Logger _logger;
@@ -48,14 +48,14 @@ namespace SabreTools
/// <param name="archivesAsFiles">True if archives should be treated as files, false otherwise</param> /// <param name="archivesAsFiles">True if archives should be treated as files, false otherwise</param>
/// <param name="enableGzip">True if GZIP archives should be treated as files, false otherwise</param> /// <param name="enableGzip">True if GZIP archives should be treated as files, false otherwise</param>
/// <param name="tempDir">Name of the directory to create a temp folder in (blank is current directory)</param> /// <param name="tempDir">Name of the directory to create a temp folder in (blank is current directory)</param>
/// <param name="maxParallelism">Integer representing the maximum amount of parallelization to be used</param> /// <param name="maxDegreeOfParallelism">Integer representing the maximum amount of parallelization to be used</param>
/// <param name="logger">Logger object for console and file output</param> /// <param name="logger">Logger object for console and file output</param>
public DATFromDirParallel(string basePath, Dat datdata, bool noMD5, bool noSHA1, bool bare, public DATFromDirParallel(string basePath, Dat datdata, bool noMD5, bool noSHA1, bool bare,
bool archivesAsFiles, bool enableGzip, string tempDir, int maxParallelism, Logger logger) bool archivesAsFiles, bool enableGzip, string tempDir, int maxDegreeOfParallelism, Logger logger)
{ {
_basePath = Path.GetFullPath(basePath); _basePath = Path.GetFullPath(basePath);
_datdata = datdata; _datdata = datdata;
_datdata.Files.Add("null", new List<Rom>(10)); _datdata.Files.Add("null", new List<Rom>());
_noMD5 = noMD5; _noMD5 = noMD5;
_noSHA1 = noSHA1; _noSHA1 = noSHA1;
_bare = bare; _bare = bare;
@@ -63,11 +63,11 @@ namespace SabreTools
_enableGzip = enableGzip; _enableGzip = enableGzip;
_addblanks = true; _addblanks = true;
_tempDir = tempDir; _tempDir = tempDir;
_maxParallelism = maxParallelism; _maxDegreeOfParallelism = maxDegreeOfParallelism;
_logger = logger; _logger = logger;
} }
/// <summary> /// <suaxmary>
/// Process the file, folder, or list of some combination into a DAT file /// Process the file, folder, or list of some combination into a DAT file
/// </summary> /// </summary>
/// <returns>True if the DAT could be created, false otherwise</returns> /// <returns>True if the DAT could be created, false otherwise</returns>
@@ -97,7 +97,7 @@ namespace SabreTools
// Process the files in all subfolders // Process the files in all subfolders
Parallel.ForEach(Directory.EnumerateFiles(_basePath, "*", SearchOption.AllDirectories), Parallel.ForEach(Directory.EnumerateFiles(_basePath, "*", SearchOption.AllDirectories),
new ParallelOptions { MaxDegreeOfParallelism = _maxParallelism }, new ParallelOptions { MaxDegreeOfParallelism = _maxDegreeOfParallelism },
item => item =>
{ {
ProcessPossibleArchive(item); ProcessPossibleArchive(item);
@@ -107,7 +107,7 @@ namespace SabreTools
if (!_datdata.Romba && _addblanks) if (!_datdata.Romba && _addblanks)
{ {
Parallel.ForEach(Directory.EnumerateDirectories(_basePath, "*", SearchOption.AllDirectories), Parallel.ForEach(Directory.EnumerateDirectories(_basePath, "*", SearchOption.AllDirectories),
new ParallelOptions { MaxDegreeOfParallelism = _maxParallelism }, new ParallelOptions { MaxDegreeOfParallelism = _maxDegreeOfParallelism },
dir => dir =>
{ {
if (Directory.EnumerateFiles(dir, "*", SearchOption.TopDirectoryOnly).Count() == 0) if (Directory.EnumerateFiles(dir, "*", SearchOption.TopDirectoryOnly).Count() == 0)
@@ -174,8 +174,15 @@ namespace SabreTools
}); });
} }
// Wait for 5 seconds, just to be sure that no handles are open still // Now that we're done, delete the temp folder
Thread.Sleep(5000); try
{
Directory.Delete(_tempDir, true);
}
catch
{
// Just absorb the error for now
}
return true; return true;
} }
@@ -247,7 +254,7 @@ namespace SabreTools
{ {
_logger.Log(Path.GetFileName(item) + " treated like an archive"); _logger.Log(Path.GetFileName(item) + " treated like an archive");
Parallel.ForEach(Directory.EnumerateFiles(tempSubDir, "*", SearchOption.AllDirectories), Parallel.ForEach(Directory.EnumerateFiles(tempSubDir, "*", SearchOption.AllDirectories),
new ParallelOptions { MaxDegreeOfParallelism = _maxParallelism }, new ParallelOptions { MaxDegreeOfParallelism = _maxDegreeOfParallelism },
entry => entry =>
{ {
ProcessFile(entry, tempSubDir, Path.GetFileNameWithoutExtension(item), _datdata); ProcessFile(entry, tempSubDir, Path.GetFileNameWithoutExtension(item), _datdata);

21
SabreTools/Partials/SabreTools_Inits.cs
View File

@@ -441,7 +441,7 @@ namespace SabreTools
/// <param name="archivesAsFiles">True if archives should be treated as files, false otherwise</param> /// <param name="archivesAsFiles">True if archives should be treated as files, false otherwise</param>
/// <param name="enableGzip">True if GZIP archives should be treated as files, false otherwise</param> /// <param name="enableGzip">True if GZIP archives should be treated as files, false otherwise</param>
/// <param name="tempDir">Name of the directory to create a temp folder in (blank is current directory</param> /// <param name="tempDir">Name of the directory to create a temp folder in (blank is current directory</param>
/// <param name="maxParallelism">Integer representing the maximum amount of parallelization to be used</param> /// <param name="maxDegreeOfParallelism">Integer representing the maximum amount of parallelization to be used</param>
private static void InitDatFromDirParallel(List<string> inputs, private static void InitDatFromDirParallel(List<string> inputs,
string filename, string filename,
string name, string name,
@@ -459,7 +459,7 @@ namespace SabreTools
bool archivesAsFiles, bool archivesAsFiles,
bool enableGzip, bool enableGzip,
string tempDir, string tempDir,
int maxParallelism) int maxDegreeOfParallelism)
{ {
// Create a new DATFromDir object and process the inputs // Create a new DATFromDir object and process the inputs
Dat datdata = new Dat Dat datdata = new Dat
@@ -484,14 +484,17 @@ namespace SabreTools
if (Directory.Exists(path)) if (Directory.Exists(path))
{ {
string basePath = Path.GetFullPath(path); string basePath = Path.GetFullPath(path);
DATFromDirParallel dfd = new DATFromDirParallel(basePath, datdata, noMD5, noSHA1, bare, archivesAsFiles, enableGzip, tempDir, maxParallelism, _logger); DATFromDirParallel dfd = new DATFromDirParallel(basePath, datdata, noMD5, noSHA1, bare, archivesAsFiles, enableGzip, tempDir, maxDegreeOfParallelism, _logger);
bool success = dfd.Start(); bool success = dfd.Start();
// For DFDParallel only // If it was a success, write the DAT out
if (success)
{
DatTools.WriteDatfile(dfd.DatData, "", _logger); DatTools.WriteDatfile(dfd.DatData, "", _logger);
}
// If we failed, show the help // Otherwise, show the help
if (!success) else
{ {
Console.WriteLine(); Console.WriteLine();
Build.Help(); Build.Help();
@@ -524,7 +527,7 @@ namespace SabreTools
{ {
foreach (string file in Directory.EnumerateFiles(input, "*", SearchOption.AllDirectories)) foreach (string file in Directory.EnumerateFiles(input, "*", SearchOption.AllDirectories))
{ {
DatTools.SplitByExt(input, outdir, (input.EndsWith(Path.DirectorySeparatorChar.ToString()) ? input : input + Path.DirectorySeparatorChar), extaList, extbList, _logger); DatTools.SplitByExt(file, outdir, (input.EndsWith(Path.DirectorySeparatorChar.ToString()) ? input : input + Path.DirectorySeparatorChar), extaList, extbList, _logger);
} }
} }
else else
@@ -555,7 +558,7 @@ namespace SabreTools
{ {
foreach (string file in Directory.EnumerateFiles(input, "*", SearchOption.AllDirectories)) foreach (string file in Directory.EnumerateFiles(input, "*", SearchOption.AllDirectories))
{ {
DatTools.SplitByHash(input, outdir, (input.EndsWith(Path.DirectorySeparatorChar.ToString()) ? input : input + Path.DirectorySeparatorChar), _logger); DatTools.SplitByHash(file, outdir, (input.EndsWith(Path.DirectorySeparatorChar.ToString()) ? input : input + Path.DirectorySeparatorChar), _logger);
} }
} }
else else
@@ -586,7 +589,7 @@ namespace SabreTools
{ {
foreach (string file in Directory.EnumerateFiles(input, "*", SearchOption.AllDirectories)) foreach (string file in Directory.EnumerateFiles(input, "*", SearchOption.AllDirectories))
{ {
DatTools.SplitByType(input, outdir, (input.EndsWith(Path.DirectorySeparatorChar.ToString()) ? input : input + Path.DirectorySeparatorChar), _logger); DatTools.SplitByType(file, outdir, (input.EndsWith(Path.DirectorySeparatorChar.ToString()) ? input : input + Path.DirectorySeparatorChar), _logger);
} }
} }
else else