fix bug suppression

Author: Samy Laumonier

meteor/lib/collections/collections.js

@@ -18,5 +18,11 @@ Collection.Files.helpers({
     },
     numeralSize: function () {
         return numeral(this.size).format('0.00 b');
+    },
+    cleanOutputFormat: function () {
+        return this.outputFormat || '-';
+    },
+    cleanOutputSize: function () {
+        return this.outputSize ? numeral(this.outputSize).format('0.00 b') : '-';
     }
 });

meteor/lib/tabulars/file.js

@@ -4,10 +4,14 @@ new Tabular.Table({
         createdBy: userId
     }),
     collection: Collection.Files,
+    responsive: true,
+    autoWidth: false,
     columns: [
-        { data: 'originalName', title: 'Name' },
-        { data: 'ext', title: 'Format' },
-        { data: 'numeralSize()', title: 'Size' },
+        { data: 'originalName', title: 'Original name' },
+        { data: 'ext', title: 'Original format' },
+        { data: 'numeralSize()', title: 'Original size' },
+        { data: 'cleanOutputFormat()', title: 'Output format' },
+        { data: 'cleanOutputSize()', title: 'Output size' },
         { data: 'state()', title: 'Status' },
         {
             tmpl: Meteor.isClient && Template.profileFileActions,
@@ -17,5 +21,5 @@ new Tabular.Table({
             title: 'Actions'
         }
     ],
-    extraFields: ['id', 'size', 'status', 'isAudio', 'isVideo', 'price', 'outputFormat']
+    extraFields: ['id', 'size', 'status', 'isAudio', 'isVideo', 'price', 'outputFormat', 'outputSize']
 });

meteor/server/file/method.js

@@ -123,7 +123,8 @@ Meteor.methods({
 
                 Collection.Files.update(fileId, {
                     $set: {
-                        status: 'converted'
+                        status: 'converted',
+                        outputSize: fileInfo.size
                     }
                 });
 
@@ -141,20 +142,34 @@ Meteor.methods({
     },
     deleteFile: (fileId) => {
         const file = getFile(fileId);
-        const filePath = Meteor.settings.data + file.path;
 
-        if (fs.existsSync(filePath)) {
-            fs.unlinkSync(filePath);
-        }
+        if (file.status === 'new') {
+            const filePath = Meteor.settings.data + file.path;
+
+            if (fs.existsSync(filePath)) {
+                fs.unlinkSync(filePath);
+            }
 
-        const size = file.size;
+            Collection.Files.remove(fileId);
+            Meteor.users.update(Meteor.userId(), {
+                $inc: {
+                    'profile.diskUsage': -file.size
+                }
+            });
+        } else if (file.status === 'converted') {
+            const filePath = `${Meteor.settings.data}/${file.id}.${file.outputFormat}`;
 
-        Collection.Files.remove(fileId);
-        Meteor.users.update(Meteor.userId(), {
-            $inc: {
-                'profile.diskUsage': -size
+            if (fs.existsSync(filePath)) {
+                fs.unlinkSync(filePath);
             }
-        });
+
+            Collection.Files.remove(fileId);
+            Meteor.users.update(Meteor.userId(), {
+                $inc: {
+                    'profile.diskUsage': -file.outputSize
+                }
+            });
+        }
     }
 });
 

scripts/worker/worker.py

@@ -30,7 +30,6 @@ def extract_part(is_video, input_path, start_at, stop_at):
     template = "ffmpeg -y -i {} -ss {} -t {} {}"
     t = '%.2f' % round(stop_at - start_at, 2)
     command = template.format(input_path, start_at, t, input_part_path)
-    print(command)
     check_call(shlex.split(command), universal_newlines=True)
 
     return input_part_path