@@ -4,14 +4,11 @@ import (
44 "bytes"
55 "context"
66 "encoding/json"
7- "errors"
87 "fmt"
8+ "github.com/tidwall/gjson"
99 "io/ioutil"
1010 "net/http"
11- "strings"
1211 "time"
13-
14- "github.com/valyala/fastjson"
1512)
1613
1714const (
@@ -27,7 +24,7 @@ const (
2724 xErrorHeader = "X-Error"
2825 xErrorCodeHeader = "X-Error-Code"
2926
30- defaultTimeout = time .Second * 5
27+ defaultTimeout = time .Second * 10
3128)
3229
3330// Client is a getpocket API client
@@ -39,7 +36,7 @@ type Client struct {
3936// NewClient creates a new client with your application key (to generate a key, create your application here: https://getpocket.com/developer/apps)
4037func NewClient (consumerKey string ) (* Client , error ) {
4138 if consumerKey == "" {
42- return nil , errors . New ("empty consumer key" )
39+ return nil , fmt . Errorf ("empty consumer key" )
4340 }
4441
4542 return & Client {
@@ -79,56 +76,63 @@ func (c *Client) Retrieving(ctx context.Context, input RetrievingInput) ([]Item,
7976 return nil , err
8077 }
8178
82- values , err := c .doHTTP (ctx , endpointRetrieving , req )
79+ result , err := c .doHTTP (ctx , endpointRetrieving , req )
8380 if err != nil {
8481 return nil , err
8582 }
8683
87- if values .GetObject ("list" ) == nil {
88- return nil , nil
89- }
84+ return c .getItems (result ), nil
85+ }
9086
91- return c .parseItems (values ), nil
87+ func (c * Client ) getItems (result gjson.Result ) []Item {
88+ var items []Item
89+ for itemId := range result .Get ("list" ).Map () {
90+ item := newItem (itemId )
91+ item .fillFields (result )
92+ items = append (items , item )
93+ }
94+ return items
9295}
9396
9497// Authorize returns the Authorization structure with the access token, user name and state obtained from the authorization request
9598func (c * Client ) Authorize (ctx context.Context , requestToken string ) (Authorization , error ) {
9699 if requestToken == "" {
97- return Authorization {}, errors . New ("empty request token" )
100+ return Authorization {}, fmt . Errorf ("empty request token" )
98101 }
99102
100103 body := requestAuthorization {
101104 ConsumerKey : c .consumerKey ,
102105 Code : requestToken ,
103106 }
104107
105- values , err := c .doHTTP (ctx , endpointRequestAuthorize , body )
108+ result , err := c .doHTTP (ctx , endpointRequestAuthorize , body )
106109 if err != nil {
107110 return Authorization {}, err
108111 }
109112
110- accessToken := values .GetStringBytes ("access_token" )
111- username := values .GetStringBytes ("username" )
112- state := values .GetStringBytes ("state" )
113- if string (accessToken ) == "" {
114- return Authorization {}, errors .New ("empty access token in API response" )
113+ accessToken := result .Get ("access_token" ).String ()
114+ username := result .Get ("username" ).String ()
115+ state := result .Get ("state" ).String ()
116+
117+ if accessToken == "" {
118+ return Authorization {}, fmt .Errorf ("empty access token in API response" )
115119 }
116120
117121 return Authorization {
118- AccessToken : string ( accessToken ) ,
119- Username : string ( username ) ,
120- State : string ( state ) ,
122+ AccessToken : accessToken ,
123+ Username : username ,
124+ State : state ,
121125 }, nil
122126}
123127
124128// GetAuthorizationURL returns the url string that is used to grant the user access rights to his Pocket account in your application
125129func (c * Client ) GetAuthorizationURL (requestToken , redirectURL string ) (string , error ) {
126130 if requestToken == "" {
127- return "" , errors . New ("empty request token" )
131+ return "" , fmt . Errorf ("empty request token" )
128132 }
129133
130134 if redirectURL == "" {
131- return "" , errors . New ("empty redirection URL" )
135+ return "" , fmt . Errorf ("empty redirection URL" )
132136 }
133137
134138 return fmt .Sprintf (authorizeUrl , requestToken , redirectURL ), nil
@@ -139,7 +143,7 @@ func (c *Client) GetAuthorizationURL(requestToken, redirectURL string) (string,
139143// State - metadata string that will be returned at each subsequent authentication response (if you don't need it, specify an empty string).
140144func (c * Client ) GetRequestToken (ctx context.Context , redirectURL string , state string ) (string , error ) {
141145 if redirectURL == "" {
142- return "" , errors . New ("empty redirect URL" )
146+ return "" , fmt . Errorf ("empty redirect URL" )
143147 }
144148
145149 body := requestToken {
@@ -148,84 +152,52 @@ func (c *Client) GetRequestToken(ctx context.Context, redirectURL string, state
148152 State : state ,
149153 }
150154
151- values , err := c .doHTTP (ctx , endpointRequestToken , body )
155+ result , err := c .doHTTP (ctx , endpointRequestToken , body )
152156 if err != nil {
153157 return "" , err
154158 }
155159
156- token := values .GetStringBytes ("code" )
157- if string (token ) == "" {
158- return "" , errors .New ("empty request token in API response" )
159- }
160-
161- return string (token ), nil
162- }
163-
164- func (c * Client ) parseItems (values * fastjson.Value ) []Item {
165- const indexForItemId int = 13
166-
167- var (
168- items []Item
169- itemId string
170- index int
171- )
172-
173- newJsonStr := values .GetObject ("list" ).String ()
174- for index != - 1 {
175- index = strings .Index (newJsonStr , ":{\" item_id\" :\" " )
176- if index != - 1 {
177- for i := index + indexForItemId ; string (newJsonStr [i ]) != "\" " ; i ++ {
178- itemId += string (newJsonStr [i ])
179- }
180-
181- items = append (items , createItem (itemId , values ))
182-
183- itemId = ""
184- oldJsonStr := newJsonStr
185- newJsonStr = ``
186-
187- for i := index + indexForItemId ; i != len (oldJsonStr ); i ++ {
188- newJsonStr += string (oldJsonStr [i ])
189- }
190- }
160+ token := result .Get ("code" ).String ()
161+ if token == "" {
162+ return "" , fmt .Errorf ("empty request token in API response" )
191163 }
192164
193- return items
165+ return token , nil
194166}
195167
196- func (c * Client ) doHTTP (ctx context.Context , endpoint string , body interface {}) (* fastjson. Value , error ) {
168+ func (c * Client ) doHTTP (ctx context.Context , endpoint string , body interface {}) (gjson. Result , error ) {
197169 b , err := json .Marshal (body )
198170 if err != nil {
199- return nil , fmt .Errorf ("an error occurred when marshal the input body: %s" , err .Error ())
171+ return gjson. Result {} , fmt .Errorf ("an error occurred when marshal the input body: %s" , err .Error ())
200172 }
201173
202174 req , err := http .NewRequestWithContext (ctx , "POST" , host + endpoint , bytes .NewBufferString (string (b )))
203175 if err != nil {
204- return nil , fmt .Errorf ("an error occurred when creating the query: %s" , err .Error ())
176+ return gjson. Result {} , fmt .Errorf ("an error occurred when creating the query: %s" , err .Error ())
205177 }
206178
207179 req .Header .Set ("Content-Type" , "application/json; charset=UTF-8" )
208180 req .Header .Set ("X-Accept" , "application/json" )
209181
210182 resp , err := c .client .Do (req )
211183 if err != nil {
212- return nil , fmt .Errorf ("an error occurred when sending a request to the Pocket server: %s" , err .Error ())
184+ return gjson. Result {} , fmt .Errorf ("an error occurred when sending a request to the Pocket server: %s" , err .Error ())
213185 }
214186 defer resp .Body .Close ()
215187
216188 if resp .StatusCode != http .StatusOK {
217- return nil , fmt .Errorf ("API error %s: %s" , resp .Header .Get (xErrorCodeHeader ), resp .Header .Get (xErrorHeader ))
189+ return gjson. Result {} , fmt .Errorf ("API error %s: %s" , resp .Header .Get (xErrorCodeHeader ), resp .Header .Get (xErrorHeader ))
218190 }
219191
220192 respBody , err := ioutil .ReadAll (resp .Body )
221193 if err != nil {
222- return nil , fmt .Errorf ("an error occurred when reading the request body: %s" , err .Error ())
194+ return gjson. Result {} , fmt .Errorf ("an error occurred when reading the request body: %s" , err .Error ())
223195 }
224196
225- values , err := fastjson .Parse (string (respBody ))
226- if err != nil {
227- return nil , fmt .Errorf ("an error occurred while parsing the response body: %s" , err . Error () )
197+ result := gjson .Parse (string (respBody ))
198+ if result . String () == "" {
199+ return gjson. Result {} , fmt .Errorf ("failed to parse response body" )
228200 }
229201
230- return values , nil
202+ return result , nil
231203}
0 commit comments