From ecb815666e96f8cbeb82747a70f6eeed69af1e89 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Wed, 27 Mar 2024 11:24:54 +0100
Subject: [PATCH] Remove all remaining validator_regexp

---
 admin/api/exercice.go                                | 2 +-
 admin/static/js/common.js                            | 4 ++--
 admin/static/views/exercice-flags.html               | 4 ++--
 admin/static/views/exercice.html                     | 2 +-
 frontend/fic/src/lib/components/ExerciceFlags.svelte | 4 ++--
 libfic/team_my.go                                    | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/admin/api/exercice.go b/admin/api/exercice.go
index 928cd452..cfdb450d 100644
--- a/admin/api/exercice.go
+++ b/admin/api/exercice.go
@@ -797,7 +797,7 @@ type uploadedFlag struct {
 	IgnoreCase   bool
 	Multiline    bool
 	NoTrim       bool
-	CaptureRe    *string `json:"validator_regexp"`
+	CaptureRe    *string `json:"capture_regexp"`
 	SortReGroups bool    `json:"sort_re_grps"`
 	Flag         string
 	Value        []byte
diff --git a/admin/static/js/common.js b/admin/static/js/common.js
index e1c2f8d8..252e83db 100644
--- a/admin/static/js/common.js
+++ b/admin/static/js/common.js
@@ -32,8 +32,8 @@ function treatFlagKey(flag) {
 	if (flag.value && flag.soluce) {
 	    if (flag.ignore_case)
 		flag.value = flag.value.toLowerCase();
-	    if (flag.validator_regexp) {
-		var re = new RegExp(flag.validator_regexp, flag.ignore_case?'ui':'u');
+	    if (flag.capture_regexp) {
+		var re = new RegExp(flag.capture_regexp, flag.ignore_case?'ui':'u');
 		var match = re.exec(flag.value);
 		match.shift();
 		flag.value = match.join("+");
diff --git a/admin/static/views/exercice-flags.html b/admin/static/views/exercice-flags.html
index da230279..3caf3add 100644
--- a/admin/static/views/exercice-flags.html
+++ b/admin/static/views/exercice-flags.html
@@ -47,8 +47,8 @@
 	      <input type="text" id="kflag{{flag.id}}" ng-model="flag.flag" class="form-control form-control-sm" placeholder="Chaîne brute à valider" ng-if="!flag.id || flag.show_raw" title="Chaîne brute à valider">
 	    </div>
 	    <div class="form-group">
-	      <label for="kvre{{flag.id}}" class="col-form-label-sm">Validator regexp</label>
-	      <input type="text" id="kvre{{flag.id}}" ng-model="flag.validator_regexp" class="form-control form-control-sm" placeholder="Regexp selecting validation string" title="Regexp selecting validation string">
+	      <label for="kvre{{flag.id}}" class="col-form-label-sm">Capture regexp</label>
+	      <input type="text" id="kvre{{flag.id}}" ng-model="flag.capture_regexp" class="form-control form-control-sm" placeholder="Regexp selecting validation string" title="Regexp selecting validation string">
 	    </div>
 	    <div class="form-group row">
 	      <div class="col-auto custom-control custom-checkbox ml-1">
diff --git a/admin/static/views/exercice.html b/admin/static/views/exercice.html
index 9357dd0c..e492084e 100644
--- a/admin/static/views/exercice.html
+++ b/admin/static/views/exercice.html
@@ -211,7 +211,7 @@
 	      </div>
 	    </div>
 	    <div class="row">
-	      <input type="text" id="kvre{{flag.id}}" ng-model="flag.validator_regexp" class="col form-control form-control-sm" placeholder="Regexp selecting validation string" title="Regexp selecting validation string">
+	      <input type="text" id="kvre{{flag.id}}" ng-model="flag.capture_regexp" class="col form-control form-control-sm" placeholder="Regexp selecting validation string" title="Regexp selecting validation string">
 	    </div>
 	    </form>
 	    <form ng-submit="testFlag(flag)">
diff --git a/frontend/fic/src/lib/components/ExerciceFlags.svelte b/frontend/fic/src/lib/components/ExerciceFlags.svelte
index d8a3fde4..a5da7862 100644
--- a/frontend/fic/src/lib/components/ExerciceFlags.svelte
+++ b/frontend/fic/src/lib/components/ExerciceFlags.svelte
@@ -52,8 +52,8 @@
                  soluce = soluce.toLowerCase();
              }
 
-             if (flag.validator_regexp) {
-                 let re = new RegExp(flag.validator_regexp, flag.ignore_case?'i':'');
+             if (flag.capture_regexp) {
+                 let re = new RegExp(flag.capture_regexp, flag.ignore_case?'i':'');
                  soluce = soluce.match(re).slice(1).join("+");
              }
 
diff --git a/libfic/team_my.go b/libfic/team_my.go
index 4c9accd7..e7415fd7 100644
--- a/libfic/team_my.go
+++ b/libfic/team_my.go
@@ -57,7 +57,7 @@ type myTeamFlag struct {
 	IgnoreOrder bool                   `json:"ignore_order,omitempty"`
 	IgnoreCase  bool                   `json:"ignore_case,omitempty"`
 	Multiline   bool                   `json:"multiline,omitempty"`
-	CaptureRe   *string                `json:"validator_regexp,omitempty"`
+	CaptureRe   *string                `json:"capture_regexp,omitempty"`
 	Solved      *time.Time             `json:"found,omitempty"`
 	PSolved     *time.Time             `json:"part_solved,omitempty"`
 	Soluce      string                 `json:"soluce,omitempty"`