read and verify the version

1 files changed, 49 insertions, 16 deletions

diff --git a/findFilename.go b/findFilename.go
index 85ccbf4..5e81974 100644
--- a/findFilename.go
+++ b/findFilename.go
@@ -14,6 +14,39 @@ var ErrProtoVarNotString error = errors.New("name exists but is not a string")
 // Gemini AI can help author some pretty good protobuf code.
 // I never remember the syntax for 'reflect' on these things.
 
+// sets "Filename" if it exists in the protobuf
+func SetFilename(pb proto.Message, filename string) (bool, error) {
+	msg := pb.ProtoReflect() // This is the entry point to the reflection API.
+
+	descriptor := msg.Descriptor() // Get the message's descriptor, which contains metadata about its fields.
+
+	fieldName := protoreflect.Name("Filename")
+	fieldDescriptor := descriptor.Fields().ByName(fieldName)
+
+	if fieldDescriptor == nil {
+		fieldName = protoreflect.Name("filename")
+		fieldDescriptor = descriptor.Fields().ByName(fieldName)
+	}
+
+	if fieldDescriptor == nil {
+		return false, fmt.Errorf("fieldDescriptor == nil")
+	}
+
+	if fieldDescriptor.Kind() != protoreflect.StringKind {
+		// The field exists but is not a string, so we can't return it as one.
+		return false, fmt.Errorf("The field exists but is not a string")
+	}
+
+	valueToSet := protoreflect.ValueOfString(filename)
+
+	// 6. If the field exists and is a string, get its value.
+	// The value is returned as a protoreflect.Value.
+	msg.Set(fieldDescriptor, valueToSet)
+
+	// 7. Convert the protoreflect.Value to a native Go string.
+	return true, nil
+}
+
 // this will try both "filename" and "Filename"
 func GetFilename(pb proto.Message) (string, error) {
 	// 1. Get the protoreflect.Message interface from the message.
@@ -56,35 +89,35 @@ func GetFilename(pb proto.Message) (string, error) {
 	return value.String(), nil
 }
 
-// sets "Filename" if it exists in the protobuf
-func SetFilename(pb proto.Message, filename string) (bool, error) {
-	msg := pb.ProtoReflect() // This is the entry point to the reflection API.
+// this will try both "filename" and "Filename"
+func GetString(pb proto.Message, varname string) (string, error) {
+	// 1. Get the protoreflect.Message interface from the message.
+	// This is the entry point to the reflection API.
+	msg := pb.ProtoReflect()
 
-	descriptor := msg.Descriptor() // Get the message's descriptor, which contains metadata about its fields.
+	// 2. Get the message's descriptor, which contains metadata about its fields.
+	descriptor := msg.Descriptor()
 
-	fieldName := protoreflect.Name("Filename")
+	// 3. Find the specific field descriptor by its protobuf name ("Filename").
+	// Note: The field name must match the name in the .proto file.
+	fieldName := protoreflect.Name(varname)
 	fieldDescriptor := descriptor.Fields().ByName(fieldName)
 
+	// 4. Check if the field was found. If not, return false.
 	if fieldDescriptor == nil {
-		fieldName = protoreflect.Name("filename")
-		fieldDescriptor = descriptor.Fields().ByName(fieldName)
-	}
-
-	if fieldDescriptor == nil {
-		return false, fmt.Errorf("fieldDescriptor == nil")
+		return "", ErrProtoNoVarName
 	}
 
+	// 5. (Optional but recommended) Verify the field is a string type.
 	if fieldDescriptor.Kind() != protoreflect.StringKind {
 		// The field exists but is not a string, so we can't return it as one.
-		return false, fmt.Errorf("The field exists but is not a string")
+		return "", ErrProtoVarNotString
 	}
 
-	valueToSet := protoreflect.ValueOfString(filename)
-
 	// 6. If the field exists and is a string, get its value.
 	// The value is returned as a protoreflect.Value.
-	msg.Set(fieldDescriptor, valueToSet)
+	value := msg.Get(fieldDescriptor)
 
 	// 7. Convert the protoreflect.Value to a native Go string.
-	return true, nil
+	return value.String(), nil
 }