Skip to content

Commit 5178050

Browse files
committed
Revert "Merge pull request #3 from y-yagi/gocui"
This reverts commit e19c7b8, reversing changes made to 7206043.
1 parent e19c7b8 commit 5178050

File tree

2 files changed

+3
-131
lines changed

2 files changed

+3
-131
lines changed

Diff for: gui.go

-102
This file was deleted.

Diff for: main.go

+3-29
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,11 @@ import (
1313
yaml "gopkg.in/yaml.v2"
1414

1515
"github.com/dghubble/go-twitter/twitter"
16-
"github.com/jroimartin/gocui"
1716
runewidth "github.com/mattn/go-runewidth"
1817
"github.com/olekukonko/tablewriter"
1918
"github.com/pkg/errors"
2019
)
2120

22-
var tweets []twitter.Tweet
23-
2421
// Config manage config info
2522
type Config struct {
2623
TwitterConsumerKey string `yaml:"twitterConsumerKey"`
@@ -99,7 +96,7 @@ func updateStatus(egose *Egose) error {
9996
return nil
10097
}
10198

102-
func showTweetsWithTable(tweets []twitter.Tweet) {
99+
func showTweets(tweets []twitter.Tweet) {
103100
table := tablewriter.NewWriter(os.Stdout)
104101
table.SetHeader([]string{"User", "Text", "URL"})
105102
for _, tweet := range tweets {
@@ -108,26 +105,6 @@ func showTweetsWithTable(tweets []twitter.Tweet) {
108105
table.Render()
109106
}
110107

111-
func showTweetsWithGui() error {
112-
g, err := gocui.NewGui(gocui.OutputNormal)
113-
if err != nil {
114-
return errors.Wrap(err, "gui create error")
115-
}
116-
defer g.Close()
117-
118-
g.Cursor = true
119-
g.SetManagerFunc(layout)
120-
121-
if err := keybindings(g); err != nil {
122-
return errors.Wrap(err, "key bindings error")
123-
}
124-
125-
if err := g.MainLoop(); err != nil && err != gocui.ErrQuit {
126-
return errors.Wrap(err, "unexpected error")
127-
}
128-
return nil
129-
}
130-
131108
func main() {
132109
config, err := loadConfig()
133110

@@ -140,6 +117,7 @@ func main() {
140117
var user string
141118
var count int
142119
var status bool
120+
var tweets []twitter.Tweet
143121

144122
flag.StringVar(&query, "q", "", "Search query")
145123
flag.StringVar(&user, "u", "", "Show user timeline")
@@ -170,9 +148,5 @@ func main() {
170148
fmt.Printf("twitter API Error:%v\n", err)
171149
os.Exit(1)
172150
}
173-
174-
if err = showTweetsWithGui(); err != nil {
175-
fmt.Printf("%v\n", err)
176-
os.Exit(1)
177-
}
151+
showTweets(tweets)
178152
}

0 commit comments

Comments
 (0)