From 5a3fd3b21c755f3705320774a6b0fdcdc79af8e5 Mon Sep 17 00:00:00 2001 From: Toni Melisma Date: Thu, 25 Feb 2021 00:02:25 +0200 Subject: [PATCH] Fix destination file extensions --- cmd/fastgallery/main.go | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/cmd/fastgallery/main.go b/cmd/fastgallery/main.go index 086fa49..7f90543 100644 --- a/cmd/fastgallery/main.go +++ b/cmd/fastgallery/main.go @@ -608,16 +608,24 @@ func createMedia(source directory, gallerySubdirectory string, dryRun bool, conf for _, file := range source.files { if !file.exists { - sourceFilename := filepath.Join(source.absPath, file.name) - thumbnailFilename := filepath.Join(thumbnailGalleryDirectory, file.name) - fullsizeFilename := filepath.Join(fullsizeGalleryDirectory, file.name) - originalFilename := filepath.Join(originalGalleryDirectory, file.name) + sourceFilepath := filepath.Join(source.absPath, file.name) + var destinationFilename string + if isImageFile(file.name) { + destinationFilename = stripExtension(file.name) + config.files.imageExtension + } else if isVideoFile(file.name) { + destinationFilename = stripExtension(file.name) + config.files.videoExtension + } else { + log.Fatal("could not infer whether file is image or video:", sourceFilepath) + } + thumbnailFilename := filepath.Join(thumbnailGalleryDirectory, destinationFilename) + fullsizeFilename := filepath.Join(fullsizeGalleryDirectory, destinationFilename) + originalFilename := filepath.Join(originalGalleryDirectory, destinationFilename) if dryRun { - log.Println("converting:", sourceFilename, thumbnailFilename, fullsizeFilename, originalFilename) + log.Println("converting:", sourceFilepath, thumbnailFilename, fullsizeFilename, originalFilename) } else { - createThumbnail(sourceFilename, thumbnailFilename, config) - createFullsize(sourceFilename, fullsizeFilename, config) - createOriginal(sourceFilename, originalFilename, config) + createThumbnail(sourceFilepath, thumbnailFilename, config) + createFullsize(sourceFilepath, fullsizeFilename, config) + createOriginal(sourceFilepath, originalFilename, config) progressBar.Increment() } }