From 3309ec453bcf3dceaf946f95ad25ef1523d269c3 Mon Sep 17 00:00:00 2001 From: bluextx Date: Sat, 11 Jan 2025 07:08:26 +0300 Subject: [PATCH] Removed unused ProcessFilesFromDumps method --- .../Process/QueuePipeline.cs | 82 ------------------- 1 file changed, 82 deletions(-) diff --git a/source/LootDumpProcessor/Process/QueuePipeline.cs b/source/LootDumpProcessor/Process/QueuePipeline.cs index b05e189..d7f9d67 100644 --- a/source/LootDumpProcessor/Process/QueuePipeline.cs +++ b/source/LootDumpProcessor/Process/QueuePipeline.cs @@ -195,88 +195,6 @@ public class QueuePipeline(IFileProcessor fileProcessor, IDumpProcessor dumpProc ); } - /// - /// Gets all files and adds them to the processor. - /// use per map version now - /// - /// - /// - private void ProcessFilesFromDumps(int threads, ICollector collector) - { - // Gather all files, sort them by date descending and then add them into the processing queue - GatherFiles().OrderByDescending(f => - { - FileDateParser.TryParseFileDate(f, out var date); - return date; - } - ).ToList().ForEach(f => _filesToProcess.Add(f)); - - if (LoggerFactory.GetInstance().CanBeLogged(LogLevel.Info)) - { - LoggerFactory.GetInstance().Log("Files sorted and ready to begin pre-processing", LogLevel.Info); - } - - // We startup all the threads and collect them into a runners list - for (int i = 0; i < threads; i++) - { - if (LoggerFactory.GetInstance().CanBeLogged(LogLevel.Info)) - { - LoggerFactory.GetInstance().Log("Creating pre-processing threads", LogLevel.Info); - } - - Runners.Add( - Task.Factory.StartNew( - () => - { - while (_filesToProcess.TryTake(out var file, TimeSpan.FromMilliseconds(5000))) - { - try - { - var reader = IntakeReaderFactory.GetInstance(); - if (reader.Read(file, out var basicInfo)) - { - collector.Hold(_fileProcessor.Process(basicInfo)); - } - } - catch (Exception e) - { - if (LoggerFactory.GetInstance().CanBeLogged(LogLevel.Error)) - { - LoggerFactory.GetInstance().Log( - $"Error occurred while processing file {file}\n{e.Message}\n{e.StackTrace}", - LogLevel.Error); - } - } - } - }, - TaskCreationOptions.LongRunning) - ); - } - - // Wait until all runners are done processing - while (!Runners.All(r => r.IsCompleted)) - { - if (LoggerFactory.GetInstance().CanBeLogged(LogLevel.Info)) - { - LoggerFactory.GetInstance().Log( - $"One or more file processors are still processing files. Waiting {LootDumpProcessorContext.GetConfig().ThreadPoolingTimeoutMs}ms before checking again", - LogLevel.Info); - } - - Thread.Sleep(TimeSpan.FromMilliseconds(LootDumpProcessorContext.GetConfig().ThreadPoolingTimeoutMs)); - } - - if (LoggerFactory.GetInstance().CanBeLogged(LogLevel.Info)) - { - LoggerFactory.GetInstance().Log("Pre-processing finished", LogLevel.Info); - } - - // Single writer instance to collect results - var writer = WriterFactory.GetInstance(); - // Single collector instance to collect results - writer.WriteAll(_dumpProcessor.ProcessDumps(collector.Retrieve())); - } - private void ProcessFilesFromDumpsPerMap(int threads, ICollector collector, string mapName) { // Gather all files, sort them by date descending and then add them into the processing queue