tmp

internal/export/default_context.go

@@ -98,7 +98,7 @@ func (ctx defaultExportContext) processOtherFolders(folders []string, outputPath
 		}
 
 		if err := cp.Copy(folder, targetFolder); err != nil {
-			log.Fatal().Msgf("Failed to copy folder %s to %s (%s).", folder, targetFolder, err)
+			log.Error().Msgf("Failed to copy folder %s to %s (%s).", folder, targetFolder, err)
 		}
 		_ = filepath.WalkDir(targetFolder, func(path string, d fs.DirEntry, err error) error {
 			if minimizer.Minimizable(path) {

internal/export/export_test.go

@@ -221,6 +221,38 @@ func TestGenerateIndexHTML(t *testing.T) {
 	mockMinimizer.AssertCalled(t, "MinimizeFile", mock.Anything, mock.Anything)
 }
 
+func TestProcessOtherFolders(t *testing.T) {
+	tmp, _ := prepareTempDirAndCache(t)
+	defer os.RemoveAll(tmp)
+
+	mockMinimizer := new(MockMinimizer)
+	mockMinimizer.On("Minimizable", mock.Anything).Return(true)
+	mockMinimizer.On("MinimizeFile", mock.Anything, mock.Anything).Return(nil)
+
+	mockFunc := new(MockFunc)
+	mockFunc.On("messageFunc", mock.Anything, mock.Anything).Return(nil)
+	messageFunc := func(src string, dst string) {
+		mockFunc.messageFunc(src, dst)
+	}
+
+	collection1Folder := testdata.Collection1["folder"].(string)
+	collection2Folder := testdata.Collection2["folder"].(string)
+	new(defaultExportContext).processOtherFolders([]string{
+		collection1Folder,
+		collection2Folder,
+	}, tmp, mockMinimizer, messageFunc)
+
+	file1 := filepath.Join(tmp, collection1Folder, testdata.Collection1FileName1)
+	file2 := filepath.Join(tmp, collection2Folder, testdata.Collection2FileName1)
+	assert.True(t, true, files.IsExisting(file1))
+	assert.True(t, true, files.IsExisting(file2))
+
+	mockFunc.AssertNumberOfCalls(t, "messageFunc", 2) // 2 folders
+
+	mockMinimizer.AssertCalled(t, "Minimizable", mock.Anything)
+	mockMinimizer.AssertCalled(t, "MinimizeFile", mock.Anything, mock.Anything)
+}
+
 func TestResizeImageCache(t *testing.T) {
 	tmp, _ := os.MkdirTemp("", "foto-test")
 	defer os.RemoveAll(tmp)