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

add missing rules for startup.js (cloud timelapse count)

merge-requests/78/head
Moe 2019-07-07 20:02:49 -07:00
parent 44dc8e865e
commit 10acea1286
1 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
libs/startup.js
View File

@ -164,22 +164,45 @@ module.exports = function(s,config,lang,io){
} }
if(s.cloudDiskUseStartupExtensions[storageType])s.cloudDiskUseStartupExtensions[storageType](user,userDetails) if(s.cloudDiskUseStartupExtensions[storageType])s.cloudDiskUseStartupExtensions[storageType](user,userDetails)
}) })
s.sqlQuery('SELECT * FROM `Cloud Videos` WHERE ke=? AND status!=?',[user.ke,0],function(err,videos){ var loadCloudVideos = function(callback){
if(videos && videos[0]){ s.sqlQuery('SELECT * FROM `Cloud Videos` WHERE ke=? AND status!=?',[user.ke,0],function(err,videos){
videos.forEach(function(video){ if(videos && videos[0]){
var storageType = JSON.parse(video.details).type videos.forEach(function(video){
if(!storageType)storageType = 's3' var storageType = JSON.parse(video.details).type
user.cloudDiskUse[storageType].usedSpace += (video.size /1000000) if(!storageType)storageType = 's3'
++user.cloudDiskUse[storageType].firstCount var videoSize = video.size / 1000000
}) user.cloudDiskUse[storageType].usedSpace += videoSize
s.cloudDisksLoaded.forEach(function(storageType){ user.cloudDiskUse[storageType].usedSpaceVideos += videoSize
var firstCount = user.cloudDiskUse[storageType].firstCount ++user.cloudDiskUse[storageType].firstCount
s.systemLog(user.mail+' : '+lang.startUpText1+' : '+firstCount,storageType,user.cloudDiskUse[storageType].usedSpace) })
delete(user.cloudDiskUse[storageType].firstCount) s.cloudDisksLoaded.forEach(function(storageType){
}) var firstCount = user.cloudDiskUse[storageType].firstCount
} s.systemLog(user.mail+' : '+lang.startUpText1+' : '+firstCount,storageType,user.cloudDiskUse[storageType].usedSpace)
s.group[user.ke].cloudDiskUse = user.cloudDiskUse delete(user.cloudDiskUse[storageType].firstCount)
callback() })
}
callback()
})
}
var loadCloudTimelapseFrames = function(callback){
s.sqlQuery('SELECT * FROM `Cloud Timelapse Frames` WHERE ke=?',[user.ke],function(err,frames){
if(frames && frames[0]){
frames.forEach(function(frame){
var storageType = JSON.parse(frame.details).type
if(!storageType)storageType = 's3'
var frameSize = frame.size / 1000000
user.cloudDiskUse[storageType].usedSpace += frameSize
user.cloudDiskUse[storageType].usedSpaceTimelapseFrames += frameSize
})
}
callback()
})
}
loadCloudVideos(function(){
loadCloudTimelapseFrames(function(){
s.group[user.ke].cloudDiskUse = user.cloudDiskUse
callback()
})
}) })
} }
var loadAddStorageDiskUseForUser = function(user,data,callback){ var loadAddStorageDiskUseForUser = function(user,data,callback){