From 1c3c38b61421af576a31e809201f6f5ce3f45cf2 Mon Sep 17 00:00:00 2001
From: BroodjeAap <david@broodjeaap.net>
Date: Mon, 8 Aug 2022 19:48:10 +0000
Subject: [PATCH] in between commit

---
 models.go                |  2 +-
 scraping.go              | 17 +++++++++++------
 templates/editGroup.html | 30 +++++++++++++-----------------
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/models.go b/models.go
index acde5de..8416b65 100644
--- a/models.go
+++ b/models.go
@@ -34,7 +34,7 @@ type Filter struct {
 	FilterGroupID uint `form:"filter_group_id" yaml:"filter_group_id" binding:"required"`
 	FilterGroup   *FilterGroup
 	Name          string `form:"filter_name" yaml:"filter_name" binding:"required" validate:"min=1"`
-	Type          string `form:"filter_type" yaml:"filter_type" binding:"required" validate:"oneof=replace regex substring"`
+	Type          string `form:"filter_type" yaml:"filter_type" binding:"required" validate:"oneof=xpath css replace match substring"`
 	From          string `form:"from" yaml:"from" binding:"required"`
 	To            string `form:"to" yaml:"to" binding:"required"`
 }
diff --git a/scraping.go b/scraping.go
index 0498f9d..7698f05 100644
--- a/scraping.go
+++ b/scraping.go
@@ -55,7 +55,7 @@ func getFilterResult(s string, filter *Filter, newStrings *[]string) {
 		}
 	case filter.Type == "regex":
 		{
-			getFilterResultRegex(s, filter, newStrings)
+			getFilterResultMatch(s, filter, newStrings)
 		}
 	case filter.Type == "substring":
 		{
@@ -99,16 +99,21 @@ func getFilterResultCSS(s string, filter *Filter, newStrings *[]string) {
 }
 
 func getFilterResultReplace(s string, filter *Filter, newStrings *[]string) {
-	*newStrings = append(*newStrings, strings.ReplaceAll(s, filter.From, filter.To))
-}
-
-func getFilterResultRegex(s string, filter *Filter, newStrings *[]string) {
 	regex, err := regexp.Compile(filter.From)
 	if err != nil {
 		log.Print(err)
 		return
 	}
-	*newStrings = append(*newStrings, regex.ReplaceAllString(s, filter.To))
+	*newStrings = append(*newStrings, regex.ReplaceAllString(filter.From, filter.To))
+}
+
+func getFilterResultMatch(s string, filter *Filter, newStrings *[]string) {
+	r, err := regexp.Compile(filter.From)
+	if err != nil {
+		log.Print(err)
+		return
+	}
+	*newStrings = append(*newStrings, r.ReplaceAllString(s, filter.To))
 }
 
 func getFilterResultSubstring(s string, filter *Filter, newStrings *[]string) {
diff --git a/templates/editGroup.html b/templates/editGroup.html
index 329358d..ba642fb 100644
--- a/templates/editGroup.html
+++ b/templates/editGroup.html
@@ -116,7 +116,6 @@
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body">
-
                 <ul class="nav nav-tabs" id="newFilterTabs" role="tablist">
                     <li class="nav-item" role="presentation">
                         <button class="nav-link active" id="xpath-tab" data-bs-toggle="tab" data-bs-target="#xpath-tab-pane" aria-controls="xpath-tab-pane" type="button" role="tab" aria-selected="true">XPath</button>
@@ -128,7 +127,7 @@
                         <button class="nav-link" id="replace-tab" data-bs-toggle="tab" data-bs-target="#replace-tab-pane" aria-controls="replace-tab-pane" type="button" role="tab" aria-selected="false">Replace</button>
                     </li>
                     <li class="nav-item" role="presentation">
-                        <button class="nav-link" id="regex-tab" data-bs-toggle="tab" data-bs-target="#regex-tab-pane" aria-controls="regex-tab-pane" type="button" role="tab" aria-selected="false">Regex</button>
+                        <button class="nav-link" id="match-tab" data-bs-toggle="tab" data-bs-target="#match-tab-pane" aria-controls="match-tab-pane" type="button" role="tab" aria-selected="false">Match</button>
                     </li>
                     <li class="nav-item" role="presentation">
                         <button class="nav-link" id="substring-tab" data-bs-toggle="tab" data-bs-target="#substring-tab-pane" aria-controls="substring-tab-pane" type="button" role="tab" aria-selected="false">Substring</button>
@@ -186,21 +185,22 @@
                                 </div>
                                 <label for="fromInput" class="col-sm-2 col-form-label">From:</label>
                                 <div class="col-sm-10 p-2">
-                                    <input type="text" class="form-control" name="from" id="fromInput" placeholder="Something">
+                                    <input type="text" class="form-control" name="from" id="fromInput" placeholder="So[mM]e(thing|where)">
                                 </div>
                                 <label for="toInput" class="col-sm-2 col-form-label">To:</label>
                                 <div class="col-sm-10 p-2">
-                                    <input type="text" class="form-control" name="to" id="toInput" placeholder="Else">
+                                    <input type="text" class="form-control" name="to" id="toInput" placeholder="Else $1">
                                 </div>
                                 <button class="btn btn-primary mt-4">Add Filter</button>
                             </div>
                         </form>
                     </div>
-                    <div class="tab-pane fade" id="regex-tab-pane" role="tabpanel" aria-labelledby="regex-tab" tabindex="0">
+                    <div class="tab-pane fade" id="match-tab-pane" role="tabpanel" aria-labelledby="match-tab" tabindex="0">
                         <form action="/filter/create" method="post">
                             <div class="mb-3 m-3 row">
                                 <input type="hidden" name="filter_group_id" value="{{ .Group.ID }}" >
-                                <input type="hidden" name="filter_type" value="regex" >
+                                <input type="hidden" name="filter_type" value="match" >
+                                <input type="hidden" name="to" value="-" >
                             
                                 <label for="nameInput" class="col-sm-2 col-form-label">Name:</label>
                                 <div class="col-sm-10 p-2">
@@ -210,10 +210,6 @@
                                 <div class="col-sm-10 p-2">
                                     <input type="text" class="form-control" name="from" id="fromInput" placeholder="So[mM]e(thing|where)">
                                 </div>
-                                <label for="toInput" class="col-sm-2 col-form-label">To:</label>
-                                <div class="col-sm-10 p-2">
-                                    <input type="text" class="form-control" name="to" id="toInput" placeholder="Else">
-                                </div>
                                 <button class="btn btn-primary mt-4">Add Filter</button>
                             </div>
                         </form>
@@ -268,7 +264,7 @@
                         <button class="nav-link{{ if eq .Type "replace" }} active {{ end }}" id="replace-tab-{{ .ID }}" data-bs-toggle="tab" data-bs-target="#replace-tab-pane-{{ .ID }}" aria-controls="replace-tab-pane-{{ .ID }}" type="button" role="tab" aria-selected="{{ if eq .Type "replace" }} true {{ else }} false {{ end }}">Replace</button>
                     </li>
                     <li class="nav-item" role="presentation">
-                        <button class="nav-link {{ if eq .Type "regex" }} active {{ end }}" id="regex-tab-{{ .ID }}" data-bs-toggle="tab" data-bs-target="#regex-tab-pane-{{ .ID }}" aria-controls="regex-tab-pane-{{ .ID }}" type="button" role="tab" aria-selected="{{ if eq .Type "regex" }} true {{ else }} false {{ end }}">Regex</button>
+                        <button class="nav-link {{ if eq .Type "match" }} active {{ end }}" id="match-tab-{{ .ID }}" data-bs-toggle="tab" data-bs-target="#match-tab-pane-{{ .ID }}" aria-controls="match-tab-pane-{{ .ID }}" type="button" role="tab" aria-selected="{{ if eq .Type "match" }} true {{ else }} false {{ end }}">Match</button>
                     </li>
                     <li class="nav-item" role="presentation">
                         <button class="nav-link {{ if eq .Type "substring" }} active {{ end }}" id="substring-tab-{{ .ID }}" data-bs-toggle="tab" data-bs-target="#substring-tab-pane-{{ .ID }}" aria-controls="substring-tab-pane-{{ .ID }}" type="button" role="tab" aria-selected="{{ if eq .Type "substring" }} true {{ else }} false {{ end }}">Substring</button>
@@ -328,22 +324,22 @@
                                 </div>
                                 <label for="fromInput" class="col-sm-2 col-form-label">From:</label>
                                 <div class="col-sm-10 p-2">
-                                    <input type="text" class="form-control" name="from" id="fromInput" value="{{ if eq .Type "replace" }}{{ .From }}{{ end }}" placeholder="Something">
+                                    <input type="text" class="form-control" name="from" id="fromInput" value="{{ if eq .Type "replace" }}{{ .From }}{{ end }}" placeholder="So[mM]e(thing|where)">
                                 </div>
                                 <label for="toInput" class="col-sm-2 col-form-label">To:</label>
                                 <div class="col-sm-10 p-2">
-                                    <input type="text" class="form-control" name="to" id="toInput" value="{{ if eq .Type "replace" }}{{ .To }}{{ end }}" placeholder="Else">
+                                    <input type="text" class="form-control" name="to" id="toInput" value="{{ if eq .Type "replace" }}{{ .To }}{{ end }}" placeholder="Else $1">
                                 </div>
                                 <button class="btn btn-primary mt-4">Update</button>
                             </div>
                         </form>
                     </div>
-                    <div class="tab-pane fade {{ if eq .Type "regex" }} show active {{ end }}" id="regex-tab-pane-{{ .ID }}" role="tabpanel" aria-labelledby="regex-tab-{{ .ID }}" tabindex="0">
+                    <div class="tab-pane fade {{ if eq .Type "match" }} show active {{ end }}" id="match-tab-pane-{{ .ID }}" role="tabpanel" aria-labelledby="match-tab-{{ .ID }}" tabindex="0">
                         <form action="/filter/update" method="post">
                             <div class="mb-3 m-3 row">
                                 <input type="hidden" name="filter_id" value="{{ .ID }}" >
                                 <input type="hidden" name="filter_group_id" value="{{ .FilterGroupID }}" >
-                                <input type="hidden" name="filter_type" value="regex" >
+                                <input type="hidden" name="filter_type" value="match" >
                             
                                 <label for="nameInput" class="col-sm-2 col-form-label">Name:</label>
                                 <div class="col-sm-10 p-2">
@@ -351,11 +347,11 @@
                                 </div>
                                 <label for="fromInput" class="col-sm-2 col-form-label">From:</label>
                                 <div class="col-sm-10 p-2">
-                                    <input type="text" class="form-control" name="from" id="fromInput" value="{{ if eq .Type "regex" }}{{ .From }}{{ end }}" placeholder="So[mM]e(thing|where)">
+                                    <input type="text" class="form-control" name="from" id="fromInput" value="{{ if eq .Type "match" }}{{ .From }}{{ end }}" placeholder="So[mM]e(thing|where)">
                                 </div>
                                 <label for="toInput" class="col-sm-2 col-form-label">To:</label>
                                 <div class="col-sm-10 p-2">
-                                    <input type="text" class="form-control" name="to" id="toInput" value="{{ if eq .Type "regex" }}{{ .To }}{{ end }}" placeholder="Else">
+                                    <input type="text" class="form-control" name="to" id="toInput" value="{{ if eq .Type "match" }}{{ .To }}{{ end }}" placeholder="Else">
                                 </div>
                                 <button class="btn btn-primary mt-4">Update</button>
                             </div>