Improve regexes

This commit is contained in:
comp500
2019-08-16 18:33:37 +01:00
committed by GitHub
parent 8dd47e2cbb
commit 0c94ea9c7c

View File

@@ -43,8 +43,9 @@ func init() {
} }
var fileIDRegexes = [...]*regexp.Regexp{ var fileIDRegexes = [...]*regexp.Regexp{
regexp.MustCompile("^https?:\\/\\/minecraft\\.curseforge\\.com\\/projects\\/(.+)\\/files\\/(\\d+)$"), regexp.MustCompile("^https?:\\/\\/minecraft\\.curseforge\\.com\\/projects\\/(.+)\\/files\\/(\\d+)"),
regexp.MustCompile("^https?:\\/\\/(?:www\\.)?curseforge\\.com\\/minecraft\\/mc-mods\\/(.+)\\/download\\/(\\d+)$"), regexp.MustCompile("^https?:\\/\\/(?:www\\.)?curseforge\\.com\\/minecraft\\/mc-mods\\/(.+)\\/files\\/(\\d+)"),
regexp.MustCompile("^https?:\\/\\/(?:www\\.)?curseforge\\.com\\/minecraft\\/mc-mods\\/(.+)\\/download\\/(\\d+)"),
} }
func getFileIDsFromString(mod string) (bool, int, int, error) { func getFileIDsFromString(mod string) (bool, int, int, error) {
@@ -63,8 +64,8 @@ func getFileIDsFromString(mod string) (bool, int, int, error) {
} }
var modSlugRegexes = [...]*regexp.Regexp{ var modSlugRegexes = [...]*regexp.Regexp{
regexp.MustCompile("^https?:\\/\\/minecraft\\.curseforge\\.com\\/projects\\/([^\\/]+)$"), regexp.MustCompile("^https?:\\/\\/minecraft\\.curseforge\\.com\\/projects\\/([^\\/]+)"),
regexp.MustCompile("^https?:\\/\\/(?:www\\.)?curseforge\\.com\\/minecraft\\/mc-mods\\/([^\\/]+)$"), regexp.MustCompile("^https?:\\/\\/(?:www\\.)?curseforge\\.com\\/minecraft\\/mc-mods\\/([^\\/]+)"),
// Exact slug matcher // Exact slug matcher
regexp.MustCompile("^[a-z][\\da-z\\-]{0,127}$"), regexp.MustCompile("^[a-z][\\da-z\\-]{0,127}$"),
} }