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

fix on Max Storage Amount set on start

merge-requests/63/head
Moe 2019-04-27 10:15:55 -07:00
parent f3e10bcc56
commit f5d416bf54
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/startup.js
View File

@ -74,8 +74,6 @@ module.exports = function(s,config,lang,io){
var loadDiskUseForUser = function(user,callback){
s.systemLog(user.mail+' : '+lang.startUpText0)
var userDetails = JSON.parse(user.details)
user.size = 0
user.limit = userDetails.size
s.sqlQuery('SELECT * FROM Videos WHERE ke=? AND status!=?',[user.ke,0],function(err,videos){
s.sqlQuery('SELECT * FROM `Timelapse Frames` WHERE ke=?',[user.ke],function(err,timelapseFrames){
s.sqlQuery('SELECT * FROM `Files` WHERE ke=?',[user.ke],function(err,files){

2
libs/user.js
View File

@ -267,7 +267,7 @@ module.exports = function(s,config){
if(!s.group[e.ke].addStorageUse){s.group[e.ke].addStorageUse = {}}
if(!e.limit||e.limit===''){e.limit=10000}else{e.limit=parseFloat(e.limit)}
//save global space limit for group key (mb)
s.group[e.ke].sizeLimit = s.group[e.ke].sizeLimit || e.limit || 10000
s.group[e.ke].sizeLimit = e.limit || s.group[e.ke].sizeLimit || 10000
//save global used space as megabyte value
s.group[e.ke].usedSpace = s.group[e.ke].usedSpace || ((e.size || 0) / 1000000)
//emit the changes to connected users