Mirrors/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2026-01-23 02:24:24 +00:00
Code Issues Projects Releases Wiki Activity

Clean: improve regex for Postgres and apply lint fixes

Browse source
This commit is contained in:
Keith Martin 2025-12-03 00:00:12 +10:00
parent db7635a613
commit 075d400070
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
pkg/clean/version.go
View file

@ -8,7 +8,9 @@ import (
// VersionRegexp finds semantic version-like strings.
var VersionRegexp = regexp.MustCompile(`(\d+\.)(\d+\.)(\*|\d+)`)
var PostgreSQLVersionRegexp = regexp.MustCompile("PostgreSQL \\d+\\.\\d+(\\.\\d)?")
// PostgreSQLVersionRegexp finds Postgres specific semantic version-like strings
var PostgreSQLVersionRegexp = regexp.MustCompile(`PostgreSQL \d+\.\d+(\.\d)?`)
// Version parses and returns a semantic version string.
func Version(s string) string {
@ -20,12 +22,9 @@ func Version(s string) string {
// and return it with "v" prefix if found.
if v := PostgreSQLVersionRegexp.FindString(s); v != "" {
return fmt.Sprintf("v%s", strings.Replace(v, "PostgreSQL ", "", -1))
} else {
if v := VersionRegexp.FindString(s); v != "" {
return fmt.Sprintf("v%s", v)
} else {
return ""
}
}
if v := VersionRegexp.FindString(s); v != "" {
return fmt.Sprintf("v%s", v)
}
return ""