Support v4 profiles.

Author: ncruces

assets/raw-editor.js

@@ -38,7 +38,7 @@ async function loadSettings() {
     if (settings.process) form.process.value = settings.process.toFixed(1);
     if (settings.profiles) {
         let group = form.profile.lastElementChild;
-        group.prepend(...settings.profiles.map(p => new Option(p.replace(/ v2$/, ''), p)));
+        group.prepend(...settings.profiles.map(p => new Option(p.replace(/ v\d$/, ''), p)));
     }
     form.toneCurve.value = settings.toneCurve;
     form.lensProfile.checked = settings.lensProfile;

pkg/craw/profiles.go

@@ -34,8 +34,7 @@ func GetCameraProfiles(make, model string) ([]string, error) {
 		var matches bool
 		if test == "" || test == model || test == makeModel {
 			matches = true
-		} else if n := strings.IndexByte(test, ' '); n > 0 {
-			testMake, testModel := test[:n], test[n+1:]
+		} else if testMake, testModel, ok := strings.Cut(test, " "); ok {
 			matches = testModel == model && strings.Contains(make, testMake)
 		}
 		if matches {

profiles.go

@@ -109,16 +109,26 @@ func loadProfiles(make, model string, process float32, grayscale bool, profile,
 		craw.EmbedProfiles = dngconv.Path
 		profiles, _ := craw.GetCameraProfileNames(make, model)
 
-		res.adobe = "Adobe Standard"
+		upgraded := map[string]string{}
 		for _, name := range profiles {
-			if slices.Contains(profiles, name+" v2") {
-				// skip legacy
-				continue
+			key := name
+			switch {
+			case strings.HasSuffix(key, " v2"):
+				key = name[:len(key)-len(" v2")]
+			case strings.HasSuffix(key, " v4"):
+				key = name[:len(key)-len(" v4")]
+			}
+			if upgraded[key] < name {
+				upgraded[key] = name
 			}
-			if strings.HasPrefix(name, "Adobe Standard") {
+		}
+
+		res.adobe = "Adobe Standard"
+		for key, name := range upgraded {
+			if key == "Adobe Standard" {
 				res.adobe = name
 			} else {
-				res.other = append(res.other, string(name))
+				res.other = append(res.other, name)
 			}
 		}