Fix search command

Author: uetchy

Makefile

@@ -1,14 +1,16 @@
 ALFRED_WORKFLOW_PATH ?= ~/Library/Application Support/Alfred 2/Alfred.alfredpreferences/workflows
-BUNDLE_ID = "co.randompaper.alfred-qiita-workflow"
-PACKAGE_FILE = "info.plist"
+BUNDLE_ID = co.randompaper.alfred-qiita-workflow
+PACKAGE_FILE = info.plist
+SYMLINK_TARGET = ${ALFRED_WORKFLOW_PATH}/${BUNDLE_ID}
 
 run:
 	go run *.go
 
 link:
-	TARGET := "$(ALFRED_WORKFLOW_PATH)/$(BUNDLE_ID)"
-	# mkdir -p "${TARGET}"
-	# ln -sf "`pwd`", "$(TARGET)"
+	ln -sf "$(PWD)" "${SYMLINK_TARGET}"
 
 unlink:
-	rm "$ALFRED_WORKFLOW_PATH/$BUNDLE_ID"
+	rm "${SYMLINK_TARGET}"
+
+build:
+	gox -osarch="darwin/amd64" -output="bin/{{.OS}}_{{.Arch}}"

config.go

@@ -14,13 +14,9 @@ type config struct {
 
 var C config
 
-func getHomeDir() string {
-	currentUser, _ := user.Current()
-	return currentUser.HomeDir
-}
-
 func getDefaultConfigPath() string {
-	return filepath.Join(getHomeDir(), "Library/Application Support/Alfred 2/Workflow Data/", bundleId)
+	currentUser, _ := user.Current()
+	return filepath.Join(currentUser.HomeDir, "Library/Application Support/Alfred 2/Workflow Data/", bundleId)
 }
 
 func loadConfig() error {
@@ -49,7 +45,7 @@ func saveConfig() error {
 		return err
 	}
 
-	f, err := os.Create(configPath + "/config.json")
+	f, err := os.Create(filepath.Join(configPath, "config.json"))
 	if err != nil {
 		return err
 	}

info.plist

@@ -4,6 +4,8 @@
 <dict>
 	<key>bundleid</key>
 	<string>co.randompaper.qiita.alfred</string>
+	<key>category</key>
+	<string>Internet</string>
 	<key>connections</key>
 	<dict>
 		<key>21557827-8003-42B7-A042-16D4C9278FEC</key>
@@ -65,7 +67,7 @@
 	<key>createdby</key>
 	<string>Yasuaki Uechi</string>
 	<key>description</key>
-	<string>The workflow to search articles on Qiita</string>
+	<string>Search articles from Qiita</string>
 	<key>disabled</key>
 	<false/>
 	<key>name</key>
@@ -105,7 +107,7 @@
 				<key>keyword</key>
 				<string>qiita setup</string>
 				<key>subtext</key>
-				<string>RUN: qiita setup &lt;name&gt; &lt;password&gt;</string>
+				<string>qiita setup &lt;personal access token&gt;</string>
 				<key>text</key>
 				<string>Qiita Setup</string>
 				<key>withspace</key>
@@ -121,10 +123,12 @@
 		<dict>
 			<key>config</key>
 			<dict>
+				<key>concurrently</key>
+				<false/>
 				<key>escaping</key>
 				<integer>0</integer>
 				<key>script</key>
-				<string>ruby ./commands/setup.rb "{query}"</string>
+				<string>./bin/darwin_amd64 setup "{query}"</string>
 				<key>type</key>
 				<integer>0</integer>
 			</dict>
@@ -144,12 +148,20 @@
 				<integer>0</integer>
 				<key>keyword</key>
 				<string>qiita search</string>
+				<key>queuedelaycustom</key>
+				<integer>1</integer>
+				<key>queuedelayimmediatelyinitially</key>
+				<false/>
+				<key>queuedelaymode</key>
+				<integer>0</integer>
+				<key>queuemode</key>
+				<integer>1</integer>
 				<key>runningsubtext</key>
 				<string>Seaching for "{query}" ...</string>
 				<key>script</key>
-				<string>ruby ./commands/search.rb "{query}"</string>
+				<string>./bin/darwin_amd64 search "{query}"</string>
 				<key>subtext</key>
-				<string>Search Qiita for "{query}"</string>
+				<string>Search articles for "{query}"</string>
 				<key>title</key>
 				<string>Qiita Search Articles</string>
 				<key>type</key>
@@ -190,10 +202,18 @@
 				<integer>0</integer>
 				<key>keyword</key>
 				<string>qiita stocks</string>
+				<key>queuedelaycustom</key>
+				<integer>1</integer>
+				<key>queuedelayimmediatelyinitially</key>
+				<false/>
+				<key>queuedelaymode</key>
+				<integer>0</integer>
+				<key>queuemode</key>
+				<integer>1</integer>
 				<key>runningsubtext</key>
 				<string>Seaching for "{query}" ...</string>
 				<key>script</key>
-				<string>ruby ./commands/stocks.rb "{query}"</string>
+				<string>./bin/darwin_amd64 stocks "{query}"</string>
 				<key>subtext</key>
 				<string>Search stocks for "{query}"</string>
 				<key>title</key>
@@ -219,10 +239,18 @@
 				<integer>0</integer>
 				<key>keyword</key>
 				<string>qiita my</string>
+				<key>queuedelaycustom</key>
+				<integer>1</integer>
+				<key>queuedelayimmediatelyinitially</key>
+				<false/>
+				<key>queuedelaymode</key>
+				<integer>0</integer>
+				<key>queuemode</key>
+				<integer>1</integer>
 				<key>runningsubtext</key>
 				<string>Searching for "{query}" ...</string>
 				<key>script</key>
-				<string>ruby ./commands/my.rb "{query}"</string>
+				<string>./bin/darwin_amd64 my "{query}"</string>
 				<key>subtext</key>
 				<string>Search my articles for "{query}"</string>
 				<key>title</key>
@@ -281,6 +309,6 @@
 		</dict>
 	</dict>
 	<key>webaddress</key>
-	<string>http://randompaper.co</string>
+	<string>https://github.com/uetchy/alfred-qiita-workflow</string>
 </dict>
 </plist>

main.go

@@ -2,17 +2,36 @@ package main
 
 import (
 	"github.com/codegangsta/cli"
+	"github.com/spf13/viper"
+	"github.com/uetchy/alfred-qiita-workflow/qiita"
+	"golang.org/x/oauth2"
 	"os"
 )
 
 const (
 	bundleId = "co.randompaper.alfred-qiita-workflow"
 )
 
+func newQiitaClient() (*qiita.Client, error) {
+	err := loadConfig()
+	if err != nil {
+		return nil, err
+	}
+	accessToken := viper.GetString("accessToken")
+	if accessToken == "" {
+		return nil, err
+	}
+	ts := oauth2.StaticTokenSource(
+		&oauth2.Token{AccessToken: accessToken},
+	)
+	tc := oauth2.NewClient(oauth2.NoContext, ts)
+	client := qiita.NewClient(tc)
+	return client, nil
+}
+
 func main() {
 	app := cli.NewApp()
-	app.Name = "qiita"
-	// app.Usage = "fight the loneliness!"
+	app.Name = "alfred-qiita"
 	app.Commands = []cli.Command{
 		{
 			Name:   "search",

qiita/items.go

@@ -13,20 +13,15 @@ type ItemsService struct {
 type Item struct {
 	RenderedBody *string    `json:"rendered_body"`
 	Body         *string    `json:"body"`
-	Coediting    *bool      `json:"coediting"`
+	CoEditing    *bool      `json:"coediting"`
 	CreatedAt    *time.Time `json:"created_at"`
 	Id           *string    `json:"id"`
 	Private      *bool      `json:"private"`
 	Tags         []Tag      `json:"tags"`
 	Title        *string    `json:"title"`
 	UpdatedAt    *time.Time `json:"updated_at"`
 	URL          *string    `json:"url"`
-	// TODO: User
-}
-
-type Tag struct {
-	Name     *string  `json:"name"`
-	Versions []string `json:"versions"`
+	User         *User      `json:"user"`
 }
 
 type ItemsListOptions struct {

qiita/qiita.go

@@ -4,8 +4,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"io"
-	// "io/ioutil"
-	"fmt"
 	"github.com/google/go-querystring/query"
 	"net/http"
 	"net/url"
@@ -64,7 +62,6 @@ func NewClient(httpClient *http.Client) *Client {
 		httpClient = http.DefaultClient
 	}
 	baseURL, _ := url.Parse(defaultBaseURL)
-	fmt.Println(baseURL)
 
 	c := &Client{client: httpClient, BaseURL: baseURL, UserAgent: userAgent}
 	c.Items = &ItemsService{client: c}

qiita/tag.go

@@ -0,0 +1,6 @@
+package qiita
+
+type Tag struct {
+	Name     *string  `json:"name"`
+	Versions []string `json:"versions"`
+}

qiita/user.go

@@ -0,0 +1,19 @@
+package qiita
+
+type User struct {
+	Name              *string `json:"name"`
+	Description       *string `json:"description"`
+	FacebookId        *string `json:"facebook_id"`
+	FolloweesCount    *int    `json:"followees_count"`
+	FollowersCount    *int    `json:"followers_count"`
+	GithubLoginName   *string `json:"github_login_name"`
+	Id                *string `json:"id"`
+	ItemsCount        *int    `json:"items_count"`
+	LinkedInId        *string `json:"linkedin_id"`
+	Location          *string `json:"location"`
+	Organization      *string `json:"organization"`
+	PermanentId       *int    `json:"permanent_id"`
+	ProfileImageURL   *string `json:"profile_image_url"`
+	TwitterScreenName *string `json:"twitter_screen_name"`
+	WebsiteURL        *string `json:"website_url"`
+}

search.go

@@ -1,41 +1,29 @@
 package main
 
 import (
-	"fmt"
+	// "fmt"
 	"github.com/codegangsta/cli"
 	"github.com/pascalw/go-alfred"
-	"github.com/spf13/viper"
 	"github.com/uetchy/alfred-qiita-workflow/qiita"
-	"golang.org/x/oauth2"
+	"strings"
 )
 
 func cmdSearch(c *cli.Context) {
-	query := c.Args().First()
-
-	loadConfig()
-	ts := oauth2.StaticTokenSource(
-		&oauth2.Token{AccessToken: viper.GetString("accessToken")},
-	)
-	tc := oauth2.NewClient(oauth2.NoContext, ts)
-	client := qiita.NewClient(tc)
+	query := strings.Join(c.Args(), " ")
+	client, err := newQiitaClient()
+	if err != nil {
+		return
+	}
 
-	// Fetch items
 	items, _, _ := client.Items.List(&qiita.ItemsListOptions{Query: query})
-	fmt.Println(*items[0].Title)
-
-	// alfred.InitTerms(query)
-
 	response := alfred.NewResponse()
-
 	for _, item := range items {
-		// if !alfred.MatchesTerms(query, repo.Name) {
-		// 	continue
-		// }
 		response.AddItem(&alfred.AlfredResponseItem{
-			Valid: true,
-			Uid:   *item.Id,
-			Title: *item.Title,
-			Arg:   *item.URL,
+			Valid:    true,
+			Uid:      *item.Id,
+			Title:    *item.Title,
+			Arg:      *item.URL,
+			Subtitle: *item.User.Id + " " + item.CreatedAt.Format("2006/01/02 15:04:05"),
 		})
 	}
 

setup.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"github.com/codegangsta/cli"
 	"github.com/spf13/viper"
 )
@@ -10,5 +11,10 @@ func cmdSetup(c *cli.Context) {
 
 	loadConfig()
 	viper.Set("accessToken", token)
-	saveConfig()
+	err := saveConfig()
+	if err != nil {
+		fmt.Println(err)
+	}
+
+	fmt.Println("Token saved")
 }