From 082991b15da0ec377c510c0931722223e4f0ec4a Mon Sep 17 00:00:00 2001 From: Linghua Zhang Date: Fri, 5 Jan 2024 20:09:12 +0900 Subject: [PATCH] tmp --- internal/export/default_context.go | 2 +- internal/export/export_test.go | 32 ++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/internal/export/default_context.go b/internal/export/default_context.go index 7eeeb60..66dc440 100644 --- a/internal/export/default_context.go +++ b/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) { diff --git a/internal/export/export_test.go b/internal/export/export_test.go index 2c2f560..bda280d 100644 --- a/internal/export/export_test.go +++ b/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)