fix: #128 Parenthesis Name Only Error?

simulot · simulot · commit 4ec22913212d · 2024-01-14T15:54:31.000+01:00
diff --git a/cmdupload/e2e_upload_folder_test.go b/cmdupload/e2e_upload_folder_test.go
@@ -310,6 +310,21 @@ func Test_Issue_129(t *testing.T) {
 	runCase(t, tc)
 }
 
+func Test_Issue_128(t *testing.T) {
+
+	tc := testCase{
+		name: "Test_Issue_128",
+		args: []string{
+			"-google-photos",
+			"../../test-data/Issue 128",
+		},
+		resetImmich: true,
+		expectError: false,
+		APITrace:    false,
+	}
+	runCase(t, tc)
+}
+
 // ResetImmich
 // ⛔: will remove the content of the server.‼️
 // Give the user of the connection to confirm the server instance: debug@example.com
diff --git a/docs/releases.md b/docs/releases.md
@@ -2,6 +2,9 @@
 
 ## Release next
 
+### fix: #128 Parenthesis Name Only Error?
+Some google photos users have lot of files named .jpg, (1).jpg, (x).jpg. Those names aren't makes immich-server crashing or timeout.
+When such files are encountered, they are now uploaded with the name "No Name".
 
 ### fix: #125 XMP filenames don't always match what is expected 
 
diff --git a/immich/asset.go b/immich/asset.go
@@ -60,14 +60,18 @@ func (ic *ImmichClient) AssetUpload(ctx context.Context, la *browser.LocalAssetF
 			return
 		}
 		assetType := strings.ToUpper(strings.Split(mtype[0], "/")[0])
+		ext := path.Ext(la.Title)
+		if strings.TrimSuffix(la.Title, ext) == "" {
+			la.Title = "No Name" + ext // fix #88, #128
+		}
 
 		m.WriteField("deviceAssetId", fmt.Sprintf("%s-%d", path.Base(la.Title), s.Size()))
 		m.WriteField("deviceId", ic.DeviceUUID)
 		m.WriteField("assetType", assetType)
 		m.WriteField("fileCreatedAt", la.DateTaken.Format(time.RFC3339))
 		m.WriteField("fileModifiedAt", s.ModTime().Format(time.RFC3339))
 		m.WriteField("isFavorite", myBool(la.Favorite).String())
-		m.WriteField("fileExtension", path.Ext(la.FileName))
+		m.WriteField("fileExtension", ext)
 		m.WriteField("duration", formatDuration(0))
 		m.WriteField("isReadOnly", "false")
 		// m.WriteField("isArchived", myBool(la.Archived).String()) // Not supported by the api
