Fix for #35: weird name cases in google photos takeout: truncated nam…

…e or jp.json

assets/gp/googlephotos.go

@@ -178,8 +178,19 @@ func (to *Takeout) jsonMatchInDir(dir, base string) *googleMetaData {
 	}
 
 	// may be the file name has been shortened by 1 char
-	_, size := utf8.DecodeLastRuneInString(base)
-	jsonBase = jsonBase[:len(base)-size] + ".json"
+	// json named like  verylong.jp.json
+	jsonBase = base
+	_, size := utf8.DecodeLastRuneInString(jsonBase)
+	jsonBase = jsonBase[:len(jsonBase)-size] + ".json"
+	if md, ok := list[jsonBase]; ok {
+		return md
+	}
+
+	// may the base name without the extension is shorten by 1 char
+	ext := path.Ext(base)
+	jsonBase = strings.TrimSuffix(base, ext)
+	_, size = utf8.DecodeLastRuneInString(jsonBase)
+	jsonBase = jsonBase[:len(jsonBase)-size] + ".json"
 	if md, ok := list[jsonBase]; ok {
 		return md
 	}

assets/gp/testgp_samples_test.go

@@ -211,7 +211,9 @@ func namesTruncated() *inMemFS {
 		  }`)).
 		addImage("TakeoutGoogle Photos/Photos from 2023/😀😃😄😁😆😅😂🤣🥲☺️😊😇🙂🙃😉😌😍🥰😘😗😙😚😋😛.jpg", 10).
 		addJSONImage("TakeoutGoogle Photos/Photos from 2023/PXL_20230809_203449253.LONG_EXPOSURE-02.ORIGIN.json", generateJSONTitle("PXL_20230809_203449253.LONG_EXPOSURE-02.ORIGINAL.jpg")).
-		addImage("TakeoutGoogle Photos/Photos from 2023/PXL_20230809_203449253.LONG_EXPOSURE-02.ORIGINA.jpg", 40)
+		addImage("TakeoutGoogle Photos/Photos from 2023/PXL_20230809_203449253.LONG_EXPOSURE-02.ORIGINA.jpg", 40).
+		addJSONImage("TakeoutGoogle Photos/Photos from 2023/05yqt21kruxwwlhhgrwrdyb6chhwszi9bqmzu16w0 2.jp.json", generateJSONTitle("05yqt21kruxwwlhhgrwrdyb6chhwszi9bqmzu16w0 2.jpg")).
+		addImage("TakeoutGoogle Photos/Photos from 2023/05yqt21kruxwwlhhgrwrdyb6chhwszi9bqmzu16w0 2.jpg", 25)
 }
 
 func imagesWithoutJSON() *inMemFS {

assets/gp/testgp_test.go

@@ -45,8 +45,9 @@ func TestBrowse(t *testing.T) {
 		},
 		{"namesTruncated", namesTruncated,
 			map[string]string{
-				"TakeoutGoogle Photos/Photos from 2023/😀😃😄😁😆😅😂🤣🥲☺️😊😇🙂🙃😉😌😍🥰😘😗😙😚😋😛.jpg":                       "😀😃😄😁😆😅😂🤣🥲☺️😊😇🙂🙃😉😌😍🥰😘😗😙😚😋😛😝😜🤪🤨🧐🤓😎🥸🤩🥳😏😒😞😔😟😕🙁☹️😣😖😫😩🥺😢😭😤😠😡🤬🤯😳🥵🥶.jpg",
+				"TakeoutGoogle Photos/Photos from 2023/05yqt21kruxwwlhhgrwrdyb6chhwszi9bqmzu16w0 2.jpg":     "05yqt21kruxwwlhhgrwrdyb6chhwszi9bqmzu16w0 2.jpg",
 				"TakeoutGoogle Photos/Photos from 2023/PXL_20230809_203449253.LONG_EXPOSURE-02.ORIGINA.jpg": "PXL_20230809_203449253.LONG_EXPOSURE-02.ORIGINAL.jpg",
+				"TakeoutGoogle Photos/Photos from 2023/😀😃😄😁😆😅😂🤣🥲☺️😊😇🙂🙃😉😌😍🥰😘😗😙😚😋😛.jpg":                       "😀😃😄😁😆😅😂🤣🥲☺️😊😇🙂🙃😉😌😍🥰😘😗😙😚😋😛😝😜🤪🤨🧐🤓😎🥸🤩🥳😏😒😞😔😟😕🙁☹️😣😖😫😩🥺😢😭😤😠😡🤬🤯😳🥵🥶.jpg",
 			},
 		},
 		{"imagesWithoutJSON", imagesWithoutJSON,
@@ -170,48 +171,3 @@ func TestAlbums(t *testing.T) {
 	}
 
 }
-
-// func TestTruncatedNames(t *testing.T) {
-// 	type result struct {
-// 		filename string
-// 		title    string
-// 	}
-// 	tc := []struct {
-// 		name    string
-// 		gen     func() *inMemFS
-// 		results []result
-// 	}{
-// 		{"namesTruncated", namesTruncated, []result{
-// 			{filename: "TakeoutGoogle Photos/Photos from 2023/😀😃😄😁😆😅😂🤣🥲☺️😊😇🙂🙃😉😌😍🥰😘😗😙😚😋😛.jpg",
-// 				title: "😀😃😄😁😆😅😂🤣🥲☺️😊😇🙂🙃😉😌😍🥰😘😗😙😚😋😛😝😜🤪🤨🧐🤓😎🥸🤩🥳😏😒😞😔😟😕🙁☹️😣😖😫😩🥺😢😭😤😠😡🤬🤯😳🥵🥶.jpg",
-// 			},
-// 		}},
-// 	}
-
-// 	for _, c := range tc {
-// 		t.Run(c.name, func(t *testing.T) {
-
-// 			fsys := c.gen()
-// 			if fsys.err != nil {
-// 				t.Error(fsys.err)
-// 				return
-// 			}
-// 			ctx := context.Background()
-
-// 			b, err := gp.NewTakeout(ctx, fsys)
-// 			if err != nil {
-// 				t.Error(err)
-// 			}
-
-// 			results := []result{}
-// 			for a := range b.Browse(ctx) {
-// 				results = append(results, result{a.FileName, a.Title})
-// 			}
-
-// 			if !reflect.DeepEqual(results, c.results) {
-// 				t.Errorf("expecting %v, got %v", c.results, results)
-// 			}
-// 		})
-// 	}
-
-// }

go.mod

@@ -11,7 +11,6 @@ require (
 	github.com/thlib/go-timezone-local v0.0.0-20210907160436-ef149e42d28e
 	github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31
 	github.com/yalue/merged_fs v1.2.3
-	golang.org/x/sys v0.12.0
 )
 
 require (
@@ -21,4 +20,5 @@ require (
 	github.com/pkg/sftp v1.13.6 // indirect
 	github.com/rogpeppe/go-internal v1.9.0 // indirect
 	golang.org/x/crypto v0.13.0 // indirect
+	golang.org/x/sys v0.12.0 // indirect
 )

readme.md

@@ -73,7 +73,7 @@ Use this command for uploading photos and videos from a local directory, a zippe
 `-dry-run` Preview all actions as they would be done.<br> 
 `-delete` Delete local assets after successful upload. <br>
 `-create-album-folder <bool>` Generate immich albums after folder names.<br>
-`-force-sidecar <bool>` Force sending a .xmp sidecar file beside images. With Google photos date and GPS coordinates are taken from metadata.json files. (default: FALSE).<br>
+`    <bool>` Force sending a .xmp sidecar file beside images. With Google photos date and GPS coordinates are taken from metadata.json files. (default: FALSE).<br>
 
 
 ### Date selection:
@@ -250,13 +250,13 @@ Additionally, deploying a Node.js program on user machines presents challenges.
 
 ## Release 0.3.5
 
+### Fix for #35 weird name cases in google photos takeout: truncated name or jp.json
 Once, I have a folder full of JSON files for an album, but it doesn't have any pictures. Instead, the pictures are in a folder organized by years. To fix this, I tried to match the JSON files with the pictures by their names.
 
 The problem is that sometimes pictures have the same name in different years, so it's hard to be sure which picture goes with which JSON file. Because of this, created album contains image found in its folder, but also images having same name, taken in different years.
 
 I decided to remove this feature. Now, if the image isn't found beside the JSON file, the JSON is ignored.
 
-### Fix for #32
 
 ## Release 0.3.2, 0.3.3, 0.3.4
 ### Fix for #30 panic: time: missing Location in call to Time.In with release Windows_x86_64_0.3.1