mirror of https://github.com/perkeep/perkeep.git
remove go-flickr from third_party
Change-Id: Ic71d2f1964fbde26b8bd8d8a322d5de4743832da
This commit is contained in:
Brad Fitzpatrick
parent
1a8875c87a
commit
615c85c3dc
|
|
@ -1,19 +0,0 @@
|
|||
Copyright (C) 2011 by Matthew Nolan Caudill (nolan@nolancaudill.com)
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
===================================================
|
||||
go-flickr: A interface to Flickr's API in Google Go
|
||||
Author: Nolan Caudill
|
||||
Date: 2011-01-10
|
||||
License: MIT
|
||||
===================================================
|
||||
|
||||
This is a simple wrapper in Go to talk to Flickr.
|
||||
|
||||
I wrote this mainly as an exercise to learn Go but it is functional.
|
||||
|
||||
I don't really know Go so if you see something that could be more idiomatic or written better, please let me know!
|
||||
|
||||
The godoc below is the best place to learn how to use this library.
|
||||
|
||||
To compile and install:
|
||||
make
|
||||
make install
|
||||
|
||||
To test:
|
||||
gotest
|
||||
|
||||
=======================================================================
|
||||
|
||||
PACKAGE
|
||||
|
||||
package flickr
|
||||
import "."
|
||||
|
||||
TYPES
|
||||
|
||||
type Error string
|
||||
|
||||
func (e Error) String() string
|
||||
|
||||
type Request struct {
|
||||
ApiKey string
|
||||
Method string
|
||||
Args map[string]string
|
||||
}
|
||||
|
||||
func (request *Request) Execute() (response string, ret os.Error)
|
||||
|
||||
func (request *Request) Replace(filename string, filetype string) (response string, err os.Error)
|
||||
|
||||
func (request *Request) Sign(secret string)
|
||||
|
||||
func (request *Request) URL() string
|
||||
|
||||
func (request *Request) Upload(filename string, filetype string) (response string, err os.Error)
|
||||
Example:
|
||||
r.Upload("thumb.jpg", "image/jpeg")
|
||||
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
Thanks to:
|
||||
|
||||
Nigel Tao for his help in golang-nuts
|
||||
|
|
@ -1,218 +0,0 @@
|
|||
package flickr
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"crypto/md5"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"os"
|
||||
"sort"
|
||||
)
|
||||
|
||||
const (
|
||||
endpoint = "http://api.flickr.com/services/rest/?"
|
||||
uploadEndpoint = "http://api.flickr.com/services/upload/"
|
||||
replaceEndpoint = "http://api.flickr.com/services/replace/"
|
||||
apiHost = "api.flickr.com"
|
||||
)
|
||||
|
||||
type Request struct {
|
||||
ApiKey string
|
||||
Method string
|
||||
Args map[string]string
|
||||
Client *http.Client // if nil, http.DefaultClient is used
|
||||
}
|
||||
|
||||
type nopCloser struct {
|
||||
io.Reader
|
||||
}
|
||||
|
||||
func (nopCloser) Close() error { return nil }
|
||||
|
||||
type Error string
|
||||
|
||||
func (e Error) Error() string {
|
||||
return string(e)
|
||||
}
|
||||
|
||||
func (request *Request) Sign(secret string) {
|
||||
args := request.Args
|
||||
|
||||
// Remove api_sig
|
||||
delete(args, "api_sig")
|
||||
|
||||
sorted_keys := make([]string, len(args)+2)
|
||||
|
||||
args["api_key"] = request.ApiKey
|
||||
args["method"] = request.Method
|
||||
|
||||
// Sort array keys
|
||||
i := 0
|
||||
for k := range args {
|
||||
sorted_keys[i] = k
|
||||
i++
|
||||
}
|
||||
sort.Strings(sorted_keys)
|
||||
|
||||
// Build out ordered key-value string prefixed by secret
|
||||
s := secret
|
||||
for _, key := range sorted_keys {
|
||||
if args[key] != "" {
|
||||
s += fmt.Sprintf("%s%s", key, args[key])
|
||||
}
|
||||
}
|
||||
|
||||
// Since we're only adding two keys, it's easier
|
||||
// and more space-efficient to just delete them
|
||||
// them copy the whole map
|
||||
delete(args, "api_key")
|
||||
delete(args, "method")
|
||||
|
||||
// Have the full string, now hash
|
||||
hash := md5.New()
|
||||
hash.Write([]byte(s))
|
||||
|
||||
// Add api_sig as one of the args
|
||||
args["api_sig"] = fmt.Sprintf("%x", hash.Sum(nil))
|
||||
}
|
||||
|
||||
func (request *Request) URL() string {
|
||||
args := request.Args
|
||||
|
||||
args["api_key"] = request.ApiKey
|
||||
args["method"] = request.Method
|
||||
|
||||
s := endpoint + encodeQuery(args)
|
||||
return s
|
||||
}
|
||||
|
||||
func (request *Request) Execute() (response string, ret error) {
|
||||
if request.ApiKey == "" || request.Method == "" {
|
||||
return "", Error("Need both API key and method")
|
||||
}
|
||||
|
||||
s := request.URL()
|
||||
|
||||
res, err := http.Get(s)
|
||||
defer res.Body.Close()
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
body, _ := ioutil.ReadAll(res.Body)
|
||||
return string(body), nil
|
||||
}
|
||||
|
||||
func encodeQuery(args map[string]string) string {
|
||||
i := 0
|
||||
s := bytes.NewBuffer(nil)
|
||||
for k, v := range args {
|
||||
if i != 0 {
|
||||
s.WriteString("&")
|
||||
}
|
||||
i++
|
||||
s.WriteString(k + "=" + url.QueryEscape(v))
|
||||
}
|
||||
return s.String()
|
||||
}
|
||||
|
||||
func (request *Request) buildPost(url_ string, filename string, filetype string) (*http.Request, error) {
|
||||
f, err := os.Open(filename)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
stat, err := f.Stat()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
f_size := stat.Size
|
||||
|
||||
request.Args["api_key"] = request.ApiKey
|
||||
|
||||
boundary, end := "----###---###--flickr-go-rules", "\r\n"
|
||||
|
||||
// Build out all of POST body sans file
|
||||
header := bytes.NewBuffer(nil)
|
||||
for k, v := range request.Args {
|
||||
header.WriteString("--" + boundary + end)
|
||||
header.WriteString("Content-Disposition: form-data; name=\"" + k + "\"" + end + end)
|
||||
header.WriteString(v + end)
|
||||
}
|
||||
header.WriteString("--" + boundary + end)
|
||||
header.WriteString("Content-Disposition: form-data; name=\"photo\"; filename=\"photo.jpg\"" + end)
|
||||
header.WriteString("Content-Type: " + filetype + end + end)
|
||||
|
||||
footer := bytes.NewBufferString(end + "--" + boundary + "--" + end)
|
||||
|
||||
body_len := int64(header.Len()) + int64(footer.Len()) + f_size
|
||||
|
||||
r, w := io.Pipe()
|
||||
go func() {
|
||||
pieces := []io.Reader{header, f, footer}
|
||||
|
||||
for _, k := range pieces {
|
||||
_, err = io.Copy(w, k)
|
||||
if err != nil {
|
||||
w.CloseWithError(nil)
|
||||
return
|
||||
}
|
||||
}
|
||||
f.Close()
|
||||
w.Close()
|
||||
}()
|
||||
|
||||
http_header := make(http.Header)
|
||||
http_header.Add("Content-Type", "multipart/form-data; boundary="+boundary)
|
||||
|
||||
postRequest := &http.Request{
|
||||
Method: "POST",
|
||||
RawURL: url_,
|
||||
Host: apiHost,
|
||||
Header: http_header,
|
||||
Body: r,
|
||||
ContentLength: body_len,
|
||||
}
|
||||
return postRequest, nil
|
||||
}
|
||||
|
||||
// Example:
|
||||
// r.Upload("thumb.jpg", "image/jpeg")
|
||||
func (request *Request) Upload(filename string, filetype string) (response string, err error) {
|
||||
postRequest, err := request.buildPost(uploadEndpoint, filename, filetype)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
return request.sendPost(postRequest)
|
||||
}
|
||||
|
||||
func (request *Request) Replace(filename string, filetype string) (response string, err error) {
|
||||
postRequest, err := request.buildPost(replaceEndpoint, filename, filetype)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return request.sendPost(postRequest)
|
||||
}
|
||||
|
||||
func (r *Request) client() *http.Client {
|
||||
if r.Client != nil {
|
||||
return r.Client
|
||||
}
|
||||
return http.DefaultClient
|
||||
}
|
||||
|
||||
func (r *Request) sendPost(post *http.Request) (body string, err error) {
|
||||
resp, err := r.client().Do(post)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
rawBody, err := ioutil.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return string(rawBody), nil
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
package flickr
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestGetInfo(t *testing.T) {
|
||||
r := &Request{
|
||||
ApiKey: "YOURAPIKEYHERE",
|
||||
Method: "flickr.photos.getInfo",
|
||||
Args: map[string]string{
|
||||
"photo_id": "5356343650",
|
||||
},
|
||||
}
|
||||
|
||||
// Don't need to sign but might as well since we're testing
|
||||
r.Sign("YOURAPISECRETHERE")
|
||||
|
||||
fmt.Println(r.URL())
|
||||
|
||||
resp, err := r.Execute()
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
}
|
||||
fmt.Println(resp)
|
||||
}
|
||||
Loading…
Reference in New Issue