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

Image pipeline should upload images with image/jpeg content type. closes #257

This commit is contained in:
Daniel Grana 2010-10-25 15:56:07 -02:00
parent 2873c4d9fe
commit 99096cdacf
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scrapy/contrib/pipeline/images.py
View File

@ -80,6 +80,12 @@ class S3ImagesStore(object):
AWS_ACCESS_KEY_ID = None
AWS_SECRET_ACCESS_KEY = None
POLICY = 'public-read'
HEADERS = {
'Cache-Control': 'max-age=172800',
'Content-Type': 'image/jpeg',
}
def __init__(self, uri):
assert uri.startswith('s3://')
self.bucket, self.prefix = uri[5:].split('/', 1)
@ -107,15 +113,14 @@ class S3ImagesStore(object):
def persist_image(self, key, image, buf, info):
"""Upload image to S3 storage"""
width, height = image.size
headers = {'Cache-Control': 'max-age=172800'} # 2 days of cache
b = self._get_boto_bucket()
key_name = '%s%s' % (self.prefix, key)
k = b.new_key(key_name)
k.set_metadata('width', str(width))
k.set_metadata('height', str(height))
buf.seek(0)
return threads.deferToThread(k.set_contents_from_file, buf, headers, \
policy='public-read')
return threads.deferToThread(k.set_contents_from_file, buf, \
headers=self.HEADERS, policy=self.POLICY)
class ImagesPipeline(MediaPipeline):