Merge pull request persiancal#58 from fzerorubigd/f0rud/validate-part…

…ial-key add partial-key validator
fuzsh · Oct 3, 2019 · a103560 · a103560
2 parents 5245e29 + 55bc34d
commit a103560
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 26 deletions.
diff --git a/cmd/thetool/validate.go b/cmd/thetool/validate.go
@@ -2,7 +2,11 @@ package main
 
 import (
 	"fmt"
-	"strings"
+	"regexp"
+)
+
+var (
+	partialValidator = regexp.MustCompile("^[a-z0-9_]+$")
 )
 
 func validate(cmd *command, fl *File) error {
@@ -33,8 +37,9 @@ func validateEventContent(ev []Event, p *Preset, countries []string) error {
 			return fmt.Errorf("the Key should not be in the input file")
 		}
 
-		if strings.Trim(ev[i].PartialKey, "\n\t ") == "" {
-			return fmt.Errorf("the partial key is empty")
+
+		if !partialValidator.MatchString(ev[i].PartialKey) {
+			return fmt.Errorf("the partial key %q is invalid, only lower english chars, _ and numbers are allowed ([a-z0-9_])", ev[i].PartialKey)
 		}
 
 		if ev[i].Month <= 0 || ev[i].Month > len(p.MonthsNormal) {

diff --git a/cmd/thetool/validate_test.go b/cmd/thetool/validate_test.go
@@ -13,19 +13,19 @@ func TestValidateEventsOrder(t *testing.T) {
 	}{
 		{
 			events: []Event{
-				{Month: 1, Day: 1, PartialKey: "PK"},
-				{Month: 1, Day: 2, PartialKey: "PK"},
-				{Month: 2, Day: 2, PartialKey: "PK"},
-				{Month: 2, Day: 2, Year: 100, PartialKey: "PK"},
-				{Month: 2, Day: 2, Year: 101, PartialKey: "PK"},
-				{Month: 3, Day: 1, PartialKey: "PK"},
+				{Month: 1, Day: 1, PartialKey: "partial_key"},
+				{Month: 1, Day: 2, PartialKey: "partial_key"},
+				{Month: 2, Day: 2, PartialKey: "partial_key"},
+				{Month: 2, Day: 2, Year: 100, PartialKey: "partial_key"},
+				{Month: 2, Day: 2, Year: 101, PartialKey: "partial_key"},
+				{Month: 3, Day: 1, PartialKey: "partial_key"},
 			},
 			failKey: -1,
 		},
 		{
 			events: []Event{
-				{Month: 2, Day: 2, PartialKey: "PK"},
-				{Month: 2, Day: 1, PartialKey: "PK"},
+				{Month: 2, Day: 2, PartialKey: "partial_key"},
+				{Month: 2, Day: 1, PartialKey: "partial_key"},
 			},
 			failKey: 1,
 		},
@@ -49,31 +49,31 @@ func TestValidateEventsContent(t *testing.T) {
 	}{
 		{
 			events: []Event{
-				{Month: 0, Day: 1, PartialKey: "PK"},
+				{Month: 0, Day: 1, PartialKey: "partial_key"},
 			},
 			failKey: 0,
 		},
 		{
 			events: []Event{
-				{Month: 2, Day: -1, PartialKey: "PK"},
+				{Month: 2, Day: -1, PartialKey: "partial_key"},
 			},
 			failKey: 0,
 		},
 		{
 			events: []Event{
-				{Month: 7, Day: 31, PartialKey: "PK"},
+				{Month: 7, Day: 31, PartialKey: "partial_key"},
 			},
 			failKey: 0,
 		},
 		{
 			events: []Event{
-				{Month: 7, Day: 1, Holiday: map[string][]string{"Invalid": nil}, PartialKey: "PK"},
+				{Month: 7, Day: 1, Holiday: map[string][]string{"Invalid": nil}, PartialKey: "partial_key"},
 			},
 			failKey: 0,
 		},
 		{
 			events: []Event{
-				{Month: 7, Day: 1, Holiday: map[string][]string{"Iran": nil}, PartialKey: "PK"},
+				{Month: 7, Day: 1, Holiday: map[string][]string{"Iran": nil}, PartialKey: "partial_key"},
 			},
 			failKey: -1,
 		},

diff --git a/dist/jalali.json b/dist/jalali.json
@@ -1953,8 +1953,8 @@
       ]
     },
     {
-      "partial_key": "iran_air_Flight_655_shot_down",
-      "key": 236170697,
+      "partial_key": "iran_air_flight_655_shot_down",
+      "key": 3590039721,
       "title": {
         "fa_IR": "حملهٔ ناوگان آمریکا به هواپیمای مسافربری ایران"
       },
@@ -2907,8 +2907,8 @@
       }
     },
     {
-      "partial_key": "soviet_invasion_of_iran ",
-      "key": 2066847225,
+      "partial_key": "soviet_invasion_of_iran",
+      "key": 3180591399,
       "title": {
         "fa_IR": "اشغال ایران به دست متفقین"
       },

diff --git a/dist/jalali.yml b/dist/jalali.yml
@@ -1286,8 +1286,8 @@ events:
     - ایران
   sources:
   - https://fa.wikipedia.org/wiki/عبدالحسین_امینی
-- partial_key: iran_air_Flight_655_shot_down
-  key: 236170697
+- partial_key: iran_air_flight_655_shot_down
+  key: 3590039721
   title:
     fa_IR: حملهٔ ناوگان آمریکا به هواپیمای مسافربری ایران
   description:
@@ -1913,8 +1913,8 @@ events:
     - Ancient Iran
     fa_IR:
     - باستانی
-- partial_key: 'soviet_invasion_of_iran '
-  key: 2066847225
+- partial_key: soviet_invasion_of_iran
+  key: 3180591399
   title:
     fa_IR: اشغال ایران به دست متفقین
   description:

diff --git a/jalali/04-tir.yml b/jalali/04-tir.yml
@@ -188,7 +188,7 @@ events:
     - ایران
   sources:
     - https://fa.wikipedia.org/wiki/عبدالحسین_امینی
-- partial_key: "iran_air_Flight_655_shot_down"
+- partial_key: "iran_air_flight_655_shot_down"
   title:
     fa_IR: حملهٔ ناوگان آمریکا به هواپیمای مسافربری ایران
   description:

diff --git a/jalali/06-shahrivar.yml b/jalali/06-shahrivar.yml
@@ -78,7 +78,7 @@ events:
     - Ancient Iran
     fa_IR:
     - باستانی
-- partial_key: "soviet_invasion_of_iran "
+- partial_key: "soviet_invasion_of_iran"
   title:
     fa_IR: اشغال ایران به دست متفقین
   description: