Skip to content
This repository was archived by the owner on Oct 2, 2023. It is now read-only.

Add selectel image store #101

Open
girokon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add selectel image store #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,6 @@ tags
*.sw[o-p]

profile.cov

#IDEA project files
.idea
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.5
FROM golang:1.6
RUN apt-get update && apt-get install -yqq aspell aspell-en libaspell-dev tesseract-ocr tesseract-ocr-eng imagemagick optipng exiftool libjpeg-progs webp
ADD docker/meme.traineddata /usr/share/tesseract-ocr/tessdata/meme.traineddata
ADD docker/imagemagick_policy.xml /etc/ImageMagick-6/policy.xml
Expand Down
33 changes: 9 additions & 24 deletions Godeps/Godeps.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions imagestore/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/mitchellh/goamz/aws"
"github.com/mitchellh/goamz/s3"

selectel "github.com/ernado/selectel/storage"
"golang.org/x/oauth2"
"golang.org/x/oauth2/google"
gcloud "google.golang.org/cloud"
Expand Down Expand Up @@ -40,6 +41,9 @@ func (this *Factory) NewImageStores() ImageStore {
case "memory":
store = NewInMemoryImageStore()
stores = append(stores, store)
case "selectel":
store = this.NewSelectelStore(configWrapper)
stores = append(stores, store)
default:
log.Fatalf("Unsupported store %s", configWrapper["Type"])
}
Expand Down Expand Up @@ -121,3 +125,15 @@ func (this *Factory) NewHashGenerator(store ImageStore) *HashGenerator {
hashGen.init()
return hashGen
}

func (this *Factory) NewSelectelStore(conf map[string]string) ImageStore {
user, key, container, rootPath := conf["user"], conf["key"], conf["container"], conf["rootPath"]
client, err := selectel.New(user, key)
if err != nil {
log.Fatal(err)
}

mapper := NewNamePathMapper(conf["NamePathRegex"], conf["NamePathMap"])

return NewSelectelImageStore(client, mapper, container, rootPath)
}
65 changes: 65 additions & 0 deletions imagestore/selectelstore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
package imagestore

import (
"fmt"
"github.com/ernado/selectel/storage"
"io"
"os"
"path"
)

type SelectelStore struct {
client storage.API
storeRoot string
container string
namePathMapper *NamePathMapper
}

func NewSelectelImageStore(client storage.API, mapper *NamePathMapper, container, root string) *SelectelStore {
return &SelectelStore{
client: client,
namePathMapper: mapper,
container: container,
storeRoot: root,
}
}

func (s *SelectelStore) Save(src string, obj *StoreObject) (*StoreObject, error) {
f, err := os.Open(src)
if err != nil {
return nil, err
}
defer f.Close()

pathToFile := s.toPath(obj)
container, name := s.toSelectelPath(pathToFile)
if err := s.client.Upload(f, container, name, obj.MimeType); err != nil {
return nil, fmt.Errorf("Selectel api returns error: %v", err)
}

obj.Url = s.client.URL(container, name)

return obj, nil
}
func (s *SelectelStore) Exists(obj *StoreObject) (bool, error) {
pathToFile := s.toPath(obj)
container, name := s.toSelectelPath(pathToFile)
_, err := s.client.ObjectInfo(container, name)
return err == nil, nil
}
func (s *SelectelStore) Get(obj *StoreObject) (io.ReadCloser, error) {
pathToFile := s.toPath(obj)
container, name := s.toSelectelPath(pathToFile)
return s.client.C(container).Object(name).GetReader()
}
func (s *SelectelStore) String() string {
return "SelectelStore"
}

func (s *SelectelStore) toPath(obj *StoreObject) string {
return s.storeRoot + "/" + s.namePathMapper.mapToPath(obj)
}

func (s *SelectelStore) toSelectelPath(fullPath string) (string, string) {
return path.Join(s.container, path.Dir(fullPath)), path.Base(fullPath)
}
56 changes: 56 additions & 0 deletions vendor/github.com/PagerDuty/godspeed/gspdtest/gspdtest.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions vendor/github.com/ernado/selectel/LICENSE
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

83 changes: 83 additions & 0 deletions vendor/github.com/ernado/selectel/storage/auth.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading