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

sqlQuery Conversion : fix purging on maxStorageAmount

add-archived-and-accountType-columns
Moe 2020-08-05 20:41:01 -07:00
parent 0a23ac9f1a
commit a311f830a2
3 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/socketio.js
View File

@ -117,7 +117,7 @@ module.exports = function(s,config,lang,io){
cn.socketVideoStream = d.id;
}
const createStreamEmitter = (d) => {
const createStreamEmitter = (d,cn) => {
var Emitter,chunkChannel
if(!d.channel){
Emitter = s.group[d.ke].activeMonitors[d.id].emitter
@ -151,7 +151,7 @@ module.exports = function(s,config,lang,io){
}
const onSuccess = (r) => {
r = r[0];
const Emitter = createStreamEmitter(d)
const Emitter = createStreamEmitter(d,cn)
validatedAndBindAuthenticationToSocketConnection(cn,d,true)
var contentWriter
cn.closeSocketVideoStream = function(){
@ -184,7 +184,7 @@ module.exports = function(s,config,lang,io){
}
const onSuccess = (r) => {
r = r[0];
const Emitter = createStreamEmitter(d)
const Emitter = createStreamEmitter(d,cn)
validatedAndBindAuthenticationToSocketConnection(cn,d,true)
var contentWriter
cn.closeSocketVideoStream = function(){
@ -217,7 +217,7 @@ module.exports = function(s,config,lang,io){
}
const onSuccess = (r) => {
r=r[0];
const Emitter = createStreamEmitter(d)
const Emitter = createStreamEmitter(d,cn)
validatedAndBindAuthenticationToSocketConnection(cn,d,true)
var contentWriter
cn.closeSocketVideoStream = function(){

65
libs/user.js
View File

@ -25,28 +25,26 @@ module.exports = function(s,config,lang){
var reRunCheck = function(){}
var deleteSetOfVideos = function(err,videos,storageIndex,callback){
var completedCheck = 0
var whereGroup = []
var whereQuery = [
['ke','=',e.ke],
[]
]
if(videos){
var didOne = false
videos.forEach(function(video){
video.dir = s.getVideoDirectory(video) + s.formattedTime(video.time) + '.' + video.ext
var whereGroup
if(didOne){
whereGroup = [
whereGroup.push(
['or','mid','=',video.mid],
['time','=',video.time]
]
)
}else{
didOne = false
whereGroup = [
didOne = true
whereGroup.push(
['mid','=',video.mid],
['time','=',video.time]
]
)
}
whereQuery[1].push(whereGroup)
fs.chmod(video.dir,0o777,function(err){
fs.unlink(video.dir,function(err){
++completedCheck
@ -57,12 +55,15 @@ module.exports = function(s,config,lang){
}
})
}
if(whereQuery[1].length > 0 && whereQuery[1].length === completedCheck){
const whereGroupLength = whereGroup.length / 2
if(whereGroupLength > 0 && whereGroupLength === completedCheck){
whereQuery[1] = whereGroup
s.knexQuery({
action: "delete",
table: "Videos",
where: whereQuery
},() => {
},(err) => {
console.log(err)
reRunCheck()
})
}
@ -89,11 +90,12 @@ module.exports = function(s,config,lang){
}else{
console.log(err)
}
if(whereQuery[1].length === 0){
if(whereGroup.length === 0){
if(callback)callback()
}
}
var deleteSetOfTimelapseFrames = function(err,frames,storageIndex,callback){
var whereGroup = []
var whereQuery = [
['ke','=',e.ke],
[]
@ -105,20 +107,18 @@ module.exports = function(s,config,lang){
var selectedDate = frame.filename.split('T')[0]
var dir = s.getTimelapseFrameDirectory(frame)
var fileLocationMid = `${dir}` + frame.filename
var whereGroup
if(didOne){
whereGroup = [
whereGroup.push(
['or','mid','=',frame.mid],
['time','=',frame.time]
]
)
}else{
didOne = false
whereGroup = [
didOne = true
whereGroup.push(
['mid','=',frame.mid],
['time','=',frame.time]
]
)
}
whereQuery[1].push(whereGroup)
fs.unlink(fileLocationMid,function(err){
++completedCheck
if(err){
@ -128,7 +128,9 @@ module.exports = function(s,config,lang){
}
})
}
if(whereQuery[1].length > 0 && whereQuery[1].length === completedCheck){
const whereGroupLength = whereGroup.length / 2
if(whereGroupLength > 0 && whereGroupLength === completedCheck){
whereQuery[1] = whereGroup
s.knexQuery({
action: "delete",
table: "Timelapse Frames",
@ -159,11 +161,12 @@ module.exports = function(s,config,lang){
}else{
console.log(err)
}
if(whereQuery[1].length === 0){
if(whereGroup.length === 0){
if(callback)callback()
}
}
var deleteSetOfFileBinFiles = function(err,files,storageIndex,callback){
var whereGroup = []
var whereQuery = [
['ke','=',e.ke],
[]
@ -173,20 +176,18 @@ module.exports = function(s,config,lang){
files.forEach(function(file){
var dir = s.getFileBinDirectory(file)
var fileLocationMid = `${dir}` + file.name
var whereGroup
if(didOne){
whereGroup = [
whereGroup.push(
['or','mid','=',file.mid],
['name','=',file.name]
]
)
}else{
didOne = false
whereGroup = [
didOne = true
whereGroup.push(
['mid','=',file.mid],
['name','=',file.name]
]
)
}
whereQuery[1].push(whereGroup)
fs.unlink(fileLocationMid,function(err){
++completedCheck
if(err){
@ -196,7 +197,9 @@ module.exports = function(s,config,lang){
}
})
}
if(whereQuery[1].length > 0 && whereQuery[1].length === completedCheck){
const whereGroupLength = whereGroup.length / 2
if(whereGroupLength > 0 && whereGroupLength === completedCheck){
whereQuery[1] = whereGroup
s.knexQuery({
action: "delete",
table: "Files",
@ -218,7 +221,7 @@ module.exports = function(s,config,lang){
}else{
console.log(err)
}
if(whereQuery[1].length === 0){
if(whereGroup.length === 0){
if(callback)callback()
}
}
@ -531,7 +534,7 @@ module.exports = function(s,config,lang){
['time','=',video.time]
]
}else{
didOne = false
didOne = true
whereGroup = [
['mid','=',video.mid],
['time','=',video.time]
@ -591,7 +594,7 @@ module.exports = function(s,config,lang){
['time','=',frame.time]
]
}else{
didOne = false
didOne = true
whereGroup = [
['mid','=',frame.mid],
['time','=',frame.time]

2
libs/webServerPaths.js
View File

@ -1040,7 +1040,7 @@ module.exports = function(s,config,lang,app,io){
if(didOne){
whereQuery.push(['or','ke','=',req.params.ke])
}else{
didOne = false
didOne = true
whereQuery.push(['ke','=',req.params.ke])
}
whereQuery.push(