Merge pull request #1474 from Hirobreak/backup-log

Backup Fix and Log

Author: javiteri95

electron_app/src/database/DBEexporter.js

@@ -596,8 +596,7 @@ const exportLabelTable = async accountId => {
   return formatTableRowsToString(Table.LABEL, labelRows);
 };
 
-const exportEmailTable = async accountId => {
-  const username = myAccount.email;
+const exportEmailTable = async (accountId, email) => {
   let emailRows = [];
   let shouldEnd = false;
   let offset = 0;
@@ -629,14 +628,14 @@ const exportEmailTable = async accountId => {
 
           const body =
             (await getEmailBody({
-              username,
+              username: email,
               metadataKey: newRow.key,
               password: globalManager.databaseKey.get()
             })) ||
             newRow.content ||
             '';
           const headers = await getEmailHeaders({
-            username,
+            username: email,
             metadataKey: newRow.key,
             password: globalManager.databaseKey.get()
           });
@@ -847,6 +846,7 @@ const exportEncryptDatabaseToFile = async ({
   const [recipientId, domain] = accountObj
     ? accountObj.recipientId.split('@')
     : myAccount.recipientId.split('@');
+  const accountEmail = `${recipientId}@${domain || APP_DOMAIN}`;
   const accountId = accountObj ? accountObj.id : myAccount.id;
   const signature =
     accountObj && accountObj.signature !== undefined
@@ -876,7 +876,7 @@ const exportEncryptDatabaseToFile = async ({
   handleProgressCallback(
     exportProgress,
     'saving_account',
-    `${recipientId}@${domain || APP_DOMAIN}`,
+    accountEmail,
     progressCallback
   );
 
@@ -926,13 +926,13 @@ const exportEncryptDatabaseToFile = async ({
       progressCallback
     );
 
-    const result = await exportTable.export(accountId);
+    const result = await exportTable.export(accountId, accountEmail);
 
     exportProgress += 100 / PROGRESS_TOTAL_STEPS;
     handleProgressCallback(
       exportProgress,
       `saving_${exportTable.suffix}`,
-      `${recipientId}@${domain || APP_DOMAIN}`,
+      accountEmail,
       progressCallback
     );
 
@@ -943,7 +943,7 @@ const exportEncryptDatabaseToFile = async ({
   handleProgressCallback(
     exportProgress,
     'almost_done',
-    `${recipientId}@${domain || APP_DOMAIN}`,
+    accountEmail,
     progressCallback
   );
 };

electron_app/src/database/DBEmodel.js

@@ -10,6 +10,7 @@ const Model = Sequelize.Model;
 const Op = Sequelize.Op;
 const { parseDate, formatDate } = require('./../utils/TimeUtils');
 const { DEFAULT_PIN } = require('./../utils/const');
+const logger = require('../logger');
 
 let sequelize;
 
@@ -609,7 +610,7 @@ const initDatabaseEncrypted = async (
       }
     );
   } catch (ex) {
-    console.error(ex);
+    logger.error(ex);
   }
 };
 

electron_app/src/ipc/backup.js

@@ -22,6 +22,7 @@ const {
 const { APP_DOMAIN } = require('../utils/const');
 const { updateAccount } = require('./../database');
 const myAccount = require('../Account');
+const logger = require('../logger');
 let autoBackupsTime = [];
 let currentAutobackup = null;
 let nextBackupTimer = null;
@@ -68,6 +69,11 @@ const doExportBackupUnencrypted = async params => {
       ? accountObj.recipientId.split('@')
       : myAccount.recipientId.split('@');
 
+    logger.info(
+      `Unencrypted Backup Started For Account: ${recipientId}@${domain ||
+        APP_DOMAIN}`
+    );
+
     handleProgressCallback(
       -1,
       'starting_backup',
@@ -133,6 +139,7 @@ ipc.answerRenderer('export-backup-encrypted', async params => {
     await simulatePause(2000);
     globalManager.windowsEvents.enable();
     commitBackupStatus('local-backup-enable-events', 2);
+    logger.info(`Encrypted Backup Started for Path: ${backupPath}`);
     const backupSize = await exportBackupEncrypted({
       backupPath,
       password
@@ -222,7 +229,7 @@ const initAutoBackupMonitor = () => {
       !autoBackupNextDate ||
       account.id === currentAutobackup
     )
-      return;
+      continue;
 
     const now = moment();
     const pendingDate = moment(autoBackupNextDate);
@@ -235,6 +242,8 @@ const initAutoBackupMonitor = () => {
   }
 
   if (!currentAutobackup) checkNextBackup();
+
+  logger.debug(`Backups : ${JSON.stringify(autoBackupsTime)}`);
 };
 
 const checkNextBackup = () => {
@@ -246,24 +255,29 @@ const checkNextBackup = () => {
     return 0;
   });
 
+  logger.debug(
+    `Next Backup : ${autoBackupsTime[0].accountId} : $ ${
+      autoBackupsTime[0].username
+    } in ${autoBackupsTime[0].triggerTimer} miliseconds`
+  );
   if (nextBackupTimer) clearTimeout(nextBackupTimer);
   nextBackupTimer = setTimeout(() => {
     initAutoBackup(autoBackupsTime[0].accountId);
   }, autoBackupsTime[0].triggerTimer);
 };
 
 const initAutoBackup = async accountId => {
+  currentAutobackup = accountId;
   autoBackupsTime = autoBackupsTime.filter(timer => {
     return timer.accountId !== accountId;
   });
-  currentAutobackup = accountId;
 
   const account = myAccount.loggedAccounts.find(acc => acc.id === accountId);
   if (!account) {
     backupDone();
     return;
   }
-
+  logger.info(`Backup Started For Account: ${account.recipientId}`);
   const {
     autoBackupEnable,
     autoBackupPath,
@@ -278,6 +292,7 @@ const initAutoBackup = async accountId => {
   try {
     const backupFileName = defineBackupFileName('db');
     const backupSize = await doExportBackupUnencrypted({
+      accountObj: account,
       backupPath: `${autoBackupPath}/${backupFileName}`,
       progressCallback: data => {
         send('backup-progress', data);
@@ -295,19 +310,20 @@ const initAutoBackup = async accountId => {
       autoBackupLastSize: backupSize,
       autoBackupNextDate: nextDate.format(backupDateFormat)
     });
+    logger.debug(`Backup Finished : ${accountId}`);
     const timeDiff = nextDate.diff(today);
     autoBackupsTime.push({
       username: account.recipientId,
-      accountId,
+      id: accountId,
       triggerTimer: timeDiff <= 0 ? 1 : timeDiff
     });
 
     backupDone();
   } catch (backupErr) {
-    log(
+    logger.error(
       `Failed to do scheduled backup for account ${account.recipientId} : ${
         account.name
-      }`
+      } => ${backupErr}`
     );
     backupFail();
   }
@@ -316,7 +332,7 @@ const initAutoBackup = async accountId => {
 const backupDone = () => {
   currentAutobackup = null;
   nextBackupTimer = null;
-  checkNextBackup();
+  initAutoBackupMonitor();
 };
 
 const backupFail = () => {
@@ -340,15 +356,9 @@ ipc.answerRenderer('disable-auto-backup', accountId => {
     return timer.accountId !== accountId;
   });
 
-  if (!currentAutobackup) checkNextBackup();
+  if (!currentAutobackup) initAutoBackupMonitor();
 });
 
-const log = message => {
-  if (process.env.NODE_ENV === 'development') {
-    console.log(`[AutoBackup]: ${message}`);
-  }
-};
-
 process.on('exit', () => {
   clearTimeout(nextBackupTimer);
   currentAutobackup = null;

email_mailbox/src/components/popuphoc.scss

@@ -5,7 +5,6 @@
 }
 
 .popup-container{
-  box-shadow: 0 1px 16px 0 rgba(143, 143, 143, 0.56);
   border: solid 1px transparent;
   border-radius: 15px;
   position: absolute;

email_mailbox/src/components/threads.scss

@@ -54,7 +54,7 @@
 
   .threads-content{
     overflow-y: auto;
-    height: calc(100% - 125px);
+    height: calc(100% - 124px);
     padding: 44px 20px 20px 20px;
     position: relative;
     width: calc(100% - 40px);