From ec2bcc7a745bb7fb1e2c2d5eef9667d5ad7b1502 Mon Sep 17 00:00:00 2001 From: bnkai <48220860+bnkai@users.noreply.github.com> Date: Sat, 11 Jul 2020 10:22:36 +0300 Subject: [PATCH] Scan for files with ALLCAPS extensions (#650) --- pkg/manager/manager_tasks.go | 18 +++++++----------- .../src/components/Changelog/versions/v030.tsx | 1 + 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/pkg/manager/manager_tasks.go b/pkg/manager/manager_tasks.go index 70d83c09a..25713d7c9 100644 --- a/pkg/manager/manager_tasks.go +++ b/pkg/manager/manager_tasks.go @@ -3,6 +3,7 @@ package manager import ( "path/filepath" "strconv" + "strings" "sync" "time" @@ -17,22 +18,17 @@ var extensionsToScan = []string{"zip", "m4v", "mp4", "mov", "wmv", "avi", "mpg", var extensionsGallery = []string{"zip"} func constructGlob() string { // create a sequence for glob doublestar from our extensions - extLen := len(extensionsToScan) - glb := "{" - for i := 0; i < extLen-1; i++ { // append extensions and commas - glb += extensionsToScan[i] + "," + var extList []string + for _, ext := range extensionsToScan { + extList = append(extList, strings.ToLower(ext)) + extList = append(extList, strings.ToUpper(ext)) } - if extLen >= 1 { // append last extension without comma - glb += extensionsToScan[extLen-1] - } - glb += "}" - return glb - + return "{" + strings.Join(extList, ",") + "}" } func isGallery(pathname string) bool { for _, ext := range extensionsGallery { - if filepath.Ext(pathname) == "."+ext { + if strings.ToLower(filepath.Ext(pathname)) == "."+strings.ToLower(ext) { return true } } diff --git a/ui/v2.5/src/components/Changelog/versions/v030.tsx b/ui/v2.5/src/components/Changelog/versions/v030.tsx index 41ae84f35..929e4081d 100644 --- a/ui/v2.5/src/components/Changelog/versions/v030.tsx +++ b/ui/v2.5/src/components/Changelog/versions/v030.tsx @@ -12,6 +12,7 @@ const markup = ` * Add support for parent/child studios. ### 🎨 Improvements +* Search for files which have low or upper case supported filename extensions. * Add dialog when pasting movie images. * Allow click and click-drag selection after selecting scene. * Added multi-scene edit dialog.