Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

foursquare: Do venue photos requests userless 

This has a larger quota pool (5,000 > 500) so should
be much rarer to hit limits.

Fixes #764

Change-Id: I1015a93e996ef241523e5015c8c6e7c21b2a837f
This commit is contained in:
Eric Drechsel 2016-05-11 10:13:10 -07:00
parent 555b5cfd09
commit c013258f4b
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkg/importer/foursquare/foursquare.go
View File

@ -224,7 +224,7 @@ func (r *run) importCheckins() error {
for continueRequests { for continueRequests {
resp := checkinsList{} resp := checkinsList{}
if err := r.im.doAPI(r.Context(), r.token(), &resp, checkinsAPIPath, "limit", strconv.Itoa(limit), "offset", strconv.Itoa(offset)); err != nil { if err := r.im.doUserAPI(r.Context(), r.token(), &resp, checkinsAPIPath, "limit", strconv.Itoa(limit), "offset", strconv.Itoa(offset)); err != nil {
return err return err
} }
@ -316,8 +316,13 @@ func (r *run) importPhotos(placeNode *importer.Object, checkinWasDup bool) error
return nil return nil
} }
clientID, clientSecret, err := r.Credentials()
if err != nil {
return err
}
resp := photosList{} resp := photosList{}
if err := r.im.doAPI(r.Context(), r.token(), &resp, if err = r.im.doCredAPI(r.Context(), clientID, clientSecret, &resp,
"venues/"+placeNode.Attr(attrFoursquareId)+"/photos", "venues/"+placeNode.Attr(attrFoursquareId)+"/photos",
"limit", strconv.Itoa(nWant)); err != nil { "limit", strconv.Itoa(nWant)); err != nil {
return err return err
@ -450,7 +455,7 @@ func (r *run) getTopLevelNode(path string, title string) (*importer.Object, erro
func (im *imp) getUserInfo(ctx context.Context, accessToken string) (user, error) { func (im *imp) getUserInfo(ctx context.Context, accessToken string) (user, error) {
var ui userInfo var ui userInfo
if err := im.doAPI(ctx, accessToken, &ui, "users/self"); err != nil { if err := im.doUserAPI(ctx, accessToken, &ui, "users/self"); err != nil {
return user{}, err return user{}, err
} }
if ui.Response.User.Id == "" { if ui.Response.User.Id == "" {
@ -459,14 +464,31 @@ func (im *imp) getUserInfo(ctx context.Context, accessToken string) (user, error
return ui.Response.User, nil return ui.Response.User, nil
} }
func (im *imp) doAPI(ctx context.Context, accessToken string, result interface{}, apiPath string, keyval ...string) error { // doUserAPI makes requests to the Foursquare API with a user token.
// https://developer.foursquare.com/overview/auth#requests
func (im *imp) doUserAPI(ctx context.Context, accessToken string, result interface{}, apiPath string, keyval ...string) error {
form := url.Values{}
form.Set("oauth_token", accessToken)
return im.doAPI(ctx, form, result, apiPath, keyval...)
}
// doCredAPI makes userless requests to the Foursquare API, which have a larger
// quota than user requests for some endpoints.
// https://developer.foursquare.com/overview/auth#userless
// https://developer.foursquare.com/overview/ratelimits
func (im *imp) doCredAPI(ctx context.Context, clientID, clientSecret string, result interface{}, apiPath string, keyval ...string) error {
form := url.Values{}
form.Set("client_id", clientID)
form.Set("client_secret", clientSecret)
return im.doAPI(ctx, form, result, apiPath, keyval...)
}
func (im *imp) doAPI(ctx context.Context, form url.Values, result interface{}, apiPath string, keyval ...string) error {
if len(keyval)%2 == 1 { if len(keyval)%2 == 1 {
panic("Incorrect number of keyval arguments") panic("Incorrect number of keyval arguments")
} }
form := url.Values{}
form.Set("v", apiVersion) // 4sq requires this to version their API form.Set("v", apiVersion) // 4sq requires this to version their API
form.Set("oauth_token", accessToken)
for i := 0; i < len(keyval); i += 2 { for i := 0; i < len(keyval); i += 2 {
form.Set(keyval[i], keyval[i+1]) form.Set(keyval[i], keyval[i+1])
} }