fix(#41): unused assets detection with OFPA

- unused assets detected correctly now , even with level with World Partition system enabled
- all external assets of that systems, are not displayed as corrupted now

Author: ashe23

ProjectCleaner.uplugin

@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "1.8.0",
+	"VersionName": "1.8.1",
 	"FriendlyName": "ProjectCleaner",
 	"Description": "Unreal engine plugin for managing all unused assets and empty folders in project",
 	"Category": "ProjectManagementTools",

Source/ProjectCleaner/Private/Core/ProjectCleanerDataManager.cpp

@@ -445,6 +445,13 @@ void FProjectCleanerDataManager::FindAllAssets()
 	AllAssets.Empty();
 	AllAssets.Reserve(AssetRegistry->Get().GetAllocatedSize());
 	AssetRegistry->Get().GetAssetsByPath(RelativeRoot, AllAssets, true);
+
+	// filtering assets that are in '/Game/__ExternalActors__' and '/Game/__ExternalObjects__' folders
+	FARFilter Filter;
+	Filter.bRecursivePaths = true;
+	Filter.PackagePaths.Add(FName{*ProjectCleanerUtility::GetExternalActorsFolderPath()});
+	Filter.PackagePaths.Add(FName{*ProjectCleanerUtility::GetExternalObjectsFolderPath()});
+	AssetRegistry->Get().UseFilterToExcludeAssets(AllAssets, Filter);
 }
 
 void FProjectCleanerDataManager::FindInvalidFilesAndAssets()
@@ -479,6 +486,11 @@ void FProjectCleanerDataManager::FindInvalidFilesAndAssets()
 					ObjectPath.RemoveFromEnd(FPaths::GetExtension(InternalFilePath, true));
 					ObjectPath.Append(TEXT(".") + FPaths::GetBaseFilename(InternalFilePath));
 
+					if (ProjectCleanerUtility::IsUnderExternalGameFolder(ObjectPath))
+					{
+						return false;
+					}
+					
 					const FName ObjectPathName = FName{*ObjectPath};
 					const bool IsInAssetRegistry = AllAssets.ContainsByPredicate([&] (const FAssetData& Elem)
 					{
@@ -680,9 +692,9 @@ void FProjectCleanerDataManager::FindAssetsWithExternalReferencers()
 	{
 		AssetRegistry->Get().GetReferencers(Asset.PackageName, Refs);
 
-		const bool HasExternalRefs = Refs.ContainsByPredicate([](const FName& Ref)
+		const bool HasExternalRefs = Refs.ContainsByPredicate([&](const FName& Ref)
 		{
-			return !Ref.ToString().StartsWith(TEXT("/Game"));
+			return !Ref.ToString().StartsWith(TEXT("/Game")) || ProjectCleanerUtility::IsUnderExternalGameFolder(Ref.ToString());
 		});
 
 		if (HasExternalRefs)

Source/ProjectCleaner/Private/Core/ProjectCleanerUtility.cpp

@@ -131,6 +131,23 @@ bool ProjectCleanerUtility::IsUnderMegascansFolder(const FAssetData& AssetData)
 	return AssetData.PackagePath.ToString().StartsWith(TEXT("/Game/MSPresets"));
 }
 
+FString ProjectCleanerUtility::GetExternalActorsFolderPath()
+{
+	return FString::Printf(TEXT("/Game/%s"), FPackagePath::GetExternalActorsFolderName());
+}
+
+FString ProjectCleanerUtility::GetExternalObjectsFolderPath()
+{
+	return FString::Printf(TEXT("/Game/%s"), FPackagePath::GetExternalObjectsFolderName());
+}
+
+bool ProjectCleanerUtility::IsUnderExternalGameFolder(const FString& Path)
+{
+	if (Path.IsEmpty()) return false;
+
+	return  Path.StartsWith(GetExternalActorsFolderPath()) || Path.StartsWith(GetExternalObjectsFolderPath());
+}
+
 bool ProjectCleanerUtility::HasIndirectlyUsedAssets(const FString& FileContent)
 {
 	if (FileContent.IsEmpty()) return false;

Source/ProjectCleaner/Public/Core/ProjectCleanerUtility.h

@@ -19,6 +19,8 @@ class PROJECTCLEANER_API ProjectCleanerUtility
 	static int64 GetTotalSize(const TArray<FAssetData>& Assets);
 	static FName GetClassName(const FAssetData& AssetData);
 	static FText GetDeletionProgressText(const int32 DeletedAssetNum, const int32 Total, const bool bShowPercent);
+	static FString GetExternalActorsFolderPath();
+	static FString GetExternalObjectsFolderPath();
 	static FString ConvertAbsolutePathToInternal(const FString& InPath);
 	static FString ConvertInternalToAbsolutePath(const FString& InPath);
 	static void SaveAllAssets(const bool PromptUser);
@@ -28,6 +30,7 @@ class PROJECTCLEANER_API ProjectCleanerUtility
 	static int32 DeleteAssets(TArray<FAssetData>& Assets, const bool ForceDelete);
 	static bool IsEngineExtension(const FString& Extension);
 	static bool IsUnderMegascansFolder(const FAssetData& AssetData);
+	static bool IsUnderExternalGameFolder(const FString& Path);
 	static bool HasIndirectlyUsedAssets(const FString& FileContent);
 private:
 	static FString ConvertPathInternal(const FString& From, const FString To, const FString& Path);