talezero/integration
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Routines to find exactly one

Browse Source
This commit is contained in:
jyelon
2026-03-18 21:48:56 -04:00
parent ce7b8bc39a
commit a18cff3fc9
6 changed files with 80 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Plugins/UEWingman/Source/UEWingman/HalfBaked/BlueprintGraph_Create.h
View File

@@ -51,11 +51,8 @@ public:
if (!BP) return;
// Check graph name uniqueness
if (!WingUtils::AllGraphsNamed(BP, Graph).IsEmpty())
{
UWingServer::Printf(TEXT("ERROR: A graph named '%s' already exists in %s\n"), *Graph, *WingUtils::FormatName(BP));
if (!WingUtils::FindExactlyNoneNamed(Graph, WingUtils::AllGraphs(BP)))
return;
}
// For custom events, also check for existing custom events with the same name
if (GraphType == TEXT("customEvent"))

2
Plugins/UEWingman/Source/UEWingman/HalfBaked/BlueprintGraph_Rename.h
View File

@@ -64,7 +64,7 @@ public:
}
// Check for name collision
for (UEdGraph* Existing : WingUtils::AllGraphsNamed(BP, NewName))
for (UEdGraph* Existing : WingUtils::FindAllNamed(NewName, WingUtils::AllGraphs(BP)))
{
if (Existing != TargetGraph)
{

5
Plugins/UEWingman/Source/UEWingman/HalfBaked/Blueprint_AddEventDispatcher.h
View File

@@ -71,11 +71,8 @@ public:
}
// Check against existing graphs (functions, macros, etc.)
if (!WingUtils::AllGraphsNamed(BP, DispatcherName).IsEmpty())
{
UWingServer::Printf(TEXT("Error: A graph named '%s' already exists.\n"), *DispatcherName);
if (!WingUtils::FindExactlyNoneNamed(DispatcherName, WingUtils::AllGraphs(BP)))
return;
}
// Add a member variable with PC_MCDelegate pin type
FEdGraphPinType DelegateType;

15
Plugins/UEWingman/Source/UEWingman/Private/WingFetcher.cpp
View File

@@ -186,19 +186,10 @@ WingFetcher& WingFetcher::Graph(const FString& Value)
if (!BP)
return TypeMismatch(TEXT("graph"), TEXT("Blueprint or Material"));
TArray<UEdGraph*> Matches = WingUtils::AllGraphsNamed(BP, Value);
if (Matches.Num() == 0)
{
UWingServer::Printf(TEXT("ERROR: Graph '%s' not found in %s\n"), *Value, *BP->GetName());
return SetError();
}
if (Matches.Num() > 1)
{
UWingServer::Printf(TEXT("ERROR: Ambiguous graph '%s' in %s — %d matches\n"), *Value, *BP->GetName(), Matches.Num());
return SetError();
}
UEdGraph* Graph = WingUtils::FindExactlyOneNamed(Value, WingUtils::AllGraphs(BP));
if (!Graph) return SetError();
SetObj(Matches[0]);
SetObj(Graph);
return *this;
}

63
Plugins/UEWingman/Source/UEWingman/Private/WingUtils.cpp
View File

@@ -193,25 +193,10 @@ FString WingUtils::FormatName(const FProperty *Prop)
return SanitizeName(Prop->GetName());
}
// ============================================================
// Identifies
// ============================================================
// Most types are handled by the template in WingUtils.h.
// UEdGraphNode also matches by GUID:
bool WingUtils::Identifies(const FString &Name, const UEdGraphNode* Node)
{
if (Node->NodeGuid.ToString().Equals(Name, ESearchCase::IgnoreCase))
return true;
return FormatName(Node).Equals(Name, ESearchCase::IgnoreCase);
}
// ============================================================
// Formatting other things
// ============================================================
FString WingUtils::FormatNodeTitle(const UEdGraphNode *Node)
{
FString Title = Node->GetNodeTitle(ENodeTitleType::FullTitle).ToString();
@@ -284,6 +269,46 @@ bool WingUtils::StringToEnum(UEnum* Enum, const FString& Str, int64& OutValue, c
return true;
}
// ============================================================
// Common Error Reporting
// ============================================================
bool WingUtils::CheckExactlyOneNamed(int Count, const FString &Kind, const FString &Name)
{
if (Count == 0)
{
UWingServer::Printf(TEXT("Could not find a %s named %s.\n"), *Kind, *Name);
return false;
}
if (Count > 1)
{
UWingServer::Printf(TEXT("More than one %s named %s\n"), *Kind, *Name);
return false;
}
return true;
}
bool WingUtils::CheckExactlyOneNamed(int Count, UClass *Class, const FString &Name)
{
return CheckExactlyOneNamed(Count, Class->GetName(), Name);
}
bool WingUtils::CheckExactlyNoneNamed(int Count, const FString &Kind, const FString &Name)
{
if (Count > 0)
{
UWingServer::Printf(TEXT("A %s named %s already exists."), *Kind, *Name);
return false;
}
return true;
}
bool WingUtils::CheckExactlyNoneNamed(int Count, UClass *Class, const FString &Name)
{
return CheckExactlyNoneNamed(Count, Class->GetName(), Name);
}
// ============================================================
// Blueprint helpers
// ============================================================
@@ -295,14 +320,6 @@ TArray<UEdGraph*> WingUtils::AllGraphs(UBlueprint* BP)
return Graphs;
}
TArray<UEdGraph*> WingUtils::AllGraphsNamed(UBlueprint* BP, const FString& Name)
{
TArray<UEdGraph*> Result;
for (UEdGraph* Graph : AllGraphs(BP))
if (Identifies(Name, Graph))
Result.Add(Graph);
return Result;
}
TArray<UEdGraphNode*> WingUtils::AllNodes(UBlueprint* BP)
{

37
Plugins/UEWingman/Source/UEWingman/Public/WingUtils.h
View File

@@ -89,8 +89,33 @@ public:
return FormatName(std::forward<T>(Obj)).Equals(Name, ESearchCase::IgnoreCase);
}
// UEdGraphNode also matches by GUID.
static bool Identifies(const FString &Name, const UEdGraphNode* Node);
template<typename T>
static TArray<T*> FindAllNamed(const FString &Name, const TArray<T*> &Array)
{
TArray<T*> Result;
for (T* Elt : Array) if (Identifies(Name, Elt)) Result.Add(Elt);
return Result;
}
template<typename T>
T* FindExactlyOneNamed(const FString &Name, const TArray<T*> &Array)
{
int Count = 0;
T* Result = nullptr;
for (T* Elt : Array) if (Identifies(Name, Elt)) { Count++; Result = Elt; }
if (!CheckExactlyOneNamed(Count, T::StaticClass(), Name)) return nullptr;
return Result;
}
template<typename T>
bool FindExactlyNoneNamed(const FString &Name, const TArray<T*> &Array)
{
for (T* Elt: Array) if (Identifies(Name, Elt))
{
return CheckExactlyNoneNamed(1, T::StaticClass(), Name);
}
return true;
}
////////////////////////////////////////////////////////
@@ -117,7 +142,6 @@ public:
// ----- Blueprint helpers -----
static TArray<UEdGraph*> AllGraphs(UBlueprint* BP);
static TArray<UEdGraph*> AllGraphsNamed(UBlueprint* BP, const FString& Name);
static TArray<UEdGraphNode*> AllNodes(UBlueprint* BP);
template<class T> static TArray<T*> AllNodes(UBlueprint* BP)
{
@@ -136,6 +160,7 @@ public:
Result.Add(Typed);
return Result;
}
static bool SaveBlueprintPackage(UBlueprint* BP);
static UClass* FindClassByName(const FString& ClassName);
@@ -173,6 +198,12 @@ public:
static FString GetHandlerGroup(UClass* HandlerClass);
static void FormatCommandHelp(UClass* HandlerClass);
// ----- Common Error Reporting -----
bool CheckExactlyOneNamed(int Count, const FString &Kind, const FString &Name);
bool CheckExactlyOneNamed(int Count, UClass *Class, const FString &Name);
bool CheckExactlyNoneNamed(int Count, const FString &Kind, const FString &Name);
bool CheckExactlyNoneNamed(int Count, UClass *Class, const FString &Name);
private:
static void AppendNumericSuffix(FString &Name, int32 N);
};