Merge pull request #5 from uetchy/fix-4

Fix #4

Author: uetchy

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (C) 2015 Yasuaki Uechi <http://randompaper.co>
+Copyright (C) 2016 Yasuaki Uechi (https://randompaper.co)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -52,7 +52,7 @@ qiita my <query:optional>
 
 ### Development Installation
 
-Run folloing commands to link this workflow to Alfred app manually.
+Run following commands to link this workflow to Alfred app manually.
 
 ```
 $ go get github.com/uetchy/alfred-qiita-workflow

config.go

@@ -2,21 +2,22 @@ package main
 
 import (
 	"encoding/json"
+	"github.com/mitchellh/go-homedir"
 	"github.com/spf13/viper"
 	"os"
-	"os/user"
 	"path/filepath"
 )
 
 type config struct {
 	AccessToken string `json:"accessToken"`
+	ID          string `json:"id"`
 }
 
-var C config
+var marshaledConfig config
 
 func getDefaultConfigPath() string {
-	currentUser, _ := user.Current()
-	return filepath.Join(currentUser.HomeDir, "Library/Application Support/Alfred 2/Workflow Data/", bundleId)
+	homeDir, _ := homedir.Dir()
+	return filepath.Join(homeDir, "Library/Application Support/Alfred 2/Workflow Data/", bundleID)
 }
 
 func loadConfig() error {
@@ -33,9 +34,9 @@ func loadConfig() error {
 
 func saveConfig() error {
 	configPath := getDefaultConfigPath()
-	viper.Marshal(&C)
+	viper.Unmarshal(&marshaledConfig)
 
-	buf, err := json.MarshalIndent(C, "", "    ")
+	buf, err := json.MarshalIndent(marshaledConfig, "", "    ")
 	if err != nil {
 		return err
 	}

info.plist

@@ -149,13 +149,13 @@
 				<key>keyword</key>
 				<string>qiita search</string>
 				<key>queuedelaycustom</key>
-				<integer>1</integer>
+				<integer>3</integer>
 				<key>queuedelayimmediatelyinitially</key>
 				<false/>
 				<key>queuedelaymode</key>
 				<integer>0</integer>
 				<key>queuemode</key>
-				<integer>1</integer>
+				<integer>2</integer>
 				<key>runningsubtext</key>
 				<string>Seaching for "{query}" ...</string>
 				<key>script</key>

main.go

@@ -9,24 +9,23 @@ import (
 )
 
 const (
-	bundleId = "co.randompaper.alfred-qiita-workflow"
+	bundleID = "co.randompaper.alfred-qiita-workflow"
 	version  = "2.0.0"
 )
 
 func newQiitaClient() (*qiita.Client, error) {
-	err := loadConfig()
-	if err != nil {
-		return nil, err
+	loadConfig()
+	var client *qiita.Client
+	if accessToken := viper.GetString("accessToken"); accessToken != "" {
+		ts := oauth2.StaticTokenSource(
+			&oauth2.Token{AccessToken: accessToken},
+		)
+		tc := oauth2.NewClient(oauth2.NoContext, ts)
+		client = qiita.NewClient(tc)
+	} else {
+		client = qiita.NewClient(nil)
 	}
-	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
 }
 

search.go

@@ -1,18 +1,20 @@
 package main
 
 import (
-	// "fmt"
+	"fmt"
 	"github.com/codegangsta/cli"
 	"github.com/pascalw/go-alfred"
 	"github.com/uetchy/go-qiita/qiita"
+	"os"
 	"strings"
 )
 
 func cmdSearch(c *cli.Context) {
 	query := strings.Join(c.Args(), " ")
 	client, err := newQiitaClient()
 	if err != nil {
-		return
+		fmt.Println(err)
+		os.Exit(1)
 	}
 
 	items, _, _ := client.Items.List(&qiita.ItemsListOptions{Query: query})

setup.go

@@ -4,16 +4,33 @@ import (
 	"fmt"
 	"github.com/codegangsta/cli"
 	"github.com/spf13/viper"
+	"github.com/uetchy/go-qiita/qiita"
+	"golang.org/x/oauth2"
+	"os"
 )
 
 func cmdSetup(c *cli.Context) {
 	token := c.Args().First()
 
+	ts := oauth2.StaticTokenSource(
+		&oauth2.Token{AccessToken: token},
+	)
+	tc := oauth2.NewClient(oauth2.NoContext, ts)
+	client := qiita.NewClient(tc)
+	user, err := client.AuthenticatedUser.Show()
+	if err != nil {
+		fmt.Println("Auth failed")
+		os.Exit(1)
+	}
+
 	loadConfig()
 	viper.Set("accessToken", token)
-	err := saveConfig()
+	viper.Set("id", user.Id)
+
+	err = saveConfig()
 	if err != nil {
 		fmt.Println(err)
+		os.Exit(1)
 	}
 
 	fmt.Println("Token saved")

stocks.go

@@ -3,6 +3,7 @@ package main
 import (
 	"github.com/codegangsta/cli"
 	"github.com/pascalw/go-alfred"
+	"github.com/spf13/viper"
 )
 
 func cmdStocks(c *cli.Context) {
@@ -11,7 +12,8 @@ func cmdStocks(c *cli.Context) {
 	if err != nil {
 		return
 	}
-	items, _, _ := client.Users.Stocks("uetchy", nil)
+
+	items, _, _ := client.Users.Stocks(viper.GetString("id"), nil)
 
 	alfred.InitTerms(query)
 	response := alfred.NewResponse()