Skip to content

Remove parallelized Rar Extractor #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gfs merged 1 commit into from
Dec 20, 2022
Merged

Remove parallelized Rar Extractor #103

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 19 additions & 72 deletions RecursiveExtractor/Extractors/RarExtractor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,86 +143,33 @@ public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions opti
if (rarArchive != null && fileEntry.EntryStatus == FileEntryStatus.Default)
{
var entries = rarArchive.Entries.Where(x => x.IsComplete && !x.IsDirectory);
if (options.Parallel)
foreach (var entry in entries)
{
var files = new ConcurrentStack<FileEntry>();

while (entries.Any())
governor.CheckResourceGovernor(entry.Size);
FileEntry? newFileEntry = null;
try
{
var batchSize = Math.Min(options.BatchSize, entries.Count());

var streams = entries.Take(batchSize).Select(entry => (entry, entry.OpenEntryStream())).ToList();

governor.CheckResourceGovernor(streams.Sum(x => x.Item2.Length));

streams.AsParallel().ForAll(streampair =>
{
try
{
FileEntry newFileEntry = new FileEntry(streampair.entry.Key, streampair.Item2, fileEntry, false, streampair.entry.CreatedTime, streampair.entry.LastModifiedTime, streampair.entry.LastAccessedTime, memoryStreamCutoff: options.MemoryStreamCutoff);

if (newFileEntry != null)
{
if (options.Recurse || topLevel)
{
var entries = Context.Extract(newFileEntry, options, governor, false);
if (entries.Any())
{
files.PushRange(entries.ToArray());
}
}
else
{
files.Push(newFileEntry);
}
}
}
catch (Exception e)
{
Logger.Debug(Extractor.DEBUG_STRING, ArchiveFileType.RAR, fileEntry.FullPath, streampair.entry.Key, e.GetType());
}
});
governor.CheckResourceGovernor(0);

entries = entries.Skip(streams.Count);

while (files.TryPop(out var result))
{
if (result != null)
yield return result;
}
var stream = entry.OpenEntryStream();
var name = entry.Key.Replace('/', Path.DirectorySeparatorChar);
newFileEntry = new FileEntry(name, stream, fileEntry, false, entry.CreatedTime, entry.LastModifiedTime, entry.LastAccessedTime, memoryStreamCutoff: options.MemoryStreamCutoff);
}
}
else
{
foreach (var entry in entries)
catch (Exception e)
{
governor.CheckResourceGovernor(entry.Size);
FileEntry? newFileEntry = null;
try
{
var stream = entry.OpenEntryStream();
var name = entry.Key.Replace('/', Path.DirectorySeparatorChar);
newFileEntry = new FileEntry(name, stream, fileEntry, false, entry.CreatedTime, entry.LastModifiedTime, entry.LastAccessedTime, memoryStreamCutoff: options.MemoryStreamCutoff);
}
catch (Exception e)
{
Logger.Debug(Extractor.DEBUG_STRING, ArchiveFileType.RAR, fileEntry.FullPath, entry.Key, e.GetType());
}
if (newFileEntry != null)
Logger.Debug(Extractor.DEBUG_STRING, ArchiveFileType.RAR, fileEntry.FullPath, entry.Key, e.GetType());
}
if (newFileEntry != null)
{
if (options.Recurse || topLevel)
{
if (options.Recurse || topLevel)
{
foreach (var innerEntry in Context.Extract(newFileEntry, options, governor, false))
{
yield return innerEntry;
}
}
else
foreach (var innerEntry in Context.Extract(newFileEntry, options, governor, false))
{
yield return newFileEntry;
yield return innerEntry;
}
}
else
{
yield return newFileEntry;
}
}
}
}
Expand Down