From 174e75b97b30b42591c62c7fd453cae05cbe08e7 Mon Sep 17 00:00:00 2001 From: Alain Gilbert Date: Fri, 5 Aug 2022 19:09:38 -0700 Subject: [PATCH] simplify regex --- extracts_v6.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extracts_v6.go b/extracts_v6.go index 23f7de26..bb61d1fa 100644 --- a/extracts_v6.go +++ b/extracts_v6.go @@ -2001,7 +2001,7 @@ var temperatureRgxStr = `([-\d]+).+C\s*(?:bis|-tól|para|to|à|至|a|～|do|ile| var temperatureRgx = regexp.MustCompile(temperatureRgxStr) var diameterRgxStr = `([\d.,]+)(?i)(?:km|км|公里|χμ)` var diameterRgx = regexp.MustCompile(diameterRgxStr) -var lifeformRgxStr = `(?:(?:[^:]+\s?){0,3}:\s(?:\D+\s?){0,3})?` +var lifeformRgxStr = `(?:[^:]+\s?:\s\D+)?` var planetInfosRgx = regexp.MustCompile(`([^\[]+) \[(\d+):(\d+):(\d+)]` + lifeformRgxStr + diameterRgxStr + ` \((\d+)/(\d+)\)(?:de|da|od|mellem|от)?\s*` + temperatureRgxStr) var moonInfosRgx = regexp.MustCompile(`([^\[]+) \[(\d+):(\d+):(\d+)]([\d.,]+)(?i)(?:km|км|χμ|公里) \((\d+)/(\d+)\)`) var cpRgx = regexp.MustCompile(`&cp=(\d+)`)