From 03d35eee1301ff393ac90fceeaeaaa1de84b2481 Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 5 Jun 2026 18:00:34 -0400 Subject: [PATCH] Removing go files --- Makefile | 22 ----- README.md | 8 -- cmd/clean_file/main.go | 39 -------- go.mod | 7 -- go.sum | 4 - internal/parser/parser.go | 169 --------------------------------- internal/parser/parser_test.go | 73 -------------- internal/version/version.go | 17 ---- 8 files changed, 339 deletions(-) delete mode 100644 Makefile delete mode 100644 README.md delete mode 100644 cmd/clean_file/main.go delete mode 100644 go.mod delete mode 100644 go.sum delete mode 100644 internal/parser/parser.go delete mode 100644 internal/parser/parser_test.go delete mode 100644 internal/version/version.go diff --git a/Makefile b/Makefile deleted file mode 100644 index e9ce19d..0000000 --- a/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -VERSION ?= $(shell git describe --tags 2>/dev/null || echo "dev") -COMMIT ?= $(shell git rev-parse --short HEAD) -BUILD_TIME ?= $(shell date -u +%Y-%m-%dT%H:%M:%SZ) -GO_VERSION ?= $(shell go version | awk '{print $$3}') - -.PHONY: build -build: - go build -ldflags="\ - -X 'git.kundeng.us/phoenix/clean_file/internal/version.Version=$(VERSION)' \ - -X 'git.kundeng.us/phoenix/clean_file/internal/version.BuildTime=$(BUILD_TIME)' \ - -X 'git.kundeng.us/phoenix/clean_file/internal/version.Commit=$(COMMIT)' \ - -X 'git.kundeng.us/phoenix/clean_file/internal/version.GoVersion=$(GO_VERSION)'" \ - -o clean_file cmd/clean_file/main.go - -.PHONY: install -install: - go install -ldflags="\ - -X 'git.kundeng.us/phoenix/clean_file/internal/version.Version=$(VERSION)' \ - -X 'git.kundeng.us/phoenix/clean_file/internal/version.BuildTime=$(BUILD_TIME)' \ - -X 'git.kundeng.us/phoenix/clean_file/internal/version.Commit=$(COMMIT)' \ - -X 'git.kundeng.us/phoenix/clean_file/internal/version.GoVersion=$(GO_VERSION)'" - -o clean_file cmd/clean_file/main.go diff --git a/README.md b/README.md deleted file mode 100644 index 7d7fbfe..0000000 --- a/README.md +++ /dev/null @@ -1,8 +0,0 @@ -CLI software that processes a text file containing US phone numbers -and sanitizes the numbers. The result is contained in a json file. - -## Building - -``` -make build -``` diff --git a/cmd/clean_file/main.go b/cmd/clean_file/main.go deleted file mode 100644 index 53d1f0e..0000000 --- a/cmd/clean_file/main.go +++ /dev/null @@ -1,39 +0,0 @@ -package main - -import ( - "flag" - "fmt" - "log" - "os" - - "git.kundeng.us/phoenix/clean_file/internal/parser" - "git.kundeng.us/phoenix/clean_file/internal/version" -) - -func main() { - args := os.Args - - if len(args) < 2 { - log.Println("Invalid arguments provided") - os.Exit(-1) - } - - versionFlag := flag.Bool("version", false, "Print version information") - flag.Parse() - - if *versionFlag { - fmt.Println(version.String()) - return - } - - log.Println("clean_file") - filepath := args[1] - - log.Println("File path:", filepath) - prsr := parser.NumberParser{FilePath: filepath} - - numbers := prsr.FileDump() - prsr.PrintValues(numbers, true) - - prsr.SaveFile(numbers) -} diff --git a/go.mod b/go.mod deleted file mode 100644 index 7e55559..0000000 --- a/go.mod +++ /dev/null @@ -1,7 +0,0 @@ -module git.kundeng.us/phoenix/clean_file - -go 1.26.2 - -require git.kundeng.us/phoenix/textsender-models v0.2.1 - -require github.com/google/uuid v1.6.0 // indirect diff --git a/go.sum b/go.sum deleted file mode 100644 index d7c523c..0000000 --- a/go.sum +++ /dev/null @@ -1,4 +0,0 @@ -git.kundeng.us/phoenix/textsender-models v0.2.1 h1:21br4NF58aUFuCx8laKxC5RvZMl4GsSIaMX4bvf5plw= -git.kundeng.us/phoenix/textsender-models v0.2.1/go.mod h1:nu5QWy9o+spx/t9NFipaGmF5qiBJS/0QhxyCjoi3Z3E= -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= diff --git a/internal/parser/parser.go b/internal/parser/parser.go deleted file mode 100644 index a9957fa..0000000 --- a/internal/parser/parser.go +++ /dev/null @@ -1,169 +0,0 @@ -package parser - -import ( - "bufio" - "encoding/json" - "fmt" - "log" - "os" - "strings" - "unicode" - - "git.kundeng.us/phoenix/textsender-models/tx0/contact" -) - -const Letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" - -type NumberParser struct { - FilePath string -} - -func (prsr *NumberParser) FileDump() []contact.Contact { - log.Println("Dumping files") - objs := []contact.Contact{} - - for _, line := range prsr.readLines(prsr.FilePath) { - if strings.ContainsAny(line, Letters) { - continue - } - - myObj := contact.Contact{PhoneNumber: line} - if myObj.PhoneNumber != "" { - objs = append(objs, myObj) - } - } - - objs = prsr.updateContacts(objs) - objs = prsr.removeDups(objs) - - return objs -} - -func (prsr *NumberParser) updateContacts(contacts []contact.Contact) []contact.Contact { - updated := []contact.Contact{} - - for _, ct := range contacts { - parsed := ct.PhoneNumber - if len(parsed) < 2 { - log.Println("Invalid number:", parsed) - continue - } - - pars := prsr.removeSomeData(parsed) - parsed = pars - - log.Println("Parsed:", parsed) - - updatedParsed := prsr.addPrefix(parsed) - updated = append(updated, contact.Contact{PhoneNumber: updatedParsed}) - } - - return updated -} - -func (prsr *NumberParser) removeDups(contacts []contact.Contact) []contact.Contact { - updated := []contact.Contact{} - uniqueItems := make(map[string]string) - - for _, val := range contacts { - uniqueItems[val.PhoneNumber] = val.PhoneNumber - } - - for _, item := range uniqueItems { - updated = append(updated, contact.Contact{PhoneNumber: item}) - } - - return updated -} - -func (prsr NumberParser) PrintValues(contacts []contact.Contact, printTotal bool) { - fmt.Println("Printing numbers") - - for _, ct := range contacts { - fmt.Println("Number:", ct.PhoneNumber) - } - - if printTotal { - fmt.Println("Total Numbers:", len(contacts)) - } -} - -func (prsr NumberParser) SaveFile(vals []contact.Contact) { - filename := "numbers.json" - - // Create json and save it to the filesystem - jsonData, err := json.MarshalIndent(&vals, "", " ") - if err != nil { - log.Println("Error marshaling JSON:", err) - return - } - - err = os.WriteFile(filename, jsonData, 0644) - if err != nil { - log.Println("Error writing file:", err) - return - } -} - -func (prsr NumberParser) readLines(filename string) []string { - // Open the file - file, err := os.Open(filename) - if err != nil { - log.Fatal(err) - } - defer file.Close() - - // Create a scanner to read the file line by line - scanner := bufio.NewScanner(file) - lines := []string{} - - // Read line by line - for scanner.Scan() { - line := scanner.Text() - lines = append(lines, line) - } - - // Check for any errors during scanning - if err := scanner.Err(); err != nil { - log.Fatal(err) - } - - return lines -} - -func (prsr NumberParser) removeSomeData(unparsed string) string { - parsed := "" - - for _, ch := range unparsed { - if ch == ' ' { - continue - } else { - if unicode.IsDigit(ch) { - parsed += string(ch) - } - } - } - - log.Println("Parsed:", parsed) - - return parsed -} - -func (prsr NumberParser) addPrefix(raw string) string { - parsed := raw - - firstChar := raw[0] - secondChar := raw[1] - - if firstChar == '1' { - parsed = "+" + parsed - } else if firstChar != '+' { - if secondChar != '1' { - parsed = "+1" + parsed - } else { - parsed = "+1" + parsed - } - } - - return parsed -} diff --git a/internal/parser/parser_test.go b/internal/parser/parser_test.go deleted file mode 100644 index eab258b..0000000 --- a/internal/parser/parser_test.go +++ /dev/null @@ -1,73 +0,0 @@ -package parser - -import ( - "fmt" - "log" - "testing" - - "git.kundeng.us/phoenix/textsender-models/tx0/contact" -) - -const Test_File_Path = "../../tests/numbers.txt" - -// Remove duplicates -func Test_RemoveDups(t *testing.T) { - parser := NumberParser{FilePath: Test_File_Path} - finalAmount := parser.FileDump() - - if len(finalAmount) < 1 { - t.Error("Dump should not be empty") - } - - testValues := []contact.Contact{ - {PhoneNumber: "+12175550194"}, - {PhoneNumber: "+16025550177"}, - {PhoneNumber: "+17135550167"}, - {PhoneNumber: "+16085550190"}, - {PhoneNumber: "+13055550112"}, - {PhoneNumber: "+14155550135"}, - {PhoneNumber: "+13175550123"}, - {PhoneNumber: "+13605550158"}, - } - - aSize := len(finalAmount) - bSize := len(testValues) - if aSize != bSize { - t.Error("Data has varrying sizes A", aSize, " B", bSize) - } - if !dataEqual(finalAmount, testValues) { - fmt.Println("Printing final amount") - for _, val := range finalAmount { - fmt.Println("PhoneNumber:", val.PhoneNumber) - } - fmt.Println("\nPrinting test values") - for _, val := range testValues { - fmt.Println("PhoneNumber:", val.PhoneNumber) - } - - t.Error("Data has not been updated") - } else { - log.Println("The duplicates have been removed") - } -} - -func dataEqual(a, b []contact.Contact) bool { - if len(a) != len(b) { - return false - } - - for i := range a { - foundIt := false - for j := range b { - if a[i] == b[j] { - foundIt = true - } - } - - if !foundIt { - return false - } - } - - return true -} diff --git a/internal/version/version.go b/internal/version/version.go deleted file mode 100644 index 91e3782..0000000 --- a/internal/version/version.go +++ /dev/null @@ -1,17 +0,0 @@ -package version - -import "fmt" - -var ( - Version = "dev" - BuildTime = "unknown" - Commit = "unknown" - GoVersion = "unknown" -) - -func String() string { - return fmt.Sprintf( - "Version: %s\nBuild Date: %s\nCommit: %s\nGo Version: %s", - Version, BuildTime, Commit, GoVersion, - ) -}