fixup mapper

Author: alessio-perugini

internal/cli/feedback/result/rpc.go

@@ -160,6 +160,52 @@ type Library struct {
 	InDevelopment     bool                           `json:"in_development,omitempty"`
 }
 
+func NewLibrary(l *rpc.Library) *Library {
+	if l == nil {
+		return nil
+	}
+	libraryPropsMap := orderedmap.New[string, string]()
+	for k, v := range l.GetProperties() {
+		libraryPropsMap.Set(k, v)
+	}
+	libraryPropsMap.SortStableKeys(cmp.Compare)
+
+	libraryCompatibleWithMap := orderedmap.New[string, bool]()
+	for k, v := range l.GetCompatibleWith() {
+		libraryCompatibleWithMap.Set(k, v)
+	}
+	libraryCompatibleWithMap.SortStableKeys(cmp.Compare)
+
+	return &Library{
+		Name:              l.GetName(),
+		Author:            l.GetAuthor(),
+		Maintainer:        l.GetMaintainer(),
+		Sentence:          l.GetSentence(),
+		Paragraph:         l.GetParagraph(),
+		Website:           l.GetWebsite(),
+		Category:          l.GetCategory(),
+		Architectures:     l.GetArchitectures(),
+		Types:             l.GetTypes(),
+		InstallDir:        l.GetInstallDir(),
+		SourceDir:         l.GetSourceDir(),
+		UtilityDir:        l.GetUtilityDir(),
+		ContainerPlatform: l.GetContainerPlatform(),
+		DotALinkage:       l.GetDotALinkage(),
+		Precompiled:       l.GetPrecompiled(),
+		LdFlags:           l.GetLdFlags(),
+		IsLegacy:          l.GetIsLegacy(),
+		Version:           l.GetVersion(),
+		License:           l.GetLicense(),
+		Properties:        libraryPropsMap,
+		Location:          LibraryLocation(l.GetLocation().String()),
+		Layout:            LibraryLayout(l.GetLayout().String()),
+		Examples:          l.GetExamples(),
+		ProvidesIncludes:  l.GetProvidesIncludes(),
+		CompatibleWith:    libraryCompatibleWithMap,
+		InDevelopment:     l.GetInDevelopment(),
+	}
+}
+
 type LibraryRelease struct {
 	Author           string               `json:"author,omitempty"`
 	Version          string               `json:"version,omitempty"`
@@ -211,47 +257,8 @@ type LibraryDependency struct {
 }
 
 func NewInstalledLibraryResult(l *rpc.InstalledLibrary) *InstalledLibrary {
-	libraryPropsMap := orderedmap.New[string, string]()
-	for k, v := range l.GetLibrary().GetProperties() {
-		libraryPropsMap.Set(k, v)
-	}
-	libraryPropsMap.SortStableKeys(cmp.Compare)
-
-	libraryCompatibleWithMap := orderedmap.New[string, bool]()
-	for k, v := range l.GetLibrary().GetCompatibleWith() {
-		libraryCompatibleWithMap.Set(k, v)
-	}
-	libraryCompatibleWithMap.SortStableKeys(cmp.Compare)
-
 	return &InstalledLibrary{
-		Library: &Library{
-			Name:              l.GetLibrary().GetName(),
-			Author:            l.GetLibrary().GetAuthor(),
-			Maintainer:        l.GetLibrary().GetMaintainer(),
-			Sentence:          l.GetLibrary().GetSentence(),
-			Paragraph:         l.GetLibrary().GetParagraph(),
-			Website:           l.GetLibrary().GetWebsite(),
-			Category:          l.GetLibrary().GetCategory(),
-			Architectures:     l.GetLibrary().GetArchitectures(),
-			Types:             l.GetLibrary().GetTypes(),
-			InstallDir:        l.GetLibrary().GetInstallDir(),
-			SourceDir:         l.GetLibrary().GetSourceDir(),
-			UtilityDir:        l.GetLibrary().GetUtilityDir(),
-			ContainerPlatform: l.GetLibrary().GetContainerPlatform(),
-			DotALinkage:       l.GetLibrary().GetDotALinkage(),
-			Precompiled:       l.GetLibrary().GetPrecompiled(),
-			LdFlags:           l.GetLibrary().GetLdFlags(),
-			IsLegacy:          l.GetLibrary().GetIsLegacy(),
-			Version:           l.GetLibrary().GetVersion(),
-			License:           l.GetLibrary().GetLicense(),
-			Properties:        libraryPropsMap,
-			Location:          LibraryLocation(l.GetLibrary().GetLocation().String()),
-			Layout:            LibraryLayout(l.GetLibrary().GetLayout().String()),
-			Examples:          l.GetLibrary().GetExamples(),
-			ProvidesIncludes:  l.GetLibrary().GetProvidesIncludes(),
-			CompatibleWith:    libraryCompatibleWithMap,
-			InDevelopment:     l.GetLibrary().GetInDevelopment(),
-		},
+		Library: NewLibrary(l.GetLibrary()),
 		Release: NewLibraryRelease(l.GetRelease()),
 	}
 }