Merge pull request #610 from Jougan-0/removeDedupliaction

remove deduplication for models w/signoff
meshery · Oct 15, 2024 · 140d9a5 · 140d9a5
2 parents 05d562e + 7b3c050
commit 140d9a5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/models/registration/register.go b/models/registration/register.go
@@ -81,6 +81,7 @@ func (rh *RegistrationHelper) register(pkg PackagingUnit) {
 			rh.svgBaseDir,
 			model.Name,
 			model.Name,
+			true,
 		)
 		if svgCompletePath != "" {
 			model.Metadata.SvgComplete = &svgCompletePath
@@ -120,6 +121,7 @@ func (rh *RegistrationHelper) register(pkg PackagingUnit) {
 				rh.svgBaseDir,
 				comp.Model.Name,
 				comp.Component.Kind,
+				false,
 			)
 		}
 

diff --git a/models/registration/svg_helper.go b/models/registration/svg_helper.go
@@ -20,7 +20,7 @@ func writeHashCheckSVG(key string, val string) {
 	mx.Unlock()
 }
 
-func WriteAndReplaceSVGWithFileSystemPath(svgColor, svgWhite, svgComplete string, baseDir, dirname, filename string) (svgColorPath, svgWhitePath, svgCompletePath string) {
+func WriteAndReplaceSVGWithFileSystemPath(svgColor, svgWhite, svgComplete string, baseDir, dirname, filename string, isModel bool) (svgColorPath, svgWhitePath, svgCompletePath string) {
 	filename = strings.ToLower(filename)
 	successCreatingDirectory := false
 	defer func() {
@@ -40,7 +40,7 @@ func WriteAndReplaceSVGWithFileSystemPath(svgColor, svgWhite, svgComplete string
 		hash := md5.Sum([]byte(svgColor))
 		hashString := hex.EncodeToString(hash[:])
 		pathsvg := hashCheckSVG[hashString]
-		if pathsvg != "" { // the image has already been loaded, point the component to that path
+		if pathsvg != "" && !isModel { // the image has already been loaded, point the component to that path
 			svgColorPath = pathsvg
 			goto White
 		}
@@ -59,7 +59,7 @@ func WriteAndReplaceSVGWithFileSystemPath(svgColor, svgWhite, svgComplete string
 
 	}
 White:
-	if svgWhite != "" {
+	if svgWhite != "" && !isModel {
 		path := filepath.Join(baseDir, dirname, "white")
 		err := os.MkdirAll(path, 0777)
 		if err != nil {
@@ -90,7 +90,7 @@ White:
 
 	}
 Complete:
-	if svgComplete != "" {
+	if svgComplete != "" && !isModel {
 		path := filepath.Join(baseDir, dirname, "complete")
 		err := os.MkdirAll(path, 0777)
 		if err != nil {
@@ -123,8 +123,6 @@ Complete:
 	return
 }
 
-// func WriteAndReplaceSVGWithFileSystemPath(metadata map[string]interface{}, baseDir, dirname, filename string) {
-
 func getRelativePathForAPI(baseDir, path string) string {
 	ui := strings.TrimPrefix(baseDir, "../../")
 	return filepath.Join(ui, path)