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

Use eve native database driver

Browse Source
This commit is contained in:
Francesco Siddi
2015-10-11 22:16:30 +02:00
parent 919083e0e9
commit 2cc0d0a5b5
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,6 @@ from flask import abort
from flask import jsonify from flask import jsonify
from flask import send_from_directory from flask import send_from_directory
from application import app from application import app
from application import db
from application import post_item from application import post_item
from application.utils.imaging import generate_local_thumbnails from application.utils.imaging import generate_local_thumbnails
from application.utils.imaging import get_video_data from application.utils.imaging import get_video_data
@@ -48,13 +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']
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_ = db.files.find({"path": "{0}".format(file_path)}) file_ = files.find({"path": "{0}".format(file_path)})
file_ = file_[0] file_ = file_[0]
if file_id: if file_id:
file_ = db.files.find_one({"_id": ObjectId(file_id)}) file_ = files.find_one({"_id": ObjectId(file_id)})
file_path = file_['name'] file_path = file_['name']
user = file_['user'] user = file_['user']
@@ -120,6 +120,8 @@ def process_file(src_file):
"""Process the file """Process the file
""" """
files_collection = app.data.driver.db['files']
file_abs_path = os.path.join(app.config['SHARED_DIR'], src_file['name']) file_abs_path = os.path.join(app.config['SHARED_DIR'], src_file['name'])
src_file['length'] = os.stat(file_abs_path).st_size src_file['length'] = os.stat(file_abs_path).st_size
# Remove properties that do not belong in the collection # Remove properties that do not belong in the collection
@@ -181,7 +183,7 @@ def process_file(src_file):
backend='pillar', backend='pillar',
path=filename) path=filename)
file_object_id = db.files.save(file_object) file_object_id = files_collection.save(file_object)
# Append the ObjectId to the new list # Append the ObjectId to the new list
variations[v] = file_object_id variations[v] = file_object_id
@@ -194,10 +196,10 @@ def process_file(src_file):
# Update size data after encoding # Update size data after encoding
# (TODO) update status (non existing now) # (TODO) update status (non existing now)
file_size = os.stat(path).st_size file_size = os.stat(path).st_size
variation = db.files.find_one(variations[v]) variation = files_collection.find_one(variations[v])
variation['length'] = file_size variation['length'] = file_size
# print variation # print variation
file_asset = db.files.find_and_modify( file_asset = files_collection.find_and_modify(
{'_id': variations[v]}, {'_id': variations[v]},
variation) variation)