cleanup

Author: dnzbk

daemon/postprocess/Cleanup.cpp

@@ -120,14 +120,14 @@ bool MoveController::MoveFiles(const fs::path& src, const fs::path& dest)
 		auto filename = fs::u8string(it->path().filename());
 		if (filename[0] == '.')
 		{
-			if (it->is_directory())
+			if (it->is_directory(ec))
 			{
 				it.disable_recursion_pending();
 			}
 			continue;
 		}
 
-		if (it->is_directory())
+		if (it->is_directory(ec))
 		{
 			dirs.push_back(it->path());
 		}
@@ -137,6 +137,11 @@ bool MoveController::MoveFiles(const fs::path& src, const fs::path& dest)
 		}
 	}
 
+	if (IsStopped() || ec)
+	{
+		return false;
+	}
+
 	for (const auto& d : dirs)
 	{
 		if (IsStopped()) return false;
@@ -194,6 +199,7 @@ bool MoveController::MoveFiles(const fs::path& src, const fs::path& dest)
 		if (fs::u8string(dstPath.filename()) != filename)
 		{
 			std::string newName = fs::u8string(dstPath.filename());
+			GuardedDownloadQueue guard = DownloadQueue::Guard();
 			m_postInfo->GetNzbInfo()->RenameCompletedFile(filename.c_str(), newName.c_str());
 		}
 	}

daemon/postprocess/CollectionAnalyzer.cpp

@@ -0,0 +1,116 @@
+/*
+ *  This file is part of nzbget. See <https://nzbget.com>.
+ *
+ *  Copyright (C) 2026 Denis <denis@nzbget.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+
+#include "nzbget.h"
+#include "CollectionAnalyzer.h"
+#include "FileTypes.h"
+
+namespace PostDownloadRenamer
+{
+
+std::vector<CollectionAnalyzer::FileGroup>
+CollectionAnalyzer::BuildGroups(const std::vector<Candidate>& candidates)
+{
+	std::vector<FileGroup> groups;
+	for (const Candidate& candidate : candidates)
+	{
+		if (FileTypes::IsSubtitleExt(candidate.ext) || FileTypes::IsSampleStem(candidate.stem)) continue;
+
+		FileGroup* targetGroup = nullptr;
+		for (FileGroup& group : groups)
+		{
+			if (group.parentDir == candidate.parentDir && group.extKey == candidate.extLower)
+			{
+				targetGroup = &group;
+				break;
+			}
+		}
+
+		if (!targetGroup)
+		{
+			groups.push_back({candidate.parentDir, candidate.extLower, 0, 0, 0, false});
+			targetGroup = &groups.back();
+		}
+
+		targetGroup->count++;
+		uintmax_t size = candidate.size;
+		if (size > targetGroup->largest)
+		{
+			targetGroup->second = targetGroup->largest;
+			targetGroup->largest = size;
+		}
+		else if (size > targetGroup->second)
+		{
+			targetGroup->second = size;
+		}
+	}
+
+	for (FileGroup& group : groups)
+	{
+		bool isAmbiguousCollection = (group.count >= 2 && group.largest <= group.second * 3);
+		bool isAudio = FileTypes::IsAudioExt(group.extKey);
+		group.skip = isAmbiguousCollection && !isAudio;
+	}
+
+	return groups;
+}
+
+CollectionAnalyzer::CollectionAnalyzer(const std::vector<Candidate>& candidates)
+	: m_groups(BuildGroups(candidates))
+{
+}
+
+bool CollectionAnalyzer::ShouldSkip(const Candidate& candidate) const
+{
+	bool isSub = FileTypes::IsSubtitleExt(candidate.ext);
+	bool isSample = FileTypes::IsSampleStem(candidate.stem);
+
+	if (isSub || isSample)
+	{
+		bool hasNonAudioGroup = false;
+		bool allNonAudioSkipped = true;
+
+		for (const FileGroup& group : m_groups)
+		{
+			if (group.parentDir == candidate.parentDir && !FileTypes::IsAudioExt(group.extKey))
+			{
+				hasNonAudioGroup = true;
+				if (!group.skip)
+				{
+					allNonAudioSkipped = false;
+				}
+			}
+		}
+
+		return hasNonAudioGroup && allNonAudioSkipped;
+	}
+
+	for (const FileGroup& group : m_groups)
+	{
+		if (group.parentDir == candidate.parentDir && group.extKey == candidate.extLower)
+		{
+			return group.skip;
+		}
+	}
+
+	return false;
+}
+
+}

daemon/postprocess/PostUnpackRenamer.h daemon/postprocess/CollectionAnalyzer.hdaemon/postprocess/PostUnpackRenamer.h renamed to daemon/postprocess/CollectionAnalyzer.h

@@ -18,37 +18,37 @@
  */
 
 
-#ifndef POST_UNPACK_RENAMER_H
-#define POST_UNPACK_RENAMER_H
+#ifndef COLLECTION_ANALYZER_H
+#define COLLECTION_ANALYZER_H
 
-#include "Thread.h"
-#include "DownloadInfo.h"
-#include <set>
-#include <vector>
 #include <string>
-#include <string_view>
+#include <vector>
+#include <cstdint>
+#include "PostDownloadRenamer.h"
 
-namespace PostUnpackRenamer
+namespace PostDownloadRenamer
 {
 
-class Controller final : public Thread
+class CollectionAnalyzer final
 {
 public:
-	static void StartJob(PostInfo* postInfo);
-	void Run() override;
-
-	int RenameFiles(PostInfo* postInfo);
-
-	std::string ResolveSubtitleName(std::string_view metaname, std::string_view stem, std::string_view ext);
-	std::string ResolveUniqueName(std::string_view metaname, std::string_view stem, std::string_view ext,
-		std::string_view baseName, const std::set<fs::path>& usedPaths, const fs::path& destPath);
+	explicit CollectionAnalyzer(const std::vector<Candidate>& candidates);
+	bool ShouldSkip(const Candidate& candidate) const;
 
 private:
-	PostInfo* m_postInfo = nullptr;
-	int m_renamedCount = 0;
-
-	std::vector<fs::path> CollectCandidates(const fs::path& dir);
-	void RenameCompleted();
+	struct FileGroup
+	{
+		fs::path parentDir;
+		std::string extKey;
+		uintmax_t largest = 0;
+		uintmax_t second = 0;
+		int count = 0;
+		bool skip = false;
+	};
+
+	std::vector<FileGroup> m_groups;
+
+	static std::vector<FileGroup> BuildGroups(const std::vector<Candidate>& candidates);
 };
 
 }