tiro-notes 0.30.4-2.26 → 0.30.4-2.27
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cli.js +9 -5
- package/package.json +1 -1
package/cli.js
CHANGED
|
@@ -155,24 +155,28 @@ const startBackupScript = async (argsObj, dataFolder) => {
|
|
|
155
155
|
|
|
156
156
|
const tarExec = process.platform === "darwin" ? "gtar" : "tar"
|
|
157
157
|
|
|
158
|
-
let backupCli = `${replaceTimestampCli()}; mkdir '${backupFolder}'; mkdir '${backupFolder}/backups'; cd '${backupFolder}'; ${tarExec} --xz --verbose --create --file="backups/tiro.$(ls backups/ | wc -l | sed 's/^ *//;s/ *$//').tar.xz" '${dataFolder}' --listed-incremental='${backupFolder}metadata.snar'; ${postBackupScript}`
|
|
159
158
|
|
|
160
|
-
const debugObj = {backupFolder, postBackupScriptFile, postBackupScript, getLastTimestamp(), timeInterval, backupCli}
|
|
161
159
|
console.log ("[BACKUP] starting backup logic!");
|
|
162
|
-
console.log (debugObj);
|
|
163
160
|
|
|
164
161
|
const debugBackupNow = isDev ? false : false
|
|
165
|
-
const processBackupEveryDay = () => {
|
|
162
|
+
const processBackupEveryDay = async () => {
|
|
166
163
|
// if > 1 day
|
|
167
|
-
const
|
|
164
|
+
const lastTimestamp = await getLastTimestamp()
|
|
165
|
+
const diff = backupInterval + lastTimestamp - new Date().getTime()
|
|
168
166
|
const diffMin = Math.round(diff / (1000 * 60))
|
|
169
167
|
if (diff < 0 || debugBackupNow) {
|
|
170
168
|
console.log(`[BACKUP] time has come, BACKUP!`);
|
|
169
|
+
|
|
170
|
+
let backupCli = `${replaceTimestampCli()}; mkdir '${backupFolder}'; mkdir '${backupFolder}/backups'; cd '${backupFolder}'; echo '[${new Date().toLocaleString()}] -> new backup started' >> backups.txt; ${tarExec} --xz --verbose --create --file="backups/tiro.$(ls backups/ | wc -l | sed 's/^ *//;s/ *$//').tar.xz" '${dataFolder}' --listed-incremental='${backupFolder}metadata.snar'; ${postBackupScript}`
|
|
171
171
|
// append to backup CLI current timestamp to last_backup_timestamp
|
|
172
172
|
// execute cli
|
|
173
173
|
tHelpers.execCmdInFile(backupCli, backupFolder+"cli.sh", {
|
|
174
174
|
showLog: argsObj.verbose
|
|
175
175
|
})
|
|
176
|
+
|
|
177
|
+
const debugObj = {backupFolder, postBackupScriptFile, lastTimestamp, postBackupScript, timeInterval, backupCli}
|
|
178
|
+
|
|
179
|
+
console.log (debugObj);
|
|
176
180
|
} else {
|
|
177
181
|
console.log(`[BACKUP] time has no come... still waiting for ${diffMin} mins`);
|
|
178
182
|
}
|