Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c391939960 | ||
|
|
340c90211f |
@@ -16,7 +16,7 @@ jobs:
|
|||||||
- name: Set up Go
|
- name: Set up Go
|
||||||
uses: actions/setup-go@v6
|
uses: actions/setup-go@v6
|
||||||
with:
|
with:
|
||||||
go-version: '1.25.4'
|
go-version: '1.26.1'
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package main
|
|||||||
import (
|
import (
|
||||||
"flag"
|
"flag"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"log"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"git.kundeng.us/phoenix/clean_file/internal/parser"
|
"git.kundeng.us/phoenix/clean_file/internal/parser"
|
||||||
@@ -13,7 +14,7 @@ func main() {
|
|||||||
args := os.Args
|
args := os.Args
|
||||||
|
|
||||||
if len(args) < 2 {
|
if len(args) < 2 {
|
||||||
fmt.Println("Invalid arguments provided")
|
log.Println("Invalid arguments provided")
|
||||||
os.Exit(-1)
|
os.Exit(-1)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -25,10 +26,10 @@ func main() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Println("clean_file")
|
log.Println("clean_file")
|
||||||
filepath := args[1]
|
filepath := args[1]
|
||||||
|
|
||||||
fmt.Println("File path:", filepath)
|
log.Println("File path:", filepath)
|
||||||
prsr := parser.NumberParser{FilePath: filepath}
|
prsr := parser.NumberParser{FilePath: filepath}
|
||||||
|
|
||||||
numbers := prsr.FileDump()
|
numbers := prsr.FileDump()
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
module git.kundeng.us/phoenix/clean_file
|
module git.kundeng.us/phoenix/clean_file
|
||||||
|
|
||||||
go 1.25.4
|
go 1.26.1
|
||||||
|
|
||||||
require git.kundeng.us/phoenix/textsender-models v0.0.10
|
require git.kundeng.us/phoenix/textsender-models v0.2.0
|
||||||
|
|
||||||
require github.com/google/uuid v1.6.0 // indirect
|
require github.com/google/uuid v1.6.0 // indirect
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
git.kundeng.us/phoenix/textsender-models v0.0.10 h1:0AMe/zm4Xte2BcuqqhRP7+42m+4To+rUnHkR2a9eXlI=
|
git.kundeng.us/phoenix/textsender-models v0.2.0 h1:smz8Fs8VOs1Ya23txbOM0YPRidZIsM0yE9unHF0D/nQ=
|
||||||
git.kundeng.us/phoenix/textsender-models v0.0.10/go.mod h1:9iPDQJg1Tc6WMNoW5+f8YKmnosMwlWHJ++hmxNLDEe0=
|
git.kundeng.us/phoenix/textsender-models v0.2.0/go.mod h1:3CkqA/HFKPhpMYxkKn5uVbZEzEbG3sofLZE8pZ1BHO4=
|
||||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ type NumberParser struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (prsr *NumberParser) FileDump() []contact.Contact {
|
func (prsr *NumberParser) FileDump() []contact.Contact {
|
||||||
fmt.Println("Dumping files")
|
log.Println("Dumping files")
|
||||||
objs := []contact.Contact{}
|
objs := []contact.Contact{}
|
||||||
|
|
||||||
for _, line := range prsr.readLines(prsr.FilePath) {
|
for _, line := range prsr.readLines(prsr.FilePath) {
|
||||||
@@ -45,14 +45,14 @@ func (prsr *NumberParser) updateContacts(contacts []contact.Contact) []contact.C
|
|||||||
for _, ct := range contacts {
|
for _, ct := range contacts {
|
||||||
parsed := ct.PhoneNumber
|
parsed := ct.PhoneNumber
|
||||||
if len(parsed) < 2 {
|
if len(parsed) < 2 {
|
||||||
fmt.Println("Invalid number:", parsed)
|
log.Println("Invalid number:", parsed)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
pars := prsr.removeSomeData(parsed)
|
pars := prsr.removeSomeData(parsed)
|
||||||
parsed = pars
|
parsed = pars
|
||||||
|
|
||||||
fmt.Println(parsed)
|
log.Println("Parsed:", parsed)
|
||||||
|
|
||||||
updatedParsed := prsr.addPrefix(parsed)
|
updatedParsed := prsr.addPrefix(parsed)
|
||||||
updated = append(updated, contact.Contact{PhoneNumber: updatedParsed})
|
updated = append(updated, contact.Contact{PhoneNumber: updatedParsed})
|
||||||
@@ -94,13 +94,13 @@ func (prsr NumberParser) SaveFile(vals []contact.Contact) {
|
|||||||
// Create json and save it to the filesystem
|
// Create json and save it to the filesystem
|
||||||
jsonData, err := json.MarshalIndent(&vals, "", " ")
|
jsonData, err := json.MarshalIndent(&vals, "", " ")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println("Error marshaling JSON:", err)
|
log.Println("Error marshaling JSON:", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
err = os.WriteFile(filename, jsonData, 0644)
|
err = os.WriteFile(filename, jsonData, 0644)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println("Error writing file:", err)
|
log.Println("Error writing file:", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -144,7 +144,7 @@ func (prsr NumberParser) removeSomeData(unparsed string) string {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Println("Parsed:", parsed)
|
log.Println("Parsed:", parsed)
|
||||||
|
|
||||||
return parsed
|
return parsed
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package parser
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"log"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"git.kundeng.us/phoenix/textsender-models/tx0/contact"
|
"git.kundeng.us/phoenix/textsender-models/tx0/contact"
|
||||||
@@ -39,12 +40,14 @@ func Test_RemoveDups(t *testing.T) {
|
|||||||
for _, val := range finalAmount {
|
for _, val := range finalAmount {
|
||||||
fmt.Println("PhoneNumber:", val.PhoneNumber)
|
fmt.Println("PhoneNumber:", val.PhoneNumber)
|
||||||
}
|
}
|
||||||
fmt.Println("Printing test values")
|
fmt.Println("\nPrinting test values")
|
||||||
for _, val := range testValues {
|
for _, val := range testValues {
|
||||||
fmt.Println("PhoneNumber:", val.PhoneNumber)
|
fmt.Println("PhoneNumber:", val.PhoneNumber)
|
||||||
}
|
}
|
||||||
|
|
||||||
t.Error("Data has not be updated")
|
t.Error("Data has not been updated")
|
||||||
|
} else {
|
||||||
|
log.Println("The duplicates have been removed")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user