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

25
libs/startup.js
View File

@ -164,12 +164,15 @@ 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)
}) })
var loadCloudVideos = function(callback){
s.sqlQuery('SELECT * FROM `Cloud Videos` WHERE ke=? AND status!=?',[user.ke,0],function(err,videos){ s.sqlQuery('SELECT * FROM `Cloud Videos` WHERE ke=? AND status!=?',[user.ke,0],function(err,videos){
if(videos && videos[0]){ if(videos && videos[0]){
videos.forEach(function(video){ videos.forEach(function(video){
var storageType = JSON.parse(video.details).type var storageType = JSON.parse(video.details).type
if(!storageType)storageType = 's3' if(!storageType)storageType = 's3'
user.cloudDiskUse[storageType].usedSpace += (video.size /1000000) var videoSize = video.size / 1000000
user.cloudDiskUse[storageType].usedSpace += videoSize
user.cloudDiskUse[storageType].usedSpaceVideos += videoSize
++user.cloudDiskUse[storageType].firstCount ++user.cloudDiskUse[storageType].firstCount
}) })
s.cloudDisksLoaded.forEach(function(storageType){ s.cloudDisksLoaded.forEach(function(storageType){
@ -178,9 +181,29 @@ module.exports = function(s,config,lang,io){
delete(user.cloudDiskUse[storageType].firstCount) delete(user.cloudDiskUse[storageType].firstCount)
}) })
} }
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 s.group[user.ke].cloudDiskUse = user.cloudDiskUse
callback() callback()
}) })
})
} }
var loadAddStorageDiskUseForUser = function(user,data,callback){ var loadAddStorageDiskUseForUser = function(user,data,callback){
var videos = data.videos var videos = data.videos