Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas

Browse source 
Conflicts:
	airtime_mvc/application/models/Schedule.php
This commit is contained in:
drigato 2014-11-12 15:08:35 -05:00
commit 97b74a0997
7 changed files with 42 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
python_apps/pypo/pypofile.py
View file

@ -136,9 +136,9 @@ class PypoFile(Thread):
"""
If an object_name exists the file is stored on Amazon S3
"""
if 'object_name' in media_item:
if 'amazonS3_resource_id' in media_item:
csd = CloudStorageDownloader()
csd.download_obj(media_item['dst'], media_item['object_name'])
csd.download_obj(media_item['dst'], media_item['amazonS3_resource_id'])
media_item['file_ready'] = True
else:
self.copy_file(media_item)