jpt-archive/oyster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pass a string as filedata in ExternalStoreTask

Browse Source
This commit is contained in:
James Turk 2011-10-04 12:46:32 -04:00
parent d3ed585a8c
commit e6c9cd6a06
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oyster/tasks.py
View File

@ -67,7 +67,7 @@ class ExternalStoreTask(Task):
def run(self, doc_id): def run(self, doc_id):
# get the document # get the document
doc = self.client.db.tracked.find_one({'_id': ObjectId(doc_id)}) doc = self.client.db.tracked.find_one({'_id': ObjectId(doc_id)})
filedata = self.client.get_version(doc['url']) filedata = self.client.get_version(doc['url']).read()
# put the document into the data store # put the document into the data store
result = self.upload_document(doc_id, filedata, doc['metadata']) result = self.upload_document(doc_id, filedata, doc['metadata'])
@ -92,7 +92,7 @@ class S3StoreTask(ExternalStoreTask):
bucket = self.s3conn.create_bucket(settings.AWS_BUCKET) bucket = self.s3conn.create_bucket(settings.AWS_BUCKET)
k = self.boto.s3.Key(bucket) k = self.boto.s3.Key(bucket)
k.key = doc_id k.key = doc_id
k.set_contents_from_string(filedata.read()) k.set_contents_from_string(filedata)
k.set_acl('public-read') k.set_acl('public-read')
url = 'http://%s.s3.amazonaws.com/%s' % (settings.AWS_BUCKET, doc_id) url = 'http://%s.s3.amazonaws.com/%s' % (settings.AWS_BUCKET, doc_id)