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

useUTC fixes, SQLite with UTC changes fix

merge-requests/3/head
Moe 2018-06-18 23:17:28 -07:00
parent d0e4561df8
commit 2fa14306bb
2 changed files with 133 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
camera.js
View File

@ -884,25 +884,23 @@ s.video=function(x,e,k){
}) })
}); });
break; break;
case'archive':
if(!e.filename&&e.time){e.filename=s.formattedTime(e.time)}
if(!e.status){e.status=0}
e.details.archived="1"
e.save=[JSON.stringify(e.details),e.id,e.ke,s.nameToTime(e.filename)];
s.sqlQuery('UPDATE Videos SET details=? WHERE `mid`=? AND `ke`=? AND `time`=?',e.save,function(err,r){
s.tx({f:'video_edit',status:3,filename:e.filename+'.'+e.ext,mid:e.mid,ke:e.ke,time:s.nameToTime(e.filename)},'GRP_'+e.ke);
});
break;
case'delete': case'delete':
if(!e.filename&&e.time){e.filename=s.formattedTime(e.time)} if(!e.filename && e.time){
var filename e.filename = s.formattedTime(e.time)
}
var filename,
time
if(e.filename.indexOf('.')>-1){ if(e.filename.indexOf('.')>-1){
filename = e.filename filename = e.filename
}else{ }else{
filename = e.filename+'.'+e.ext filename = e.filename+'.'+e.ext
} }
if(!e.status){e.status=0} if(e.filename && !e.time){
e.save=[e.id,e.ke,s.nameToTime(filename)]; time = s.nameToTime(filename)
}else{
time = e.time
}
e.save=[e.id,e.ke,time];
s.sqlQuery('SELECT * FROM Videos WHERE `mid`=? AND `ke`=? AND `time`=?',e.save,function(err,r){ s.sqlQuery('SELECT * FROM Videos WHERE `mid`=? AND `ke`=? AND `time`=?',e.save,function(err,r){
if(r&&r[0]){ if(r&&r[0]){
r=r[0] r=r[0]
@ -917,6 +915,8 @@ s.video=function(x,e,k){
s.tx({f:'video_delete',filename:filename,mid:e.mid,ke:e.ke,time:s.nameToTime(filename),end:s.formattedTime(new Date,'YYYY-MM-DD HH:mm:ss')},'GRP_'+e.ke); s.tx({f:'video_delete',filename:filename,mid:e.mid,ke:e.ke,time:s.nameToTime(filename),end:s.formattedTime(new Date,'YYYY-MM-DD HH:mm:ss')},'GRP_'+e.ke);
s.file('delete',dir+filename) s.file('delete',dir+filename)
}) })
}else{
console.log(e)
} }
}) })
break; break;
@ -1028,7 +1028,8 @@ s.video=function(x,e,k){
}else{ }else{
queryString = '' queryString = ''
} }
v.href = '/'+k+'/videos/'+v.ke+'/'+v.mid+'/'+s.formattedTime(v.time)+'.'+v.ext; v.filename = s.formattedTime(v.time)+'.'+v.ext;
v.href = '/'+k+'/videos/'+v.ke+'/'+v.mid+'/'+v.filename;
v.links = { v.links = {
deleteVideo : v.href+'/delete' + queryString, deleteVideo : v.href+'/delete' + queryString,
changeToUnread : v.href+'/status/1' + queryString, changeToUnread : v.href+'/status/1' + queryString,
@ -1067,6 +1068,7 @@ s.video=function(x,e,k){
if(s.group[e.ke].usedSpace>(s.group[e.ke].sizeLimit*config.cron.deleteOverMaxOffset)){ if(s.group[e.ke].usedSpace>(s.group[e.ke].sizeLimit*config.cron.deleteOverMaxOffset)){
s.sqlQuery('SELECT * FROM Videos WHERE status != 0 AND details NOT LIKE \'%"archived":"1"%\' AND ke=? ORDER BY `time` ASC LIMIT 2',[e.ke],function(err,evs){ s.sqlQuery('SELECT * FROM Videos WHERE status != 0 AND details NOT LIKE \'%"archived":"1"%\' AND ke=? ORDER BY `time` ASC LIMIT 2',[e.ke],function(err,evs){
k.del=[];k.ar=[e.ke]; k.del=[];k.ar=[e.ke];
if(!evs)return console.log(err)
evs.forEach(function(ev){ evs.forEach(function(ev){
ev.dir=s.video('getDir',ev)+s.formattedTime(ev.time)+'.'+ev.ext; ev.dir=s.video('getDir',ev)+s.formattedTime(ev.time)+'.'+ev.ext;
k.del.push('(mid=? AND time=?)'); k.del.push('(mid=? AND time=?)');
@ -1130,8 +1132,8 @@ s.video=function(x,e,k){
}); });
k.filename = s.formattedTime(e.startTime)+'.'+e.ext k.filename = s.formattedTime(e.startTime)+'.'+e.ext
}else{ }else{
e.startTime = s.utcToLocal(e.startTime) // e.startTime = s.utcToLocal(e.startTime)
e.endTime = s.utcToLocal(e.endTime) // e.endTime = s.utcToLocal(e.endTime)
k.filename = k.file k.filename = k.file
} }
if(!e.ext){e.ext = k.filename.split('.')[1]} if(!e.ext){e.ext = k.filename.split('.')[1]}
@ -1174,9 +1176,9 @@ s.video=function(x,e,k){
filename:k.filename, filename:k.filename,
mid:e.mid, mid:e.mid,
ke:e.ke, ke:e.ke,
time:s.timeObject(e.startTime).format(), time:e.startTime,
size:e.filesize, size:e.filesize,
end:s.timeObject(e.endTime).format() end:e.endTime
},'GRP_'+e.ke,'video_view'); },'GRP_'+e.ke,'video_view');
} }
//cloud auto savers //cloud auto savers
@ -4407,6 +4409,43 @@ var tx;
break; break;
} }
}) })
//functions for retrieving cron announcements
cn.on('cron',function(d){
if(d.f==='init'){
if(config.cron.key){
if(config.cron.key===d.cronKey){
s.cron={started:moment(),last_run:moment(),id:cn.id};
}else{
cn.disconnect()
}
}else{
s.cron={started:moment(),last_run:moment(),id:cn.id};
}
}else{
if(s.cron&&cn.id===s.cron.id){
delete(d.cronKey)
switch(d.f){
case'filters':
s.filterEvents(d.ff,d);
break;
case's.tx':
s.tx(d.data,d.to)
break;
case's.video':
s.video(d.data,d.file)
break;
case'start':case'end':
d.mid='_cron';s.log(d,{type:'cron',msg:d.msg})
break;
default:
s.systemLog('CRON : ',d)
break;
}
}else{
cn.disconnect()
}
}
})
cn.on('disconnect', function () { cn.on('disconnect', function () {
if(cn.socketVideoStream){ if(cn.socketVideoStream){
cn.closeSocketVideoStream() cn.closeSocketVideoStream()
@ -4433,6 +4472,9 @@ var tx;
s.tx({f:'plugin_engine_unplugged',plug:cn.pluginEngine},'CPU') s.tx({f:'plugin_engine_unplugged',plug:cn.pluginEngine},'CPU')
delete(s.api[cn.pluginEngine]) delete(s.api[cn.pluginEngine])
} }
if(cn.cron){
delete(s.cron);
}
if(cn.ocv){ if(cn.ocv){
s.tx({f:'detector_unplugged',plug:s.ocv.plug},'CPU') s.tx({f:'detector_unplugged',plug:s.ocv.plug},'CPU')
delete(s.ocv); delete(s.ocv);
@ -5986,11 +6028,12 @@ app.get('/:auth/videos/:ke/:id/:file', function (req,res){
res.end(user.lang['Not Permitted']) res.end(user.lang['Not Permitted'])
return return
} }
var filename = s.nameToTime(req.params.file) var time = s.nameToTime(req.params.file)
if(req.query.isUTC === 'true'){ if(req.query.isUTC === 'true'){
filename = s.utcToLocal(filename) time = s.utcToLocal(time)
} }
s.sqlQuery('SELECT * FROM Videos WHERE ke=? AND mid=? AND time=?',[req.params.ke,req.params.id,filename],function(err,r){ time = new Date(time)
s.sqlQuery('SELECT * FROM Videos WHERE ke=? AND mid=? AND time=?',[req.params.ke,req.params.id,time],function(err,r){
if(r&&r[0]){ if(r&&r[0]){
req.dir=s.video('getDir',r[0])+req.params.file req.dir=s.video('getDir',r[0])+req.params.file
if (fs.existsSync(req.dir)){ if (fs.existsSync(req.dir)){
@ -6081,12 +6124,13 @@ app.get(['/:auth/videos/:ke/:id/:file/:mode','/:auth/videos/:ke/:id/:file/:mode/
res.end(user.lang['Not Permitted']) res.end(user.lang['Not Permitted'])
return return
} }
var filename = s.nameToTime(req.params.file) var time = s.nameToTime(req.params.file)
if(req.query.isUTC === 'true'){ if(req.query.isUTC === 'true'){
filename = s.utcToLocal(filename) time = s.utcToLocal(time)
} }
time = new Date(time)
req.sql='SELECT * FROM Videos WHERE ke=? AND mid=? AND time=?'; req.sql='SELECT * FROM Videos WHERE ke=? AND mid=? AND time=?';
req.ar=[req.params.ke,req.params.id,filename]; req.ar=[req.params.ke,req.params.id,time];
s.sqlQuery(req.sql,req.ar,function(err,r){ s.sqlQuery(req.sql,req.ar,function(err,r){
if(r&&r[0]){ if(r&&r[0]){
r=r[0];r.filename=s.formattedTime(r.time)+'.'+r.ext; r=r[0];r.filename=s.formattedTime(r.time)+'.'+r.ext;
@ -6096,13 +6140,14 @@ app.get(['/:auth/videos/:ke/:id/:file/:mode','/:auth/videos/:ke/:id/:file/:mode/
s.video('fix',r) s.video('fix',r)
break; break;
case'status': case'status':
req.params.f=parseInt(req.params.f) r.f = 'video_edit'
r.status = parseInt(req.params.f)
if(isNaN(req.params.f)||req.params.f===0){ if(isNaN(req.params.f)||req.params.f===0){
req.ret.msg='Not a valid value.'; req.ret.msg='Not a valid value.';
}else{ }else{
req.ret.ok=true; req.ret.ok=true;
s.sqlQuery('UPDATE Videos SET status=? WHERE ke=? AND mid=? AND time=?',[req.params.f,req.params.ke,req.params.id,filename]) s.sqlQuery('UPDATE Videos SET status=? WHERE ke=? AND mid=? AND time=?',[req.params.f,req.params.ke,req.params.id,time])
s.tx({f:'video_edit',status:req.params.f,filename:r.filename,mid:r.mid,ke:r.ke,time:s.nameToTime(r.filename),end:s.formattedTime(new Date,'YYYY-MM-DD HH:mm:ss')},'GRP_'+r.ke); s.tx(r,'GRP_'+r.ke);
} }
break; break;
case'delete': case'delete':
@ -6541,9 +6586,9 @@ if(config.childNodes.enabled === true && config.childNodes.mode === 'master'){
filename:d.filename, filename:d.filename,
mid:d.mid, mid:d.mid,
ke:d.ke, ke:d.ke,
time:s.timeObject(d.startTime).format(), time:d.startTime,
size:d.filesize, size:d.filesize,
end:s.timeObject(d.endTime).format() end:d.endTime
},'GRP_'+d.ke,'video_view'); },'GRP_'+d.ke,'video_view');
clearTimeout(s.group[d.ke].mon[d.mid].checker) clearTimeout(s.group[d.ke].mon[d.mid].checker)
clearTimeout(s.group[d.ke].mon[d.mid].checkStream) clearTimeout(s.group[d.ke].mon[d.mid].checkStream)

91
web/libs/js/main.dash2.js
View File

@ -12,15 +12,12 @@ $.ccio={
fr:$('#files_recent'), fr:$('#files_recent'),
mon:{} mon:{}
}; };
<% if(config.useUTC){ %> $.ccio.timeObject = function(time,isUTC){
$.ccio.timeObject = function(date){ if(isUTC === true){
return moment.utc(date).local() return moment(time).utc()
} }
<% }else{ %> return moment(time)
$.ccio.timeObject = function(date){
return moment(date)
} }
<% } %>
if(!$user.details.lang||$user.details.lang==''){ if(!$user.details.lang||$user.details.lang==''){
$user.details.lang="<%-config.language%>" $user.details.lang="<%-config.language%>"
} }
@ -158,10 +155,28 @@ switch($user.details.lang){
url=url+'/' url=url+'/'
} }
}else{ }else{
url='' url=location.pathname
} }
return url return url
break; break;
case'videoHrefToDelete':
var urlSplit = d.split('?')
var url = urlSplit[0]+'/delete'
if(urlSplit[1])url += '?' + urlSplit[1]
return url
break;
case'videoHrefToUnread':
var urlSplit = d.split('?')
var url = urlSplit[0]+'/status/1'
if(urlSplit[1])url += '?' + urlSplit[1]
return url
break;
case'videoHrefToRead':
var urlSplit = d.split('?')
var url = urlSplit[0]+'/status/2'
if(urlSplit[1])url += '?' + urlSplit[1]
return url
break;
// case'streamWindow': // case'streamWindow':
// return $('.monitor_item[mid="'+d.id+'"][ke="'+d.ke+'"][auth="'+user.auth_token+'"]') // return $('.monitor_item[mid="'+d.id+'"][ke="'+d.ke+'"][auth="'+user.auth_token+'"]')
// break; // break;
@ -834,25 +849,26 @@ switch($user.details.lang){
if(d.id&&!d.mid){d.mid=d.id;} if(d.id&&!d.mid){d.mid=d.id;}
switch(x){ switch(x){
case 0://video case 0://video
var href var url
if(d.href){ if(d.href){
href = d.href url = d.href
}else if(!d.href && d.hrefNoAuth){ }else if(!d.href && d.hrefNoAuth){
href = $.ccio.init('location',user)+user.auth_token+d.hrefNoAuth url = $.ccio.init('location',user)+user.auth_token+d.hrefNoAuth
} }
if(user!==$user&&href.charAt(0)==='/'){ if(user!==$user&&url.charAt(0)==='/'){
href = $.ccio.init('location',user)+d.href.substring(1) url = $.ccio.init('location',user)+d.href.substring(1)
} }
href = 'href="'+href+'"' href = 'href="'+url+'"'
if(!d.filename){d.filename=$.ccio.init('tf',d.time)+'.'+d.ext;} // if(!d.filename){d.filename=$.ccio.init('tf',d.time)+'.'+d.ext;}
d.dlname=d.mid+'-'+d.filename; d.dlname=d.mid+'-'+d.filename;
d.mom=$.ccio.timeObject(d.time), d.startMoment=$.ccio.timeObject(d.time),
d.hr=parseInt(d.mom.format('HH')), d.endMoment=$.ccio.timeObject(d.end),
d.hr=parseInt(d.startMoment.format('HH')),
d.per=parseInt(d.hr/24*100); d.per=parseInt(d.hr/24*100);
d.circle='<div title="at '+d.hr+' hours of '+d.mom.format('MMMM DD')+'" '+href+' video="launch" class="progress-circle progress-'+d.per+'"><span>'+d.hr+'</span></div>' d.circle='<div title="at '+d.hr+' hours of '+d.startMoment.format('MMMM DD')+'" '+href+' video="launch" class="progress-circle progress-'+d.per+'"><span>'+d.hr+'</span></div>'
tmp+='<li class="video-item glM'+d.mid+user.auth_token+'" auth="'+user.auth_token+'" mid="'+d.mid+'" ke="'+d.ke+'" status="'+d.status+'" status="'+d.status+'" file="'+d.filename+'">'+d.circle+'<div><span title="'+d.end+'" class="livestamp"></span></div><div><div class="small"><b><%-cleanLang(lang.Start)%></b> : '+$.ccio.timeObject(d.time).format('h:mm:ss , MMMM Do YYYY')+'</div><div class="small"><b><%-cleanLang(lang.End)%></b> : '+$.ccio.timeObject(d.end).format('h:mm:ss , MMMM Do YYYY')+'</div></div><div><span class="pull-right">'+(parseInt(d.size)/1000000).toFixed(2)+'mb</span><div class="controls btn-group"><a class="btn btn-sm btn-primary" video="launch" '+href+'><i class="fa fa-play-circle"></i></a> <a download="'+d.dlname+'" '+href+' class="btn btn-sm btn-default"><i class="fa fa-download"></i></a>' tmp+='<li class="video-item glM'+d.mid+user.auth_token+'" auth="'+user.auth_token+'" mid="'+d.mid+'" ke="'+d.ke+'" status="'+d.status+'" status="'+d.status+'" file="'+d.filename+'">'+d.circle+'<div><span title="'+d.endMoment.format()+'" class="livestamp"></span></div><div><div class="small"><b><%-cleanLang(lang.Start)%></b> : '+d.startMoment.format('h:mm:ss , MMMM Do YYYY')+'</div><div class="small"><b><%-cleanLang(lang.End)%></b> : '+d.endMoment.format('h:mm:ss , MMMM Do YYYY')+'</div></div><div><span class="pull-right">'+(parseInt(d.size)/1000000).toFixed(2)+'mb</span><div class="controls btn-group"><a class="btn btn-sm btn-primary" video="launch" '+href+'><i class="fa fa-play-circle"></i></a> <a download="'+d.dlname+'" '+href+' class="btn btn-sm btn-default"><i class="fa fa-download"></i></a>'
<% if(config.DropboxAppKey){ %> tmp+='<a video="download" host="dropbox" download="'+d.dlname+'" '+href+' class="btn btn-sm btn-default"><i class="fa fa-dropbox"></i></a>' <% } %> <% if(config.DropboxAppKey){ %> tmp+='<a video="download" host="dropbox" download="'+d.dlname+'" '+href+' class="btn btn-sm btn-default"><i class="fa fa-dropbox"></i></a>' <% } %>
tmp+='<a title="<%-cleanLang(lang['Delete Video'])%>" video="delete" class="btn btn-sm btn-danger permission_video_delete"><i class="fa fa-trash"></i></a></div></div></li>'; tmp+='<a title="<%-cleanLang(lang['Delete Video'])%>" video="delete" href="'+$.ccio.init('videoHrefToDelete',url)+'" class="btn btn-sm btn-danger permission_video_delete"><i class="fa fa-trash"></i></a></div></div></li>';
$(z).each(function(n,v){ $(z).each(function(n,v){
v=$(v); v=$(v);
if(v.find('.video-item').length>10){v.find('.video-item:last').remove()} if(v.find('.video-item').length>10){v.find('.video-item:last').remove()}
@ -1743,6 +1759,8 @@ $.ccio.globalWebsocket=function(d,user){
$.ccio.init('data-video',d) $.ccio.init('data-video',d)
d.e=$('[file="'+d.filename+'"][mid="'+d.mid+'"][ke="'+d.ke+'"][auth="'+user.auth_token+'"]'); d.e=$('[file="'+d.filename+'"][mid="'+d.mid+'"][ke="'+d.ke+'"][auth="'+user.auth_token+'"]');
d.e.attr('status',d.status),d.e.attr('data-status',d.status); d.e.attr('status',d.status),d.e.attr('data-status',d.status);
console.log(d)
break; break;
case'video_delete': case'video_delete':
// if($('.modal[mid="'+d.mid+'"][auth="'+user.auth_token+'"]').length>0){$('#video_viewer[mid="'+d.mid+'"]').attr('file',null).attr('ke',null).attr('mid',null).attr('auth',null).modal('hide')} // if($('.modal[mid="'+d.mid+'"][auth="'+user.auth_token+'"]').length>0){$('#video_viewer[mid="'+d.mid+'"]').attr('file',null).attr('ke',null).attr('mid',null).attr('auth',null).modal('hide')}
@ -2153,7 +2171,7 @@ $.ccio.globalWebsocket=function(d,user){
$.each(videos.videos,function(n,v){ $.each(videos.videos,function(n,v){
if(!v||!v.mid){return} if(!v||!v.mid){return}
v.mon=$.ccio.mon[v.ke+v.mid+$user.auth_token]; v.mon=$.ccio.mon[v.ke+v.mid+$user.auth_token];
v.filename=$.ccio.init('tf',v.time)+'.'+v.ext; // v.filename=$.ccio.init('tf',v.time)+'.'+v.ext;
if(v.status>0){ if(v.status>0){
// data.push({src:v,x:v.time,y:$.ccio.timeObject(v.time).diff($.ccio.timeObject(v.end),'minutes')/-1}) // data.push({src:v,x:v.time,y:$.ccio.timeObject(v.time).diff($.ccio.timeObject(v.end),'minutes')/-1})
data[v.filename]={ data[v.filename]={
@ -4062,7 +4080,7 @@ $.timelapse.drawTimeline=function(getData){
e.tmp='' e.tmp=''
$.each(videos.videos,function(n,v){ $.each(videos.videos,function(n,v){
if(!v||!v.time){return} if(!v||!v.time){return}
v.filename=$.ccio.init('tf',v.time)+'.'+v.ext; // v.filename=$.ccio.init('tf',v.time)+'.'+v.ext;
v.videoBefore=videos.videos[n-1]; v.videoBefore=videos.videos[n-1];
v.videoAfter=videos.videos[n+1]; v.videoAfter=videos.videos[n+1];
// if(v.href.charAt(0)==='/'){ // if(v.href.charAt(0)==='/'){
@ -4075,7 +4093,7 @@ $.timelapse.drawTimeline=function(getData){
e.tmp+='<div class="flex-block">' e.tmp+='<div class="flex-block">'
e.tmp+='<div class="flex-unit-3"><div class="frame" style="background-image:url('+$.timelapse.placeholder+')"></div></div>' e.tmp+='<div class="flex-unit-3"><div class="frame" style="background-image:url('+$.timelapse.placeholder+')"></div></div>'
e.tmp+='<div class="flex-unit-3"><div><span title="'+v.time+'" class="livestamp"></span></div><div>'+v.filename+'</div></div>' e.tmp+='<div class="flex-unit-3"><div><span title="'+v.time+'" class="livestamp"></span></div><div>'+v.filename+'</div></div>'
e.tmp+='<div class="flex-unit-3 text-right"><a class="btn btn-default" download="'+v.mid+'-'+v.filename+'" href="'+v.href+'">&nbsp;<i class="fa fa-download"></i>&nbsp;</a> <a class="btn btn-danger" video="delete">&nbsp;<i class="fa fa-trash-o"></i>&nbsp;</a></div>' e.tmp+='<div class="flex-unit-3 text-right"><a class="btn btn-default" download="'+v.mid+'-'+v.filename+'" href="'+v.href+'">&nbsp;<i class="fa fa-download"></i>&nbsp;</a> <a class="btn btn-danger" video="delete" href="'+$.ccio.init('videoHrefToDelete',v.href)+'">&nbsp;<i class="fa fa-trash-o"></i>&nbsp;</a></div>'
e.tmp+='</div>' e.tmp+='</div>'
e.tmp+='<div class="flex-block">' e.tmp+='<div class="flex-block">'
e.tmp+='<div class="flex-unit-3"><div class="progress"><div class="progress-bar progress-bar-primary" role="progressbar" style="width:0%"></div></div></div>' e.tmp+='<div class="flex-unit-3"><div class="progress"><div class="progress-bar progress-bar-primary" role="progressbar" style="width:0%"></div></div></div>'
@ -4449,7 +4467,8 @@ $.pwrvid.e.on('click','[preview]',function(e){
$.pwrvid.vp.find('.stream-objects .stream-detected-object').remove() $.pwrvid.vp.find('.stream-objects .stream-detected-object').remove()
}) })
if(e.status==1){ if(e.status==1){
$.get(e.href.split('?')[0]+'/status/2',function(d){ $.get($.ccio.init('videoHrefToRead',e.href),function(d){
}) })
} }
var labels=[] var labels=[]
@ -4778,22 +4797,28 @@ $('body')
.attr('auth',e.auth) .attr('auth',e.auth)
.attr('file',e.file); .attr('file',e.file);
if(e.status==1){ if(e.status==1){
$.get(e.href.split('?')[0]+'/status/2',function(d){ $.get($.ccio.init('videoHrefToRead',e.href),function(d){
if(d.ok !== true)console.log(d,new Error())
}) })
} }
break; break;
case'delete': case'delete':
e.href=e.p.find('[download]').attr('href') e.preventDefault();
if(!e.href||e.href===''){ var videoLink = e.p.find('[download]').attr('href')
e.href=e.p.attr('href') var href = $(this).attr('href')
console.log('videoLink',videoLink)
console.log(href)
if(!href){
href = $.ccio.init('location',$.users[e.auth])+e.auth+'/videos/'+e.ke+'/'+e.mid+'/'+e.file+'/delete<% if(config.useUTC === true){%>?isUTC=true<%}%>'
} }
console.log(href)
$.confirm.e.modal('show'); $.confirm.e.modal('show');
$.confirm.title.text('<%-cleanLang(lang['Delete Video'])%> : '+e.file) $.confirm.title.text('<%-cleanLang(lang['Delete Video'])%> : '+e.file)
e.html='<%-cleanLang(lang.DeleteVideoMsg)%>' e.html='<%-cleanLang(lang.DeleteVideoMsg)%>'
e.html+='<video class="video_video" autoplay loop controls><source src="'+e.href+'" type="video/'+e.mon.ext+'"></video>'; e.html+='<video class="video_video" autoplay loop controls><source src="'+videoLink+'" type="video/'+e.mon.ext+'"></video>';
$.confirm.body.html(e.html) $.confirm.body.html(e.html)
$.confirm.click({title:'Delete Video',class:'btn-danger'},function(){ $.confirm.click({title:'Delete Video',class:'btn-danger'},function(){
$.getJSON($.ccio.init('location',$.users[e.auth])+e.auth+'/videos/'+e.ke+'/'+e.mid+'/'+e.file+'/delete',function(d){ $.getJSON(href,function(d){
$.ccio.log(d) $.ccio.log(d)
}) })
}); });
@ -5072,7 +5097,7 @@ $('body')
var n=$.ccio.mon[v.ke+v.mid+user.auth_token]; var n=$.ccio.mon[v.ke+v.mid+user.auth_token];
if(n){v.title=n.name+' - '+(parseInt(v.size)/1000000).toFixed(2)+'mb';} if(n){v.title=n.name+' - '+(parseInt(v.size)/1000000).toFixed(2)+'mb';}
v.start=v.time; v.start=v.time;
v.filename=$.ccio.init('tf',v.time)+'.'+v.ext; // v.filename=$.ccio.init('tf',v.time)+'.'+v.ext;
e.ar.push(v); e.ar.push(v);
} }
}) })
@ -5123,7 +5148,7 @@ $('body')
var href = $.ccio.init('location',user)+v.href var href = $.ccio.init('location',user)+v.href
v.mon=$.ccio.mon[v.ke+v.mid+user.auth_token]; v.mon=$.ccio.mon[v.ke+v.mid+user.auth_token];
v.start=v.time; v.start=v.time;
v.filename=$.ccio.init('tf',v.time)+'.'+v.ext; // v.filename=$.ccio.init('tf',v.time)+'.'+v.ext;
e.tmp+='<tr data-ke="'+v.ke+'" data-status="'+v.status+'" data-mid="'+v.mid+'" data-file="'+v.filename+'" data-auth="'+v.mon.user.auth_token+'">'; e.tmp+='<tr data-ke="'+v.ke+'" data-status="'+v.status+'" data-mid="'+v.mid+'" data-file="'+v.filename+'" data-auth="'+v.mon.user.auth_token+'">';
e.tmp+='<td><div class="checkbox"><input id="'+v.ke+'_'+v.filename+'" name="'+v.filename+'" value="'+v.mid+'" type="checkbox"><label for="'+v.ke+'_'+v.filename+'"></label></div></td>'; e.tmp+='<td><div class="checkbox"><input id="'+v.ke+'_'+v.filename+'" name="'+v.filename+'" value="'+v.mid+'" type="checkbox"><label for="'+v.ke+'_'+v.filename+'"></label></div></td>';
e.tmp+='<td><span class="livestamp" title="'+v.end+'"></span></td>'; e.tmp+='<td><span class="livestamp" title="'+v.end+'"></span></td>';
@ -5135,7 +5160,7 @@ $('body')
e.tmp+='<td><a class="btn btn-sm btn-default preview" href="'+href+'">&nbsp;<i class="fa fa-play-circle"></i>&nbsp;</a></td>'; e.tmp+='<td><a class="btn btn-sm btn-default preview" href="'+href+'">&nbsp;<i class="fa fa-play-circle"></i>&nbsp;</a></td>';
e.tmp+='<td><a class="btn btn-sm btn-primary" video="launch" href="'+href+'">&nbsp;<i class="fa fa-play-circle"></i>&nbsp;</a></td>'; e.tmp+='<td><a class="btn btn-sm btn-primary" video="launch" href="'+href+'">&nbsp;<i class="fa fa-play-circle"></i>&nbsp;</a></td>';
e.tmp+='<td><a class="btn btn-sm btn-success" download="'+v.mid+'-'+v.filename+'" href="'+href+'">&nbsp;<i class="fa fa-download"></i>&nbsp;</a></td>'; e.tmp+='<td><a class="btn btn-sm btn-success" download="'+v.mid+'-'+v.filename+'" href="'+href+'">&nbsp;<i class="fa fa-download"></i>&nbsp;</a></td>';
e.tmp+='<td class="permission_video_delete"><a class="btn btn-sm btn-danger" video="delete">&nbsp;<i class="fa fa-trash"></i>&nbsp;</a></td>'; e.tmp+='<td class="permission_video_delete"><a class="btn btn-sm btn-danger" video="delete" href="'+$.ccio.init('videoHrefToDelete',href)+'">&nbsp;<i class="fa fa-trash"></i>&nbsp;</a></td>';
// e.tmp+='<td class="permission_video_delete"><a class="btn btn-sm btn-warning" video="fix">&nbsp;<i class="fa fa-wrench"></i>&nbsp;</a></td>'; // e.tmp+='<td class="permission_video_delete"><a class="btn btn-sm btn-warning" video="fix">&nbsp;<i class="fa fa-wrench"></i>&nbsp;</a></td>';
e.tmp+='</tr>'; e.tmp+='</tr>';
} }