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 git-repo-newline

Browse Source
This commit is contained in:
Chris Cummer 2018-06-08 15:21:02 -07:00 committed by GitHub
commit a02f67ed55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jira/client.go
View File

@ -12,11 +12,12 @@ import (
"strings" "strings"
) )
func IssuesFor(username string, project string, jql string) (*SearchResult, error) { func IssuesFor(username string, projects []string, jql string) (*SearchResult, error) {
query := []string{} query := []string{}
if project != "" { var projQuery = getProjectQuery(projects)
query = append(query, buildJql("project", project)) if projQuery != "" {
query = append(query, projQuery)
} }
if username != "" { if username != "" {
@ -88,3 +89,18 @@ func parseJson(obj interface{}, text io.Reader) {
} }
} }
} }
func getProjectQuery(projects []string) string {
singleEmptyProject := len(projects) == 1 && len(projects[0]) == 0
if len(projects) == 0 || singleEmptyProject {
return ""
} else if len(projects) == 1 {
return buildJql("project", projects[0])
}
quoted := make([]string, len(projects))
for i := range projects {
quoted[i] = fmt.Sprintf("\"%s\"", projects[i])
}
return fmt.Sprintf("project in (%s)", strings.Join(quoted, ", "))
}

20
jira/widget.go
View File

@ -25,7 +25,7 @@ func NewWidget() *Widget {
/* -------------------- Exported Functions -------------------- */ /* -------------------- Exported Functions -------------------- */
func (widget *Widget) Refresh() { func (widget *Widget) Refresh() {
searchResult, err := IssuesFor(Config.UString("wtf.mods.jira.username"), Config.UString("wtf.mods.jira.project", ""), Config.UString("wtf.mods.jira.jql", "")) searchResult, err := IssuesFor(Config.UString("wtf.mods.jira.username"), getProjects(), Config.UString("wtf.mods.jira.jql", ""))
widget.UpdateRefreshedAt() widget.UpdateRefreshedAt()
@ -81,3 +81,21 @@ func (widget *Widget) issueTypeColor(issue *Issue) string {
return color return color
} }
func getProjects() []string {
// see if project is set to a single string
configPath := "wtf.mods.jira.project"
singleProject, err := Config.String(configPath)
if err == nil {
return []string{singleProject}
}
// else, assume list
projList := Config.UList(configPath)
var ret []string
for _, proj := range projList {
if str, ok := proj.(string); ok {
ret = append(ret, str)
}
}
return ret
}