From e5bd7e61ff531454af2f65c34a42bb7db7bf7bb8 Mon Sep 17 00:00:00 2001
From: Moe <github@m03.ca>
Date: Mon, 16 Jan 2023 17:22:20 -0800
Subject: [PATCH] Fix Timelapse Frames counting in AddStorage+

---
 libs/user.js       | 18 +++++++++++-------
 libs/user/utils.js |  3 ++-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/libs/user.js b/libs/user.js
index c78d2466..122e0311 100644
--- a/libs/user.js
+++ b/libs/user.js
@@ -11,6 +11,7 @@ module.exports = function(s,config,lang){
         deleteAddStorageVideos,
         deleteMainVideos,
         deleteTimelapseFrames,
+        deleteAddStorageTimelapseFrames,
         deleteFileBinFiles,
         deleteCloudVideos,
         deleteCloudTimelapseFrames,
@@ -29,13 +30,16 @@ module.exports = function(s,config,lang){
                     deleteMainVideos(groupKey,() => {
                         s.debugLog(`${groupKey} deleteTimelapseFrames`)
                         deleteTimelapseFrames(groupKey,() => {
-                            s.debugLog(`${groupKey} deleteFileBinFiles`)
-                            deleteFileBinFiles(groupKey,() => {
-                                s.debugLog(`${groupKey} deleteAddStorageVideos`)
-                                deleteAddStorageVideos(groupKey,() => {
-                                    s.group[groupKey].sizePurging = false
-                                    s.sendDiskUsedAmountToClients(groupKey)
-                                    callback();
+                            s.debugLog(`${groupKey} deleteAddStorageTimelapseFrames`)
+                            deleteAddStorageTimelapseFrames(groupKey,() => {
+                                s.debugLog(`${groupKey} deleteFileBinFiles`)
+                                deleteFileBinFiles(groupKey,() => {
+                                    s.debugLog(`${groupKey} deleteAddStorageVideos`)
+                                    deleteAddStorageVideos(groupKey,() => {
+                                        s.group[groupKey].sizePurging = false
+                                        s.sendDiskUsedAmountToClients(groupKey)
+                                        callback();
+                                    })
                                 })
                             })
                         })
diff --git a/libs/user/utils.js b/libs/user/utils.js
index 713a784b..a0a8f7ce 100644
--- a/libs/user/utils.js
+++ b/libs/user/utils.js
@@ -240,7 +240,7 @@ module.exports = (s,config,lang) => {
     const deleteAddStorageTimelapseFrames = function(groupKey,callback){
         const theGroup = s.group[groupKey]
         reRunCheck = function(){
-            s.debugLog('deleteAddStorageVideos')
+            s.debugLog('deleteAddStorageTimelapseFrames')
             return deleteAddStorageTimelapseFrames(groupKey,callback)
         }
         var currentStorageNumber = 0
@@ -546,6 +546,7 @@ module.exports = (s,config,lang) => {
         deleteAddStorageVideos: deleteAddStorageVideos,
         deleteMainVideos: deleteMainVideos,
         deleteTimelapseFrames: deleteTimelapseFrames,
+        deleteAddStorageTimelapseFrames,
         deleteFileBinFiles: deleteFileBinFiles,
         deleteCloudVideos: deleteCloudVideos,
         deleteCloudTimelapseFrames: deleteCloudTimelapseFrames,