From b69af2b66d408dedc84552d81a6602fcee31589a Mon Sep 17 00:00:00 2001
From: Moe <github@m03.ca>
Date: Tue, 6 Dec 2022 15:24:16 -0800
Subject: [PATCH] remove old 777 chmods
---
libs/user/utils.js | 42 ++++++++--------
libs/videos.js | 98 +++++++++++++++++--------------------
libs/webServerSuperPaths.js | 4 +-
3 files changed, 67 insertions(+), 77 deletions(-)
diff --git a/libs/user/utils.js b/libs/user/utils.js
index fe6b617e..2cfb0df0 100644
--- a/libs/user/utils.js
+++ b/libs/user/utils.js
@@ -20,28 +20,26 @@ module.exports = (s,config,lang) => {
}
if(whereGroup.length > 0)queryGroup.__separator = 'or'
whereGroup.push(queryGroup)
- fs.chmod(video.dir,0o777,function(err){
- fs.rm(video.dir,function(err){
- ++completedCheck
- if(err){
- fs.stat(video.dir,function(err){
- if(!err){
- fs.unlink(video.dir)
- }
- })
- }
- const whereGroupLength = whereGroup.length
- if(whereGroupLength > 0 && whereGroupLength === completedCheck){
- whereQuery[1] = whereGroup
- s.knexQuery({
- action: "delete",
- table: "Videos",
- where: whereQuery
- },(err,info) => {
- setTimeout(reRunCheck,1000)
- })
- }
- })
+ fs.rm(video.dir,function(err){
+ ++completedCheck
+ if(err){
+ fs.stat(video.dir,function(err){
+ if(!err){
+ fs.unlink(video.dir)
+ }
+ })
+ }
+ const whereGroupLength = whereGroup.length
+ if(whereGroupLength > 0 && whereGroupLength === completedCheck){
+ whereQuery[1] = whereGroup
+ s.knexQuery({
+ action: "delete",
+ table: "Videos",
+ where: whereQuery
+ },(err,info) => {
+ setTimeout(reRunCheck,1000)
+ })
+ }
})
if(storageIndex){
s.setDiskUsedForGroupAddStorage(groupKey,{
diff --git a/libs/videos.js b/libs/videos.js
index 19de9d38..a063c07e 100644
--- a/libs/videos.js
+++ b/libs/videos.js
@@ -92,9 +92,7 @@ module.exports = function(s,config,lang){
insertQuery: insertQuery,
}
if(callback)callback(err,response)
- fs.chmod(k.dir+k.file,0o777,function(err){
- resolve(response)
- })
+ resolve(response)
})
})
}
@@ -224,36 +222,34 @@ module.exports = function(s,config,lang){
},(err,r) => {
if(r && r[0]){
r = r[0]
- fs.chmod(e.dir+filename,0o777,function(err){
- s.tx({
- f: 'video_delete',
- filename: filename,
- mid: e.id,
- ke: e.ke,
- time: new Date(s.nameToTime(filename)),
- end: s.formattedTime(new Date,'YYYY-MM-DD HH:mm:ss')
- },'GRP_'+e.ke);
- var storageIndex = s.getVideoStorageIndex(e)
- if(storageIndex){
- s.setDiskUsedForGroupAddStorage(e.ke,{
- size: -(r.size / 1048576),
- storageIndex: storageIndex
- })
- }else{
- s.setDiskUsedForGroup(e.ke,-(r.size / 1048576))
+ s.tx({
+ f: 'video_delete',
+ filename: filename,
+ mid: e.id,
+ ke: e.ke,
+ time: new Date(s.nameToTime(filename)),
+ end: s.formattedTime(new Date,'YYYY-MM-DD HH:mm:ss')
+ },'GRP_'+e.ke);
+ var storageIndex = s.getVideoStorageIndex(e)
+ if(storageIndex){
+ s.setDiskUsedForGroupAddStorage(e.ke,{
+ size: -(r.size / 1048576),
+ storageIndex: storageIndex
+ })
+ }else{
+ s.setDiskUsedForGroup(e.ke,-(r.size / 1048576))
+ }
+ s.knexQuery({
+ action: "delete",
+ table: "Videos",
+ where: whereQuery
+ },(err) => {
+ if(err){
+ s.systemLog(lang['File Delete Error'] + ' : '+e.ke+' : '+' : '+e.id,err)
}
- s.knexQuery({
- action: "delete",
- table: "Videos",
- where: whereQuery
- },(err) => {
- if(err){
- s.systemLog(lang['File Delete Error'] + ' : '+e.ke+' : '+' : '+e.id,err)
- }
- })
- fs.rm(e.dir+filename,function(err){
- resolve()
- })
+ })
+ fs.rm(e.dir+filename,function(err){
+ resolve()
})
}else{
console.log(lang['Database row does not exist'],whereQuery)
@@ -286,26 +282,24 @@ module.exports = function(s,config,lang){
time = video.time
}
time = new Date(time)
- fs.chmod(video.dir + filename,0o777,function(err){
- s.tx({
- f: 'video_delete',
- filename: filename,
- mid: video.mid,
- ke: video.ke,
- time: s.nameToTime(filename),
- end: s.formattedTime(new Date,'YYYY-MM-DD HH:mm:ss')
- },'GRP_'+video.ke);
- var storageIndex = s.getVideoStorageIndex(video)
- if(storageIndex){
- s.setDiskUsedForGroupAddStorage(video.ke,{
- size: -(video.size / 1048576),
- storageIndex: storageIndex
- })
- }else{
- s.setDiskUsedForGroup(video.ke,-(video.size / 1048576))
- }
- s.file('delete',video.dir + filename)
- });
+ s.tx({
+ f: 'video_delete',
+ filename: filename,
+ mid: video.mid,
+ ke: video.ke,
+ time: s.nameToTime(filename),
+ end: s.formattedTime(new Date,'YYYY-MM-DD HH:mm:ss')
+ },'GRP_'+video.ke);
+ var storageIndex = s.getVideoStorageIndex(video)
+ if(storageIndex){
+ s.setDiskUsedForGroupAddStorage(video.ke,{
+ size: -(video.size / 1048576),
+ storageIndex: storageIndex
+ })
+ }else{
+ s.setDiskUsedForGroup(video.ke,-(video.size / 1048576))
+ }
+ s.file('delete',video.dir + filename)
const queryGroup = {
ke: video.ke,
mid: video.mid,
diff --git a/libs/webServerSuperPaths.js b/libs/webServerSuperPaths.js
index b49bd260..33a29754 100644
--- a/libs/webServerSuperPaths.js
+++ b/libs/webServerSuperPaths.js
@@ -482,9 +482,7 @@ module.exports = function(s,config,lang,app){
ke: account.ke,
}
})
- fs.chmod(s.dir.videos+account.ke,0o777,function(err){
- fs.rmdir(s.dir.videos+account.ke,function(err){})
- })
+ fs.rmdir(s.dir.videos+account.ke,function(err){})
}
if(s.getPostData(req,'deleteEvents',false) == '1'){
s.knexQuery({