From 5d2fc89137e9df4bad3e6d941a943ba9bcb42709 Mon Sep 17 00:00:00 2001 From: Henrique Santos Date: Sat, 12 Mar 2016 04:35:49 -0300 Subject: [PATCH] scaffolding project methods --- .../app/coffee/AWSSDKPersistorManager.coffee | 4 ++++ .../filestore/app/coffee/FSPersistorManager.coffee | 4 ++++ .../filestore/app/coffee/ProjectController.coffee | 4 ++-- services/filestore/app/coffee/ProjectHandler.coffee | 13 +++++++++++++ .../filestore/app/coffee/S3PersistorManager.coffee | 4 ++++ 5 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 services/filestore/app/coffee/ProjectHandler.coffee diff --git a/services/filestore/app/coffee/AWSSDKPersistorManager.coffee b/services/filestore/app/coffee/AWSSDKPersistorManager.coffee index d0101b93a4..0c5cb959f9 100644 --- a/services/filestore/app/coffee/AWSSDKPersistorManager.coffee +++ b/services/filestore/app/coffee/AWSSDKPersistorManager.coffee @@ -85,3 +85,7 @@ module.exports = return callback err callback null, data.ETag? + getProjectSize:(bucketName, key, callback)-> + logger.log bucketName:bucketName, key:key, "get project size in s3" + callback null, 1024 + diff --git a/services/filestore/app/coffee/FSPersistorManager.coffee b/services/filestore/app/coffee/FSPersistorManager.coffee index d1b72806cf..17f11217c1 100644 --- a/services/filestore/app/coffee/FSPersistorManager.coffee +++ b/services/filestore/app/coffee/FSPersistorManager.coffee @@ -87,3 +87,7 @@ module.exports = fs.exists "#{location}/#{filteredName}", (exists) -> logger.log location:location, name:filteredName, exists:exists, "checked if file exists" callback null, exists + + getProjectSize:(location, name, callback)-> + logger.log location:location, name:name, "get project size in file system" + callback null, 1024 diff --git a/services/filestore/app/coffee/ProjectController.coffee b/services/filestore/app/coffee/ProjectController.coffee index 5ac64dd632..21f30f117b 100644 --- a/services/filestore/app/coffee/ProjectController.coffee +++ b/services/filestore/app/coffee/ProjectController.coffee @@ -10,9 +10,9 @@ module.exports = projectController = metrics.inc "projectSize" {project_id, bucket} = req logger.log project_id:project_id, bucket:bucket, "reciving request to project size" - FileHandler.getFile bucket, project_id, req, (err)-> + ProjectHandler.getSize bucket, project_id, req, (err, size)-> if err? logger.log err: err, project_id: project_id, bucket: bucket, "error inserting file" res.send 500 else - res.send 200 \ No newline at end of file + res.json {'total bytes' : size} \ No newline at end of file diff --git a/services/filestore/app/coffee/ProjectHandler.coffee b/services/filestore/app/coffee/ProjectHandler.coffee new file mode 100644 index 0000000000..e6022c4aa3 --- /dev/null +++ b/services/filestore/app/coffee/ProjectHandler.coffee @@ -0,0 +1,13 @@ +settings = require("settings-sharelatex") +PersistorManager = require("./PersistorManager") +logger = require("logger-sharelatex") +async = require("async") + +module.exports = + + getSize: (bucket, project_id, opts = {}, callback)-> + logger.log bucket:bucket, project_id:project_id, opts:opts, "getting project size" + PersistorManager.getProjectSize bucket, project_id, opts, (err, size)-> + if err? + logger.err bucket:bucket, project_id:project_id, opts:opts, "error getting size" + callback err, size \ No newline at end of file diff --git a/services/filestore/app/coffee/S3PersistorManager.coffee b/services/filestore/app/coffee/S3PersistorManager.coffee index 15798185a3..b6380eceb8 100644 --- a/services/filestore/app/coffee/S3PersistorManager.coffee +++ b/services/filestore/app/coffee/S3PersistorManager.coffee @@ -137,3 +137,7 @@ module.exports = exists = res.statusCode == 200 logger.log bucketName:bucketName, key:key, exists:exists, "checked if file exsists in s3" callback(err, exists) + + getProjectSize:(bucketName, key, callback)-> + logger.log bucketName:bucketName, key:key, "get project size in s3" + callback null, 1024