Improves detection of different spirit types and removes a lot of dead code.

1 files changed, 54 insertions, 5 deletions

diff --git a/crawler/utility.go b/crawler/utility.go
index 8ec0099..e59b40b 100644
--- a/crawler/utility.go
+++ b/crawler/utility.go
@@ -62,12 +62,12 @@ func detect_spirit_type(name string) string {
 	if matched {
 		return "Champagner"
 	}
-	matched, err = regexp.MatchString(`(^|\s)(Brandy)|(Weinbrand)(\s|$)`, name)
+	matched, err = regexp.MatchString(`(^|\s)Armagnac(\s|$)`, name)
 	if err != nil {
-		Fatal(err, "Brandy regex failed")
+		Fatal(err, "Armagnac regex failed")
 	}
 	if matched {
-		return "Brandy"
+		return "Armagnac"
 	}
 	matched, err = regexp.MatchString(`(^|\s)Cognac(\s|$)`, name)
 	if err != nil {
@@ -76,6 +76,13 @@ func detect_spirit_type(name string) string {
 	if matched {
 		return "Cognac"
 	}
+	matched, err = regexp.MatchString(`(^|\s)(Brandy)|(Weinbrand)(\s|$)`, name)
+	if err != nil {
+		Fatal(err, "Brandy regex failed")
+	}
+	if matched {
+		return "Brandy"
+	}
 	matched, err = regexp.MatchString(`(^|\s)Calvados(\s|$)`, name)
 	if err != nil {
 		Fatal(err, "Calvados regex failed")
@@ -90,7 +97,7 @@ func detect_spirit_type(name string) string {
 	if matched {
 		return "Grappa"
 	}
-	matched, err = regexp.MatchString(`(^|\s)Likör(\s|$)`, name)
+	matched, err = regexp.MatchString(`(^|\s)(\wlikör)|(Likör)(\s|$)`, name)
 	if err != nil {
 		Fatal(err, "Likör regex failed")
 	}
@@ -104,7 +111,7 @@ func detect_spirit_type(name string) string {
 	if matched {
 		return "Wermut"
 	}
-	matched, err = regexp.MatchString(`(^|\s)[G|J]enever(\s|$)`, name)
+	matched, err = regexp.MatchString(`(^|\s)([G|J]enever)|(Korenwijn)(\s|$)`, name)
 	if err != nil {
 		Fatal(err, "Genever regex failed")
 	}
@@ -132,6 +139,13 @@ func detect_spirit_type(name string) string {
 	if matched {
 		return "Portwein"
 	}
+	matched, err = regexp.MatchString(`(^|\s)Obstler|Obstbrand|Edelbrand(\s|$)`, name)
+	if err != nil {
+		Fatal(err, "Obstbrand regex failed")
+	}
+	if matched {
+		return "Obstbrand"
+	}
 	matched, err = regexp.MatchString(`(^|\s)Sake(\s|$)`, name)
 	if err != nil {
 		Fatal(err, "Sake regex failed")
@@ -139,6 +153,41 @@ func detect_spirit_type(name string) string {
 	if matched {
 		return "Sake"
 	}
+	matched, err = regexp.MatchString(`(^|\s)Shochu(\s|$)`, name)
+	if err != nil {
+		Fatal(err, "Shochu regex failed")
+	}
+	if matched {
+		return "Shochu"
+	}
+	matched, err = regexp.MatchString(`(^|\s)Pisco(\s|$)`, name)
+	if err != nil {
+		Fatal(err, "Pisco regex failed")
+	}
+	if matched {
+		return "Pisco"
+	}
+	matched, err = regexp.MatchString(`(^|\s)Absinth(\s|$)`, name)
+	if err != nil {
+		Fatal(err, "Absinth regex failed")
+	}
+	if matched {
+		return "Absinth"
+	}
+	matched, err = regexp.MatchString(`(^|\s)Tequila(\s|$)`, name)
+	if err != nil {
+		Fatal(err, "Tequila regex failed")
+	}
+	if matched {
+		return "Tequila"
+	}
+	matched, err = regexp.MatchString(`(^|\s)Mezcal(\s|$)`, name)
+	if err != nil {
+		Fatal(err, "Mezcal regex failed")
+	}
+	if matched {
+		return "Mezcal"
+	}
 
 	return "Verschiedenes"
 }