mise en place node-celery

Author: Samy Laumonier

.data/.tmp/.gitkeep renamed to .data/tmp/.gitkeep

@@ -1,13 +1,5 @@
 Template.profileFileActions.events({
     'click .convert': function (event, template) {
-        const button = $(event.target);
-
-        if (button.is(':disabled')) {
-            return false;
-        }
-
-        button.prop('disabled', true);
-
         const modal = ReactiveModal.initDialog({
             template: Template.profileAskFormat,
             title: 'Convert your file',
@@ -42,6 +34,10 @@ Template.profileFileActions.events({
             });
         });
 
+        modal.buttons.convert.on('cancel', () => {
+            button.prop('disabled', false);
+        });
+
         modal.show();
     },
     'click .delete': function (event, template) {

meteor/client/pages/profile/file/actions.js

@@ -0,0 +1,5 @@
+#upload .progress-label {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}

meteor/client/pages/profile/profile.css

@@ -6,7 +6,7 @@ new Tabular.Table({
     collection: Collection.Files,
     columns: [
         { data: 'originalName', title: 'Name' },
-        { data: 'type', title: 'Type' },
+        { data: 'ext', title: 'Format' },
         { data: 'numeralSize()', title: 'Size' },
         { data: 'state()', title: 'Status' },
         {
@@ -17,5 +17,5 @@ new Tabular.Table({
             title: 'Actions'
         }
     ],
-    extraFields: ['size', 'status', 'ext', 'isAudio', 'isVideo', 'price']
+    extraFields: ['size', 'status', 'isAudio', 'isVideo', 'price']
 });

meteor/lib/tabulars/file.js

@@ -9,6 +9,7 @@
     "download-file": "^0.1.5",
     "fibers": "^1.0.13",
     "fs": "0.0.2",
+    "hiredis": "^0.4.1",
     "mime": "^1.3.4",
     "node-celery": "^0.2.6"
   }

meteor/package.json

@@ -12,12 +12,12 @@ Collection.Files.before.insert(function (userId, doc) {
 
     doc.createdBy = user._id;
     doc.status = 'new';
-    doc.ext = _.last(doc.type.split('/'));
+    doc.ext = _.last(doc.originalName.split('.'));
 
     doc.isAudio = _.contains(Meteor.settings.public.formats.audio, doc.ext);
     doc.isVideo = _.contains(Meteor.settings.public.formats.video, doc.ext);
 
-    const price = doc.size / 1048576;
+    const price = doc.size / 1048576 * 0.01;
     doc.price = price.toFixed(2);
 });
 

meteor/server/file/hook.js

@@ -3,6 +3,7 @@ import url from 'url';
 import mime from 'mime';
 import download from 'download-file';
 import Future from 'fibers/future';
+import celery from 'node-celery';
 
 Meteor.methods({
     uploadFromUrl: function (link) {
@@ -83,18 +84,52 @@ Meteor.methods({
             }
         });
 
-        // TODO: call celery
+        const client = celery.createClient({
+            CELERY_BROKER_URL: Meteor.settings.broker,
+            CELERY_RESULT_BACKEND: 'amqp'
+        });
+
+        client.on('error', err => {
+            console.log(err);
+        });
+
+        client.on('connect', Meteor.bindEnvironment(() => {
+            const inputPath = `/data${file.path}`;
+            
+            client.call('core.process_file', [file.isVideo, inputPath, outputFormat], Meteor.bindEnvironment(outputPath => {
+                client.end();
+
+                if (fs.existsSync(inputPath)) {
+                    fs.unlinkSync(inputPath);
+                }
+
+                if (fs.existsSync(outputPath)) {
+                    const newPath = outputPath.replace('/tmp', '');
+                    fs.renameSync(outputPath, newPath);
+                }
+                
+                console.log('outputPath:', outputPath);
+
+                Collection.Files.update(fileId, {
+                    $set: {
+                        status: 'converted'
+                    }
+                });
+
+                Meteor.users.update(Meteor.userId(), {
+                    $inc: {
+                        'profile.diskUsage': -size
+                    }
+                });
+            }));
+        }));
     },
     deleteFile: (fileId) => {
         const file = getFile(fileId);
         const filePath = Meteor.settings.data + file.path;
 
         if (fs.existsSync(filePath)) {
-            fs.unlink(filePath, error => {
-                if (error) {
-                    throw new Meteor.Error(error.toString());
-                }
-            });
+            fs.unlinkSync(filePath);
         }
 
         const size = file.size;