Merge branch 'next' of github.com:simulot/immich-go into next

simulot · Dec 24, 2024 · f447792 · f447792
2 parents d3999e9 + daae2cb
commit f447792
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/adapters/folder/readFolder.go b/adapters/folder/readFolder.go
@@ -151,6 +151,9 @@ func (la *LocalAssetBrowser) parseDir(ctx context.Context, fsys fs.FS, dir strin
 		}
 
 		switch mediaType {
+		case filetypes.TypeUseless:
+			la.log.Record(ctx, fileevent.DiscoveredUseless, fshelper.FSName(fsys, name))
+			continue
 		case filetypes.TypeImage:
 			la.log.Record(ctx, fileevent.DiscoveredImage, fshelper.FSName(fsys, name))
 		case filetypes.TypeVideo:

diff --git a/adapters/folder/readFolder_test.go b/adapters/folder/readFolder_test.go
@@ -218,7 +218,6 @@ func TestInMemLocalAssets(t *testing.T) {
 			expectedCounts: fileevent.NewCounts().Set(fileevent.DiscoveredImage, 7).
 				Set(fileevent.DiscoveredDiscarded, 8).Value(),
 		},
-
 		{
 			name: "motion picture",
 			flags: ImportFolderOptions{
@@ -239,13 +238,14 @@ func TestInMemLocalAssets(t *testing.T) {
 					addFile("motion/20231227_152817.MP4", t0),
 			},
 			expectedFiles: []string{
-				"motion/PXL_20210102_221126856.MP.jpg", "motion/PXL_20210102_221126856.MP",
-				"motion/PXL_20210102_221126856.MP~2.jpg", "motion/PXL_20210102_221126856.MP~2",
+				"motion/PXL_20210102_221126856.MP.jpg",
+				"motion/PXL_20210102_221126856.MP~2.jpg",
 				"motion/20231227_152817.jpg", "motion/20231227_152817.MP4",
 				"motion/nomotion.MP4",
 			},
 			expectedCounts: fileevent.NewCounts().Set(fileevent.DiscoveredImage, 3).
-				Set(fileevent.DiscoveredVideo, 4).Value(),
+				Set(fileevent.DiscoveredVideo, 2).
+				Set(fileevent.DiscoveredUseless, 2).Value(),
 		},
 
 		{

diff --git a/adapters/googlePhotos/testgp_test.go b/adapters/googlePhotos/testgp_test.go
@@ -90,7 +90,6 @@ func TestBrowse(t *testing.T) {
 		{
 			"issue68MPFiles", issue68MPFiles,
 			sortFileResult([]fileResult{
-				{name: "PXL_20221228_185930354.MP", size: 1, title: "PXL_20221228_185930354.MP"},
 				{name: "PXL_20221228_185930354.MP.jpg", size: 2, title: "PXL_20221228_185930354.MP.jpg"},
 			}),
 		},

diff --git a/internal/exif/direct_test.go b/internal/exif/direct_test.go
@@ -19,7 +19,7 @@ func Test_MetadataFromDirectRead(t *testing.T) {
 			name:     "read JPG",
 			fileName: "DATA/PXL_20231006_063000139.jpg",
 			want: &assets.Metadata{
-				DateTaken: time.Date(2023, 10, 6, 8, 30, 0, 0, time.Local), // 2023:10:06 06:29:56Z
+				DateTaken: time.Date(2023, 10, 6, 8, 30, 0, int(139*time.Millisecond), time.Local), // 2023:10:06 06:29:56Z
 				Latitude:  +48.8583736,
 				Longitude: +2.2919010,
 			},