Skip to content

Commit 72f9578

Browse files
committed
Code cleaned up
1 parent 1dea923 commit 72f9578

File tree

2 files changed

+72
-42
lines changed

2 files changed

+72
-42
lines changed

controllers/functions.go

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
package controllers
2+
3+
import (
4+
"fmt"
5+
"io/ioutil"
6+
)
7+
8+
func URLmethod() []string {
9+
var url string
10+
var method string
11+
var args []string
12+
13+
fmt.Println("HTTP request URL: ")
14+
fmt.Scan(&url)
15+
args = append(args, url)
16+
fmt.Println("What HTTP method do you want to use: ")
17+
fmt.Scan(&method)
18+
args = append(args, "-X")
19+
args = append(args, url)
20+
21+
return args
22+
}
23+
24+
func GetBody(option string) []string {
25+
var args []string
26+
var body string
27+
var path string
28+
29+
fmt.Printf("Do you want to: \n1. Type json body,\n2. Import body from json file.\n")
30+
fmt.Scan(&option)
31+
if option == "1" {
32+
fmt.Println("Body: ")
33+
fmt.Scan(&body)
34+
}
35+
if option == "2" {
36+
fmt.Println("Path to json file: ")
37+
fmt.Scan(&path)
38+
body = loadFile(path)
39+
}
40+
args = append(args, "--body")
41+
args = append(args, body)
42+
43+
return args
44+
}
45+
46+
func GetHeader() []string {
47+
var header string
48+
var args []string
49+
50+
fmt.Println("Header: ")
51+
fmt.Scan(&header)
52+
args = append(args, "--header")
53+
args = append(args, header)
54+
55+
return args
56+
}
57+
58+
func loadFile(path string) string {
59+
b, err := ioutil.ReadFile(path)
60+
checkErr(err)
61+
return string(b)
62+
}
63+
64+
func checkErr(err error) {
65+
if err != nil {
66+
panic(err)
67+
}
68+
}

main.go

Lines changed: 4 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,57 +2,31 @@ package main
22

33
import (
44
"fmt"
5-
"io/ioutil"
5+
"http-request-creator/controllers"
66
"log"
77
"os"
88
"os/exec"
99
)
1010

1111
func main() {
1212
var args []string
13-
var url string
14-
var method string
1513
var option string
16-
var body string
17-
var header string
18-
var path string
1914

2015
fmt.Println("Starting HTTP request creator")
21-
fmt.Println("HTTP request URL: ")
22-
fmt.Scan(&url)
23-
args = append(args, url)
24-
fmt.Println("What HTTP method do you want to use: ")
25-
fmt.Scan(&method)
26-
args = append(args, "-X")
27-
args = append(args, url)
16+
args = append(args, controllers.URLmethod()...)
2817

2918
//* HTTP REQUEST BODY
3019
fmt.Println("Do you want to add body to the request? [y/n]")
3120
fmt.Scan(&option)
32-
3321
if ynToBool(option) {
34-
fmt.Printf("Do you want to: \n1. Type json body,\n2. Import body from json file.\n")
35-
if option == "1" {
36-
fmt.Println("Body: ")
37-
fmt.Scan(&body)
38-
}
39-
if option == "2" {
40-
fmt.Println("Path to json file: ")
41-
fmt.Scan(&path)
42-
body = loadFile(path)
43-
}
44-
args = append(args, "--body")
45-
args = append(args, body)
22+
args = append(args, controllers.GetBody(option)...)
4623
}
4724

4825
//* HTTP REQUEST HEADER
4926
fmt.Println("Do you want to add header to the request? [y/n]")
5027
fmt.Scan(&option)
5128
if ynToBool(option) {
52-
fmt.Println("Header: ")
53-
fmt.Scan(&header)
54-
args = append(args, "--header")
55-
args = append(args, header)
29+
args = append(args, controllers.GetHeader()...)
5630
}
5731

5832
//* HTTP REQUEST SENDING
@@ -88,15 +62,3 @@ func sendRequest(args []string) {
8862
cmd.Stdout = os.Stdout
8963
cmd.Run()
9064
}
91-
92-
func loadFile(path string) string {
93-
b, err := ioutil.ReadFile(path)
94-
checkErr(err)
95-
return string(b)
96-
}
97-
98-
func checkErr(err error) {
99-
if err != nil {
100-
panic(err)
101-
}
102-
}

0 commit comments

Comments
 (0)