From e6a18ee7c876a3aa9f7ce062f62d1d27d7cf0978 Mon Sep 17 00:00:00 2001
From: Moe <github@m03.ca>
Date: Mon, 4 Nov 2019 08:47:20 -0800
Subject: [PATCH] set start time for uploaded video based on uploaded file name

---
 libs/videos.js         | 2 +-
 libs/webServerPaths.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/videos.js b/libs/videos.js
index a2cf27f4..9c6550ac 100644
--- a/libs/videos.js
+++ b/libs/videos.js
@@ -114,7 +114,7 @@ module.exports = function(s,config,lang){
                 k.filesizeMB = parseFloat((k.filesize/1000000).toFixed(2))
 
                 k.startTime = new Date(s.nameToTime(k.file))
-                k.endTime = new Date(k.stat.mtime)
+                k.endTime = new Date(k.endTime || k.stat.mtime)
                 if(config.useUTC === true){
                     fs.rename(k.dir+k.file, k.dir+s.formattedTime(k.startTime)+'.'+e.ext, (err) => {
                         if (err) return console.error(err);
diff --git a/libs/webServerPaths.js b/libs/webServerPaths.js
index 26627ed5..44ba1d8b 100644
--- a/libs/webServerPaths.js
+++ b/libs/webServerPaths.js
@@ -1795,7 +1795,6 @@ module.exports = function(s,config,lang,app,io){
                 res.end(user.lang['Not Permitted'])
                 return
             }
-            var time = new Date()
             var origURL = req.originalUrl.split('/')
             var videoParam = origURL[origURL.indexOf(req.params.auth) + 1]
             var videoSet = 'Videos'
@@ -1805,7 +1804,6 @@ module.exports = function(s,config,lang,app,io){
                 if(r && r[0]){
                     var monitor = r[0]
                     // req.query.overwrite === '1'
-                    var filename = s.formattedTime(time) + '.' + monitor.ext
                     if(s.group[req.params.ke] && s.group[req.params.ke].activeMonitors[req.params.id]){
                         try {
                             if(!req.files) {
@@ -1815,6 +1813,8 @@ module.exports = function(s,config,lang,app,io){
                                 });
                             } else {
                                 let video = req.files.video;
+                                var time = new Date(parseInt(video.name.split('.')[0]))
+                                var filename = s.formattedTime(time) + '.' + monitor.ext
                                 video.mv(s.getVideoDirectory(monitor) +  filename,function(){
                                     s.insertCompletedVideo(monitor,{
                                         file : filename
@@ -1835,7 +1835,7 @@ module.exports = function(s,config,lang,app,io){
                             }
                         } catch (err) {
                             response.err = err
-                            res.status(500).send(response)
+                            res.status(500).end(response)
                         }
                     }else{
                         response.error = 'Non Existant Monitor'