Fix regex expression (#106)

inode64 · web-flow · commit d9af87028e83 · 2023-04-27T20:04:35.000+02:00
diff --git a/pkg/dji/filetypes.go b/pkg/dji/filetypes.go
@@ -4,23 +4,23 @@ import "regexp"
 
 var fileTypes = []FileTypeMatch{
 	{
-		Regex: regexp.MustCompile(`.JPG`),
+		Regex: regexp.MustCompile(`\.JPG$`),
 		Type:  Photo,
 	},
 	{
-		Regex: regexp.MustCompile(`.MP4`),
+		Regex: regexp.MustCompile(`\.MP4$`),
 		Type:  Video,
 	},
 	{
-		Regex: regexp.MustCompile(`.SRT`),
+		Regex: regexp.MustCompile(`\.SRT$`),
 		Type:  Subtitle,
 	},
 	{
-		Regex: regexp.MustCompile(`.DNG`),
+		Regex: regexp.MustCompile(`\.DNG$`),
 		Type:  RawPhoto,
 	},
 	{
-		Regex: regexp.MustCompile(`.html`),
+		Regex: regexp.MustCompile(`\.html$`),
 		Type:  PanoramaIndex,
 	},
 }
diff --git a/pkg/gopro/filetypes.go b/pkg/gopro/filetypes.go
@@ -5,95 +5,95 @@ import "regexp"
 var FileTypeMatches = map[Type][]FileTypeMatch{
 	V2: {
 		{
-			Regex:    regexp.MustCompile(`GOPR\d+.JPG`),
+			Regex:    regexp.MustCompile(`^GOPR\d+\.JPG$`),
 			Type:     Photo,
 			HeroMode: true,
 		},
 		{
-			Regex:    regexp.MustCompile(`GP\d+.JPG`),
+			Regex:    regexp.MustCompile(`^GP\d+\.JPG$`),
 			Type:     Photo,
 			HeroMode: true,
 		},
 		{
-			Regex:    regexp.MustCompile(`GX\d+.MP4`),
+			Regex:    regexp.MustCompile(`^GX\d+\.MP4$`),
 			Type:     Video,
 			HeroMode: true,
 		},
 		{
-			Regex:    regexp.MustCompile(`GX\d+.WAV`),
+			Regex:    regexp.MustCompile(`^GX\d+\.WAV$`),
 			Type:     Audio,
 			HeroMode: true,
 		},
 		{
-			Regex:    regexp.MustCompile(`GH\d+.MP4`),
+			Regex:    regexp.MustCompile(`^GH\d+\.MP4$`),
 			Type:     Video,
 			HeroMode: true,
 		},
 		{
-			Regex:    regexp.MustCompile(`GG\d+.MP4`), // Live Bursts...
+			Regex:    regexp.MustCompile(`^GG\d+\.MP4$`), // Live Bursts...
 			Type:     Video,
 			HeroMode: true,
 		},
 		{
-			Regex:    regexp.MustCompile(`G\d+.JPG`),
+			Regex:    regexp.MustCompile(`^G\d+\.JPG$`),
 			Type:     Multishot,
 			HeroMode: true,
 		},
 		{
-			Regex:    regexp.MustCompile(`.GPR`),
+			Regex:    regexp.MustCompile(`\.GPR$`),
 			Type:     RawPhoto,
 			HeroMode: true,
 		},
 		// 360 formats, just MAX for now
 		{
-			Regex:    regexp.MustCompile(`GS\d+.360`),
+			Regex:    regexp.MustCompile(`^GS\d+\.360$`),
 			Type:     Video,
 			HeroMode: false,
 		},
 		{
-			Regex:    regexp.MustCompile(`GS_+\d+.JPG`),
+			Regex:    regexp.MustCompile(`^GS_+\d+\.JPG$`),
 			Type:     Photo,
 			HeroMode: false,
 		},
 		{
-			Regex:    regexp.MustCompile(`GP_+\d+.JPG`),
+			Regex:    regexp.MustCompile(`^GP_+\d+\.JPG$`),
 			Type:     Photo,
 			HeroMode: true,
 		},
 		{
-			Regex:    regexp.MustCompile(`GPA[A-Z]\d+.JPG`),
+			Regex:    regexp.MustCompile(`^GPA[A-Z]\d+\.JPG$`),
 			Type:     Multishot,
 			HeroMode: true,
 		},
 		{
-			Regex:    regexp.MustCompile(`GSA[A-Z]\d+.JPG`),
+			Regex:    regexp.MustCompile(`^GSA[A-Z]\d+\.JPG$`),
 			Type:     Multishot,
 			HeroMode: false,
 		},
 	},
 	V1: {
 		{
-			Regex:    regexp.MustCompile(`GOPR\d+.JPG`),
+			Regex:    regexp.MustCompile(`^GOPR\d+\.JPG$`),
 			Type:     Photo,
 			HeroMode: true,
 		},
 		{
-			Regex:    regexp.MustCompile(`G\d+.JPG`),
+			Regex:    regexp.MustCompile(`^G\d+\.JPG$`),
 			Type:     Multishot,
 			HeroMode: true,
 		},
 		{
-			Regex:    regexp.MustCompile(`GOPR\d+.MP4`),
+			Regex:    regexp.MustCompile(`^GOPR\d+\.MP4$`),
 			Type:     Video,
 			HeroMode: true,
 		},
 		{
-			Regex:    regexp.MustCompile(`GP\d+.MP4`),
+			Regex:    regexp.MustCompile(`^GP\d+\.MP4$`),
 			Type:     ChapteredVideo,
 			HeroMode: true,
 		},
 		{
-			Regex:    regexp.MustCompile(`.GPR`),
+			Regex:    regexp.MustCompile(`\.GPR$`),
 			Type:     RawPhoto,
 			HeroMode: true,
 		},
diff --git a/pkg/insta360/filetypes.go b/pkg/insta360/filetypes.go
@@ -4,70 +4,70 @@ import "regexp"
 
 var fileTypes = []FileTypeMatch{
 	{
-		Regex:         regexp.MustCompile(`IMG_\d+_\d+_\d\d_\d+.jpg`),
+		Regex:         regexp.MustCompile(`^IMG_\d+_\d+_\d\d_\d+\.jpg$`),
 		Type:          Photo,
 		SteadyCamMode: false,
 		OSCMode:       true,
 		ProMode:       false,
 	},
 	{
-		Regex:         regexp.MustCompile(`IMG_\d+_\d+_\d\d_\d+.insp`),
+		Regex:         regexp.MustCompile(`^IMG_\d+_\d+_\d\d_\d+\.insp$`),
 		Type:          Photo,
 		SteadyCamMode: false,
 		OSCMode:       false,
 		ProMode:       false,
 	},
 	{
-		Regex:         regexp.MustCompile(`IMG_\d+_\d+_\d\d_\d+.dng`),
+		Regex:         regexp.MustCompile(`^IMG_\d+_\d+_\d\d_\d+\.dng$`),
 		Type:          RawPhoto,
 		SteadyCamMode: false,
 		OSCMode:       false,
 		ProMode:       false,
 	},
 	{
-		Regex:         regexp.MustCompile(`LRV_\d+_\d+_\d\d_\d+.mp4`),
+		Regex:         regexp.MustCompile(`^LRV_\d+_\d+_\d\d_\d+\.mp4$`),
 		Type:          LowResolutionVideo,
 		SteadyCamMode: true,
 		OSCMode:       false,
 		ProMode:       false,
 	},
 	{
-		Regex:         regexp.MustCompile(`PRO_LRV_\d+_\d+_\d\d_\d+.mp4`),
+		Regex:         regexp.MustCompile(`^PRO_LRV_\d+_\d+_\d\d_\d+\.mp4$`),
 		Type:          LowResolutionVideo,
 		SteadyCamMode: true,
 		OSCMode:       false,
 		ProMode:       true,
 	},
 	{
-		Regex:         regexp.MustCompile(`PRO_VID_\d+_\d+_\d\d_\d+.mp4`),
+		Regex:         regexp.MustCompile(`^PRO_VID_\d+_\d+_\d\d_\d+\.mp4$`),
 		Type:          Video,
 		SteadyCamMode: true,
 		OSCMode:       false,
 		ProMode:       true,
 	},
 	{
-		Regex:         regexp.MustCompile(`^VID_\d+_\d+_\d\d_\d+.mp4`),
+		Regex:         regexp.MustCompile(`^VID_\d+_\d+_\d\d_\d+\.mp4$`),
 		Type:          Video,
 		SteadyCamMode: true,
 		OSCMode:       false,
 		ProMode:       false,
 	},
 	{
-		Regex:         regexp.MustCompile(`VID_\d+_\d+_\d\d_\d+.insv`),
+		Regex:         regexp.MustCompile(`^VID_\d+_\d+_\d\d_\d+\.insv$`),
 		Type:          Video,
 		SteadyCamMode: false,
 		OSCMode:       false,
 		ProMode:       false,
 	},
 	{
-		Regex:         regexp.MustCompile(`LRV_\d+_\d+_\d\d_\d+.insv`),
+		Regex:         regexp.MustCompile(`^LRV_\d+_\d+_\d\d_\d+\.insv$`),
 		Type:          LowResolutionVideo,
 		SteadyCamMode: false,
 		OSCMode:       false,
 		ProMode:       false,
 	},
 	{
-		Regex:         regexp.MustCompile(`PRO_LRV_\d+_\d+_\d\d_\d+.lrv`),
+		Regex:         regexp.MustCompile(`^PRO_LRV_\d+_\d+_\d\d_\d+\.lrv$`),
 		Type:          LowResolutionVideo,
 		SteadyCamMode: true,
 		OSCMode:       false,

Original file line number	Diff line number	Diff line change
`@@ -4,23 +4,23 @@ import "regexp"`
`4`	`4`
`5`	`5`	`var fileTypes = []FileTypeMatch{`
`6`	`6`	`{`
`7`		- Regex: regexp.MustCompile(`.JPG`),
	`7`	+ Regex: regexp.MustCompile(`\.JPG$`),
`8`	`8`	`Type: Photo,`
`9`	`9`	`},`
`10`	`10`	`{`
`11`		- Regex: regexp.MustCompile(`.MP4`),
	`11`	+ Regex: regexp.MustCompile(`\.MP4$`),
`12`	`12`	`Type: Video,`
`13`	`13`	`},`
`14`	`14`	`{`
`15`		- Regex: regexp.MustCompile(`.SRT`),
	`15`	+ Regex: regexp.MustCompile(`\.SRT$`),
`16`	`16`	`Type: Subtitle,`
`17`	`17`	`},`
`18`	`18`	`{`
`19`		- Regex: regexp.MustCompile(`.DNG`),
	`19`	+ Regex: regexp.MustCompile(`\.DNG$`),
`20`	`20`	`Type: RawPhoto,`
`21`	`21`	`},`
`22`	`22`	`{`
`23`		- Regex: regexp.MustCompile(`.html`),
	`23`	+ Regex: regexp.MustCompile(`\.html$`),
`24`	`24`	`Type: PanoramaIndex,`
`25`	`25`	`},`
`26`	`26`	`}`