ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

set start time for uploaded video based on uploaded file name

pushover
Moe 2019-11-04 08:47:20 -08:00
parent 147f3c0051
commit e6a18ee7c8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/videos.js
View File

@ -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);

6
libs/webServerPaths.js
View File

@ -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'