update media types

khanhtc1202 · Jan 18, 2018 · a193253 · a193253
1 parent c8c41f4
commit a193253
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
-media/*
+media/*.mp4
+media/*.mkv
 node_modules/
 *.pyc
 *.log
diff --git a/media/.gitkeep b/media/.gitkeep
diff --git a/server/config/index.js b/server/config/index.js
@@ -11,7 +11,8 @@ var config = {
             mediaPath: rootPath + '/../media/',
             mediaDummyPath: rootPath + '/../dummy_files/nope.mp4',
             logPath: rootPath + '/../logs/run.log',
-            mediaBaseUrl: 'http://fromnoobstogeeks.com:7001/'
+            mediaBaseUrl: 'http://fromnoobstogeeks.com:7001/',
+            mediaTypes: ['.mp4', '.mkv']
         },
         port: port
     },
@@ -23,7 +24,8 @@ var config = {
             mediaPath: rootPath + '/../media/',
             mediaDummyPath: rootPath + '/../dummy_files/nope.mp4',
             logPath: rootPath + '/../logs/run.log',
-            mediaBaseUrl: 'http://fromnoobstogeeks.com:7001/'
+            mediaBaseUrl: 'http://fromnoobstogeeks.com:7001/',
+            mediaTypes: ['.mp4', '.mkv']
         },
         port: port
     }

diff --git a/server/controllers/videos.js b/server/controllers/videos.js
@@ -1,16 +1,19 @@
 module.exports = function(config, utils) {
     var fs = require('fs');
+    var path = require('path');
     var obj = {};
 
     obj.list = function(req, res, next) {
         var mediaFiles = [];
         fs.readdirSync(config.app.mediaPath).forEach(function(file) {
-            mediaFiles[mediaFiles.length] = {
-                "name": file,
-                "url": utils.createUrl('video', file),
-                "delete": utils.createUrl('delete', file)
-            };
-            console.log("Loaded file " + file + " ready to view!");
+            if (config.app.mediaTypes.indexOf(path.extname(file)) > -1) {
+                mediaFiles[mediaFiles.length] = {
+                    "name": file,
+                    "url": utils.createUrl('video', file),
+                    "delete": utils.createUrl('delete', file)
+                };
+                console.log("Loaded file " + file + " ready to view!");
+            }
         });
         res.render('videos', { 'data': mediaFiles });
     };