archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Refactored files to files_collection for better clarity

Browse Source 
Also, we inherit the backend property from the parent file when
creating variations.
This commit is contained in:
Francesco Siddi
2015-10-13 11:48:47 +02:00
parent 165af08e12
commit f8e7e7ff12
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pillar/application/modules/file_storage/__init__.py
View File

@@ -47,14 +47,14 @@ def browse_gcs(bucket_name, subdir, file_path=None):
@file_storage.route('/build_thumbnails/<path:file_path>') @file_storage.route('/build_thumbnails/<path:file_path>')
def build_thumbnails(file_path=None, file_id=None): def build_thumbnails(file_path=None, file_id=None):
files = app.data.driver.db['files'] files_collection = app.data.driver.db['files']
if file_path: if file_path:
# Search file with backend "pillar" and path=file_path # Search file with backend "pillar" and path=file_path
file_ = files.find({"path": "{0}".format(file_path)}) file_ = files_collection.find({"path": "{0}".format(file_path)})
file_ = file_[0] file_ = file_[0]
if file_id: if file_id:
file_ = files.find_one({"_id": ObjectId(file_id)}) file_ = files_collection.find_one({"_id": ObjectId(file_id)})
file_path = file_['name'] file_path = file_['name']
user = file_['user'] user = file_['user']
@@ -87,7 +87,7 @@ def build_thumbnails(file_path=None, file_id=None):
length=thumbnail['length'], length=thumbnail['length'],
md5=thumbnail['md5'], md5=thumbnail['md5'],
filename=basename, filename=basename,
backend='pillar', backend=file_['backend'],
path=path) path=path)
# Commit to database # Commit to database
r = post_item('files', file_object) r = post_item('files', file_object)
@@ -180,7 +180,7 @@ def process_file(src_file):
length=0, # Available after encode length=0, # Available after encode
md5="", # Available after encode md5="", # Available after encode
filename=os.path.split(filename)[1], filename=os.path.split(filename)[1],
backend='pillar', backend=src_file['backend'],
path=filename) path=filename)
file_object_id = files_collection.save(file_object) file_object_id = files_collection.save(file_object)
@@ -217,7 +217,7 @@ def process_file(src_file):
sync_path = file_abs_path sync_path = file_abs_path
remote_storage_sync(sync_path) remote_storage_sync(sync_path)
files = app.data.driver.db['files'] files_collection = app.data.driver.db['files']
file_asset = files.find_and_modify( file_asset = files_collection.find_and_modify(
{'_id': src_file['_id']}, {'_id': src_file['_id']},
src_file) src_file)