Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Linting go-files as per golangci-lint and support in Travis checks #203

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Linting go-files as per golangci-lint and support in Travis checks #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32de2b8
linted as per standards
Harkishen-Singh Mar 20, 2020
c16f8c5
linted as per standards
Harkishen-Singh Mar 20, 2020
944e22c
linted as per standards
Harkishen-Singh Mar 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ before-install:


script:
- curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.18.0
- echo "checking linting in golang ..."
- golangci-lint run
- echo "perfect linting standards! moving ahead ..."
- make build
- ./bin/service &
- export ENV=test
Expand All @@ -39,7 +43,7 @@ script:
- diff -u <(echo -n) <(gofmt -d ./src ./tsdb)
- echo "perfect go format. moving ahead ..."
- cd view/web/ && npm start && cd ../..
- go test service/controllers/controllers_test.go
- go test -v ./...
- cd tests/
- npm install
- xvfb-run -s "-screen 0 1920x1080x16" -a mocha test.js
Binary file removed service/bin/jarvis
View file
Open in desktop
Binary file not shown.
8 changes: 5 additions & 3 deletions service/config/index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@ var config Configuration
// init reads and stores data from config.json
func init() {
ENV := os.Getenv("ENV")
fmt.Println("env is ", ENV)
prefix := ""
if ENV == "test" {
prefix = "../"
prefix = "../../"
}

jsonFile, err := os.Open(fmt.Sprintf("%sstatic/config.json", prefix))
Expand All @@ -35,7 +34,10 @@ func init() {
if ioError != nil {
logger.Error(ioError)
}
json.Unmarshal(byteValue, &config)
if err := json.Unmarshal(byteValue, &config); err != nil {
panic(err)
}

fmt.Println("loaded configuration")
defer jsonFile.Close()
}
Expand Down
86 changes: 66 additions & 20 deletions service/controllers/ast.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,10 @@ func AST(routeObject response, w http.ResponseWriter) {
}

jData, _ := json.Marshal(responseJSON)
w.Write(jData)
if _, err := w.Write(jData); err != nil {
panic(err)
}

TextToSpeech(responseJSON.Message, 0)

} else if matchPars == "yahoo" {
Expand All @@ -96,7 +99,10 @@ func AST(routeObject response, w http.ResponseWriter) {
}

jData, _ := json.Marshal(responseJSON)
w.Write(jData)
if _, err := w.Write(jData); err != nil {
panic(err)
}

TextToSpeech(responseJSON.Message, 0)

} else if matchPars == "bing" {
Expand All @@ -118,7 +124,10 @@ func AST(routeObject response, w http.ResponseWriter) {
}

jData, _ := json.Marshal(responseJSON)
w.Write(jData)
if _, err := w.Write(jData); err != nil {
panic(err)
}

TextToSpeech(responseJSON.Message, 0)

} else if matchPars == "youtube" || matchPars == "videos" || matchPars == "watch" {
Expand All @@ -139,7 +148,10 @@ func AST(routeObject response, w http.ResponseWriter) {
}

jData, _ := json.Marshal(responseJSON)
w.Write(jData)
if _, err := w.Write(jData); err != nil {
panic(err)
}

TextToSpeech(responseJSON.Message, 0)

} else if matchPars == "images" || matchPars == "image" {
Expand All @@ -159,13 +171,18 @@ func AST(routeObject response, w http.ResponseWriter) {
}

jData, _ := json.Marshal(responseJSON)
w.Write(jData)
if _, err := w.Write(jData); err != nil {
panic(err)
}

TextToSpeech(responseJSON.Message, 0)

} else if matchPars == "weather" {

if len(messageArr) < 3 {
w.Write([]byte(`{"status": "success", "message": "ENTER: weather <city> <state>", "result": ""}`))
if _, err := w.Write([]byte(`{"status": "success", "message": "ENTER: weather <city> <state>", "result": ""}`)); err != nil {
panic(err)
}
} else {
city, state := messageArr[len(messageArr)-2], messageArr[len(messageArr)-1]

Expand All @@ -176,13 +193,18 @@ func AST(routeObject response, w http.ResponseWriter) {
}

jData, _ := json.Marshal(response)
w.Write(jData)
if _, err := w.Write(jData); err != nil {
panic(err)
}

TextToSpeech(response.Message+city+" "+state, 0)
}
} else if matchPars == "meaning" {

if len(messageArr) == 1 {
w.Write([]byte(`{"status": "success", "message": "ENTER: meaning <word>", "result": ""}`))
if _, err := w.Write([]byte(`{"status": "success", "message": "ENTER: meaning <word>", "result": ""}`)); err != nil {
panic(err)
}
} else {

wordStr := remainingString
Expand All @@ -197,7 +219,10 @@ func AST(routeObject response, w http.ResponseWriter) {
}

jData, _ := json.Marshal(responseJSON)
w.Write(jData)
if _, err := w.Write(jData); err != nil {
panic(err)
}

TextToSpeech(responseJSON.Message+" "+filterForSpeech(wordStr), 0)

} else {
Expand All @@ -212,13 +237,18 @@ func AST(routeObject response, w http.ResponseWriter) {
}

jData, _ := json.Marshal(responseJSON)
w.Write(jData)
if _, err := w.Write(jData); err != nil {
panic(err)
}

TextToSpeech(responseJSON.Message+" "+filterForSpeech(wordStr), 0)
}
}
} else if matchPars == "medicine" {
if len(messageArr) <= 1 {
w.Write([]byte(`{"status": "success", "message": "ENTER: medicine <generic / common name>", "result": ""}`))
if _, err := w.Write([]byte(`{"status": "success", "message": "ENTER: medicine <generic / common name>", "result": ""}`)); err != nil {
panic(err)
}
} else {
med := messageArr[len(messageArr)-1]
result := messages.HealthMedController(med, w)
Expand All @@ -228,16 +258,20 @@ func AST(routeObject response, w http.ResponseWriter) {
// add support for multiple symptoms at once and use ML to determine the best medicine suited

if len(messageArr) < 2 {
w.Write([]byte(`{"status": "success", "message": "ENTER: symptoms <symptom / condition>", "result": ""}`))
if _, err := w.Write([]byte(`{"status": "success", "message": "ENTER: symptoms <symptom / condition>", "result": ""}`)); err != nil {
panic(err)
}

} else {
fmt.Println("inside")
symp := strings.Join(messageArr[1:len(messageArr)], " ")
symp := strings.Join(messageArr[1:], " ")
result := messages.HealthSympController(symp, w)
TextToSpeech(result, 0)
}
} else if strings.HasPrefix(strings.ToLower(message), "set reminder") {

w.Write([]byte(`{"status": "success", "message": "Enter Reminder details : ", "result": ""}`))
if _, err := w.Write([]byte(`{"status": "success", "message": "Enter Reminder details : ", "result": ""}`)); err != nil {
panic(err)
}

} else if strings.HasPrefix(strings.ToLower(message), "show reminder") {

Expand All @@ -248,7 +282,10 @@ func AST(routeObject response, w http.ResponseWriter) {
}

jData, _ := json.Marshal(responseJSON)
w.Write(jData)
if _, err := w.Write(jData); err != nil {
panic(err)
}

TextToSpeech("Here are your reminders.", 0)

} else if strings.HasPrefix(strings.ToLower(message), "deploy") {
Expand All @@ -259,7 +296,9 @@ func AST(routeObject response, w http.ResponseWriter) {

} else if strings.HasPrefix(strings.ToLower(message), "send mail") {

w.Write([]byte(`{"status": "success", "message": "Enter Mail details : ", "result": ""}`))
if _, err := w.Write([]byte(`{"status": "success", "message": "Enter Mail details : ", "result": ""}`)); err != nil {
panic(err)
}

} else {
// general conversation
Expand All @@ -275,12 +314,16 @@ func AST(routeObject response, w http.ResponseWriter) {
matchPars == "image" || matchPars == "weather" || matchPars == "medicine" || matchPars == "symptoms" ||
strings.HasPrefix(message, "send mail") {

w.Write([]byte(`{"status": "success", "message": "Services unavailable at the moment ! Check your Internet Connection and try again.", "result": ""}`))
if _, err := w.Write([]byte(`{"status": "success", "message": "Services unavailable at the moment ! Check your Internet Connection and try again.", "result": ""}`)); err != nil {
panic(err)
}
TextToSpeech("Services unavailable at the moment!", 0)

} else if strings.HasPrefix(message, "set reminder") {

w.Write([]byte(`{"status": "success", "message": "Enter Reminder details : ", "result": ""}`))
if _, err := w.Write([]byte(`{"status": "success", "message": "Enter Reminder details : ", "result": ""}`)); err != nil {
panic(err)
}

} else if strings.HasPrefix(message, "show reminder") {

Expand All @@ -291,7 +334,10 @@ func AST(routeObject response, w http.ResponseWriter) {
}

jData, _ := json.Marshal(responseJSON)
w.Write(jData)
if _, err := w.Write(jData); err != nil {
panic(err)
}

TextToSpeech("Here are your reminders.", 0)
} else {
// Conversation.
Expand Down
Loading