taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into add-hackernews-module

Browse Source
This commit is contained in:
Chris Cummer 2018-08-03 13:22:35 -04:00 committed by GitHub
commit a40e03f085
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.codeclimate.yml
View File

@ -1,5 +1,5 @@
version: "2"
checks:
similar-code:
config:
threshold: 3
checks:
similar-code:
config:
threshold: 3

4
Makefile
View File

@ -11,6 +11,10 @@ install:
go install -ldflags="-s -w -X main.version=$(shell git describe --always --abbrev=6) -X main.date=$(shell date +%FT%T%z)"
which wtf
lint:
structcheck ./...
varcheck ./...
run: build
bin/wtf

2
clocks/display.go
View File

@ -8,7 +8,7 @@ import (
func (widget *Widget) display(clocks []Clock) {
if len(clocks) == 0 {
fmt.Fprintf(widget.View, "\n%s", " no timezone data available")
widget.View.SetText(fmt.Sprintf("\n%s", " no timezone data available"))
return
}

2
gerrit/display.go
View File

@ -10,7 +10,7 @@ func (widget *Widget) display() {
project := widget.currentGerritProject()
if project == nil {
fmt.Fprintf(widget.View, "%s", " Gerrit project data is unavailable (1)")
widget.View.SetText(fmt.Sprintf("%s", " Gerrit project data is unavailable (1)"))
return
}

14
gitlab/widget.go
View File

@ -32,13 +32,8 @@ type Widget struct {
}
func NewWidget(app *tview.Application, pages *tview.Pages) *Widget {
apiKey := wtf.Config.UString(
"wtf.mods.gitlab.apiKey",
os.Getenv("WTF_GITLAB_TOKEN"),
)
baseURL := wtf.Config.UString("wtf.mods.gitlab.domain")
gitlab := glb.NewClient(nil, apiKey)
gitlab := glb.NewClient(nil, apiKey())
if baseURL != "" {
gitlab.SetBaseURL(baseURL)
@ -92,6 +87,13 @@ func (widget *Widget) Prev() {
/* -------------------- Unexported Functions -------------------- */
func apiKey() string {
return wtf.Config.UString(
"wtf.mods.gitlab.apiKey",
os.Getenv("WTF_GITLAB_TOKEN"),
)
}
func (widget *Widget) buildProjectCollection(projectData map[string]interface{}) []*GitlabProject {
gitlabProjects := []*GitlabProject{}

2
logger/log.go
View File

@ -36,7 +36,7 @@ func Log(msg string) {
return
}
f, err := os.OpenFile(logFilePath(), os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
f, err := os.OpenFile(logFilePath(), os.O_RDWR|os.O_CREATE|os.O_APPEND, 0600)
if err != nil {
log.Fatalf("error opening file: %v", err)
}

5
main.go
View File

@ -131,7 +131,10 @@ func refreshAllWidgets() {
}
func setTerm() {
os.Setenv("TERM", Config.UString("wtf.term", os.Getenv("TERM")))
err := os.Setenv("TERM", Config.UString("wtf.term", os.Getenv("TERM")))
if err != nil {
return
}
}
func watchForConfigChanges(app *tview.Application, configFilePath string, grid *tview.Grid, pages *tview.Pages) {

4
travisci/client.go
View File

@ -13,8 +13,6 @@ import (
"github.com/senorprogrammer/wtf/wtf"
)
const APIEnvToken = "WTF_TRAVIS_API_TOKEN"
var TRAVIS_HOSTS = map[bool]string{
false: "travis-ci.org",
true: "travis-ci.com",
@ -75,7 +73,7 @@ func travisRequest(path string) (*http.Response, error) {
func apiToken() string {
return wtf.Config.UString(
"wtf.mods.travisci.apiKey",
os.Getenv(APIEnvToken),
os.Getenv("WTF_TRAVIS_API_TOKEN"),
)
}