Exposed AssetDiff to blueprint

Open the AssetDiff between two assets in a project, or a asset in the project vs. an disk path to a uasset file,

Author: ElgSoft

Content/TestAndExamples/DiffAssets/BP_DiffA.uasset

@@ -14,6 +14,7 @@
 #include <ContentBrowserModule.h>
 #include "Core\Public\Modules\ModuleManager.h"
 #include <IContentBrowserSingleton.h>
+#include <HAL/PlatformFilemanager.h>
 
 
 #pragma region Redirectors
@@ -148,10 +149,6 @@ FAssetData UElgEditorBP_Assets::GetAssetDataFromPath(const FString& AssetPath)
 
 	FAssetRegistryModule& AssetRegistryModule = FModuleManager::LoadModuleChecked<FAssetRegistryModule>("AssetRegistry");
 	AssetData = AssetRegistryModule.Get().GetAssetByObjectPath(*AssetPath);
-	if (!AssetData.IsValid()) {
-		return AssetData;
-	}
-
 	return AssetData;
 }
 
@@ -200,6 +197,17 @@ FString UElgEditorBP_Assets::GetAssetPath(const FAssetData& AssetDataStruct)
 
 #pragma region GetAssets
 
+void UElgEditorBP_Assets::GetAssetObjectByPath(const FString InAssetPath, UObject*& AssetObject)
+{
+	AssetObject = nullptr;
+	FAssetData assetData = GetAssetDataFromPath(InAssetPath);
+	if (assetData.IsValid()) {
+		AssetObject = assetData.GetAsset();
+	}
+}
+
+
+
 void UElgEditorBP_Assets::GetAssetObjects(const TArray<FAssetData>& AssetDataStructs, TArray<UObject*>& AssetObjects)
 {
 	AssetObjects.Empty();
@@ -447,7 +455,6 @@ TArray<FString> UElgEditorBP_Assets::GetSelectedPaths()
 }
 #pragma endregion
 
-
 #pragma region Paths
 
 FString UElgEditorBP_Assets::AssetPathToDiskPath(const FString& InAssetPath)
@@ -468,3 +475,79 @@ TArray<FString> UElgEditorBP_Assets::AssetPathsToDiskPaths(TArray<FString> InAss
 
 #pragma endregion
 
+#pragma region DiffAssets
+
+void UElgEditorBP_Assets::DiffAssets(UObject* OldAsset, UObject* NewAsset, const FString OldAssetRevisionString)
+{
+	if (!OldAsset || !NewAsset) {
+		UE_LOG(LogTemp, Warning, TEXT("Need two valid Asset objects to diff..."));
+		return;
+	}
+
+	FAssetToolsModule& AssetToolsModule = FModuleManager::LoadModuleChecked<FAssetToolsModule>(TEXT("AssetTools"));
+	
+	FRevisionInfo OldRevision;
+	OldRevision.Revision = OldAssetRevisionString;
+
+	FRevisionInfo NewRevision;
+	NewRevision.Revision = TEXT("");
+
+	AssetToolsModule.Get().DiffAssets(OldAsset, NewAsset, OldRevision, NewRevision);
+}
+
+void UElgEditorBP_Assets::DiffAssetData(const FAssetData OldAsset, const FAssetData NewAsset, const FString OldAssetRevisionString)
+{
+	if (!OldAsset.IsValid() || !NewAsset.IsValid()) {
+		UE_LOG(LogTemp, Warning, TEXT("Need two valid Asset data to diff..."));
+		return;
+	}
+	UObject* oldAsset = OldAsset.GetAsset();
+	UObject* newAsset = NewAsset.GetAsset();
+	DiffAssets(oldAsset, newAsset, OldAssetRevisionString);
+}
+
+void UElgEditorBP_Assets::DiffAssetPath(const FString OldAssetPath, const FString NewAssetPath, const FString OldAssetRevisionString)
+{
+	if (OldAssetPath.IsEmpty() || NewAssetPath.IsEmpty()) {
+		UE_LOG(LogTemp, Warning, TEXT("Need two valid Asset Path to diff..."));
+		return;
+	}
+	FAssetData oldAsset = GetAssetDataFromPath(OldAssetPath);
+	FAssetData newAsset = GetAssetDataFromPath(NewAssetPath);
+	DiffAssetData(oldAsset, newAsset, OldAssetRevisionString);
+}
+
+void UElgEditorBP_Assets::DiffAssetWithExternalAsset(UObject* NewAsset, const FString ExternalAssetFilePath, const FString ExternalAssetName)
+{
+	if (!NewAsset) {
+		UE_LOG(LogTemp, Warning, TEXT("Need a valid asset to diff"));
+		return;
+	}
+	if (ExternalAssetName.IsEmpty()) {
+		UE_LOG(LogTemp, Warning, TEXT("Need a valid ExternalAssetName to diff"));
+		return;
+	}
+	if (!FPlatformFileManager::Get().GetPlatformFile().FileExists(*ExternalAssetFilePath)) {
+		UE_LOG(LogTemp, Warning, TEXT("Failed to find any file at %s"), *ExternalAssetFilePath);
+		return;
+	}
+
+	FString path = FPaths::ConvertRelativePathToFull(ExternalAssetFilePath);
+	UPackage* tempPackage = LoadPackage(nullptr, *path, LOAD_ForDiff | LOAD_DisableCompileOnLoad);
+	if (tempPackage != nullptr) {
+		UObject* oldObject = FindObject<UObject>(tempPackage, *ExternalAssetName);
+		if (oldObject != nullptr) {
+			DiffAssets(oldObject, NewAsset, ExternalAssetName);
+		} 
+		else  {
+			UE_LOG(LogTemp, Warning, TEXT("Failed to find any asset with name %s in the package"), *ExternalAssetName);
+			return;
+		}
+	} else {
+		UE_LOG(LogTemp, Warning, TEXT("Failed to load the package at %s"), *path);
+		return;
+	}
+}
+
+#pragma endregion
+

Content/TestAndExamples/DiffAssets/BP_DiffB.uasset

@@ -125,6 +125,10 @@ class ELGEDITORSCRIPTING_API UElgEditorBP_Assets : public UBlueprintFunctionLibr
 
 #pragma region GetAssetObjects
 
+	/* Get the asset object from the asset path */
+	UFUNCTION(BlueprintPure, Category = "ElgEditor|Asset")
+		static void GetAssetObjectByPath(const FString InAssetPath, UObject*& AssetObject);
+
 	/* Get the asset data as asset objects array*/
 	UFUNCTION(BlueprintPure, Category = "ElgEditor|Asset")
 		static void GetAssetObjects(const TArray<FAssetData>& AssetDataStructs, TArray<UObject*>& AssetObjects);
@@ -207,7 +211,6 @@ class ELGEDITORSCRIPTING_API UElgEditorBP_Assets : public UBlueprintFunctionLibr
 
 #pragma endregion
 
-
 #pragma region Paths
 
 	UFUNCTION(BlueprintPure, Category = "ElgEditor|Asset")
@@ -216,6 +219,34 @@ class ELGEDITORSCRIPTING_API UElgEditorBP_Assets : public UBlueprintFunctionLibr
 	UFUNCTION(BlueprintPure, Category = "ElgEditor|Asset")
 		static TArray<FString> AssetPathsToDiskPaths(TArray<FString> InAssetPaths);
 
+#pragma endregion
+
+#pragma region DiffAssets
+
+	/** 
+		Try and diff two assets using class-specific tool. Will do nothing if either asset is NULL, or they are not the same class. 
+	*/
+	UFUNCTION(BlueprintCallable, Category = "ElgEditor|Asset|Diff")
+		static void DiffAssets(UObject* OldAsset, UObject* NewAsset, const FString OldAssetRevisionString);
+
+	/**
+		Try and diff two assets using class-specific tool. Will do nothing if either asset is NULL, or they are not the same class.
+	*/
+	UFUNCTION(BlueprintCallable, Category = "ElgEditor|Asset|Diff")
+		static void DiffAssetData(const FAssetData OldAsset, const FAssetData NewAsset, const FString OldAssetRevisionString);
+
+	/**
+		Try and diff two assets using class-specific tool. Will do nothing if either asset is NULL, or they are not the same class.
+	*/
+	UFUNCTION(BlueprintCallable, Category = "ElgEditor|Asset|Diff")
+		static void DiffAssetPath(const FString OldAssetPath, const FString NewAssetPath, const FString OldAssetRevisionString);
+
+	/**
+	Try and diff two assets using class-specific tool. Will do nothing if either asset is NULL, or they are not the same class.
+	*/
+	UFUNCTION(BlueprintCallable, Category = "ElgEditor|Asset|Diff")
+		static void DiffAssetWithExternalAsset(UObject* NewAsset, const FString ExternalAssetFilePath, const FString ExternalAssetName);
+
 #pragma endregion
 };