Better spirit type detection. (crawler)

1 files changed, 64 insertions, 1 deletions

diff --git a/crawler/utility.go b/crawler/utility.go
index 0650546..8ec0099 100644
--- a/crawler/utility.go
+++ b/crawler/utility.go
@@ -48,13 +48,27 @@ func detect_spirit_type(name string) string {
 	if matched {
 		return "Whisky"
 	}
-	matched, err = regexp.MatchString(`(^|\s)Champagner(\s|$)`, name)
+	matched, err = regexp.MatchString(`(^|\s)Wein(\s|$)`, name)
+	if err != nil {
+		Fatal(err, "Wein regex failed")
+	}
+	if matched {
+		return "Wein"
+	}
+	matched, err = regexp.MatchString(`(^|\s)(Champagner)|(Champagne)(\s|$)`, name)
 	if err != nil {
 		Fatal(err, "Champagner regex failed")
 	}
 	if matched {
 		return "Champagner"
 	}
+	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)Cognac(\s|$)`, name)
 	if err != nil {
 		Fatal(err, "Cognac regex failed")
@@ -62,6 +76,13 @@ func detect_spirit_type(name string) string {
 	if matched {
 		return "Cognac"
 	}
+	matched, err = regexp.MatchString(`(^|\s)Calvados(\s|$)`, name)
+	if err != nil {
+		Fatal(err, "Calvados regex failed")
+	}
+	if matched {
+		return "Calvados"
+	}
 	matched, err = regexp.MatchString(`(^|\s)Grappa(\s|$)`, name)
 	if err != nil {
 		Fatal(err, "Grappa regex failed")
@@ -76,6 +97,48 @@ func detect_spirit_type(name string) string {
 	if matched {
 		return "Likör"
 	}
+	matched, err = regexp.MatchString(`(^|\s)(Vermouth)|(Wermut)(\s|$)`, name)
+	if err != nil {
+		Fatal(err, "Vermouth|Wermut regex failed")
+	}
+	if matched {
+		return "Wermut"
+	}
+	matched, err = regexp.MatchString(`(^|\s)[G|J]enever(\s|$)`, name)
+	if err != nil {
+		Fatal(err, "Genever regex failed")
+	}
+	if matched {
+		return "Genever"
+	}
+	matched, err = regexp.MatchString(`(^|\s)Baijiu(\s|$)`, name)
+	if err != nil {
+		Fatal(err, "Baijiu regex failed")
+	}
+	if matched {
+		return "Baijiu"
+	}
+	matched, err = regexp.MatchString(`(^|\s)(Sherry|Oloroso|Fino|Amontillado)(\s|$)`, name)
+	if err != nil {
+		Fatal(err, "Sherry regex failed")
+	}
+	if matched {
+		return "Sherry"
+	}
+	matched, err = regexp.MatchString(`((^|\s)Port(wein)?(\s|$))|((^|\s)(Ruby|Tawny)(\s|$))`, name)
+	if err != nil {
+		Fatal(err, "Portwein regex failed")
+	}
+	if matched {
+		return "Portwein"
+	}
+	matched, err = regexp.MatchString(`(^|\s)Sake(\s|$)`, name)
+	if err != nil {
+		Fatal(err, "Sake regex failed")
+	}
+	if matched {
+		return "Sake"
+	}
 
 	return "Verschiedenes"
 }