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

fix cloudDisk manager, fix probe

fix-non-showing-inputs
Moe Alam 2020-11-07 20:31:07 -08:00
parent e7ad11e5f9
commit 050b70f8d7
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/scanners.js
View File

@ -6,6 +6,9 @@ module.exports = function(s,config,lang,app,io){
createSnapshot,
addCredentialsToStreamLink,
} = require('./monitor/utils.js')(s,config,lang)
const {
splitForFFPMEG,
} = require('./ffmpeg/utils.js')(s,config,lang)
const activeProbes = {}
const runFFprobe = (url,auth,callback) => {
var endData = {ok: false}
@ -20,7 +23,7 @@ module.exports = function(s,config,lang,app,io){
return
}
activeProbes[auth] = 1
const probeCommand = s.splitForFFPMEG(`-v quiet -print_format json -show_format -show_streams -i "${url}"`).join(' ')
const probeCommand = splitForFFPMEG(`-v quiet -print_format json -show_format -show_streams -i "${url}"`).join(' ')
exec('ffprobe ' + probeCommand,function(err,stdout,stderr){
delete(activeProbes[auth])
if(err){

4
libs/user.js
View File

@ -188,8 +188,8 @@ module.exports = function(s,config,lang){
})
if(config.cron.deleteOverMax === true){
s.group[e.ke].diskUsedEmitter.on('purgeCloud',function(storageType,storagePoint){
deleteCloudVideos(storageType,storagePoint,function(){
deleteCloudTimelapseFrames(storageType,storagePoint,function(){
deleteCloudVideos(e.ke,storageType,storagePoint,function(){
deleteCloudTimelapseFrames(e.ke,storageType,storagePoint,function(){
})
})

12
libs/user/utils.js
View File

@ -375,7 +375,7 @@ module.exports = (s,config,lang) => {
}
if(whereGroup.length > 0)queryGroup.__separator = 'or'
whereGroup.push(queryGroup)
s.setCloudDiskUsedForGroup(e.ke,{
s.setCloudDiskUsedForGroup(groupKey,{
amount : -(video.size/1048576),
storageType : storageType
})
@ -401,15 +401,15 @@ module.exports = (s,config,lang) => {
}
const deleteCloudTimelapseFrames = function(groupKey,storageType,storagePoint,callback){
const whereGroup = []
var cloudDisk = s.group[e.ke].cloudDiskUse[storageType]
var cloudDisk = s.group[groupKey].cloudDiskUse[storageType]
//run purge command
if(cloudDisk.usedSpaceTimelapseFrames > (cloudDisk.sizeLimit * (s.group[e.ke].sizeLimitTimelapseFramesPercent / 100) * config.cron.deleteOverMaxOffset)){
if(cloudDisk.usedSpaceTimelapseFrames > (cloudDisk.sizeLimit * (s.group[groupKey].sizeLimitTimelapseFramesPercent / 100) * config.cron.deleteOverMaxOffset)){
s.knexQuery({
action: "select",
columns: "*",
table: "Cloud Timelapse Frames",
where: [
['ke','=',e.ke],
['ke','=',groupKey],
['details','NOT LIKE',`%"archived":"1"%`],
],
orderBy: ['time','asc'],
@ -417,7 +417,7 @@ module.exports = (s,config,lang) => {
},(err,frames) => {
if(!frames)return console.log(err)
var whereQuery = [
['ke','=',e.ke],
['ke','=',groupKey],
]
frames.forEach(function(frame){
frame.dir = s.getVideoDirectory(frame) + s.formattedTime(frame.time) + '.' + frame.ext
@ -427,7 +427,7 @@ module.exports = (s,config,lang) => {
}
if(whereGroup.length > 0)queryGroup.__separator = 'or'
whereGroup.push(queryGroup)
s.setCloudDiskUsedForGroup(e.ke,{
s.setCloudDiskUsedForGroup(groupKey,{
amount : -(frame.size/1048576),
storageType : storageType
})