change deleteOldestBackup to promise/async

[chrome-ext/tabs-backup.git] / background.js

diff --git a/background.js b/background.js
index 4ba12fa3db836b144cc10e1203cd25ed2f5ef3a1..894baa990544db82fabd3e91a27c50280756ca4a 100644 (file)
--- a/background.js
+++ b/background.js
@@ -48,35 +48,24 @@ function onAlarm (alarm) {
        //      perform automatic backup
                backupNow(true, formattedDate, function({success, backupName, backupObj}) {
                        // automatic backup completed
-                       var popupViews = chrome.extension.getViews({type: "popup"});
-                       if (popupViews.length > 0) {
-                               for (var i = 0; i < popupViews.length; i++) {
-                                       var popupView = popupViews[i];
-                                       if (!popupView.insertBackupItem) {
-                                               continue;
-                                       }
-
-                                       popupView.insertBackupItem(backupName, backupObj, true /*insertAtBeginning*/, true /*doAnimation*/);
-                                       popupView.updateStorageInfo();
-                               }
-                       }
+                       chrome.runtime.sendMessage({
+                               action: 'insertBackupItem',
+                               args: [backupName, backupObj, true /*insertAtBeginning*/, true /*doAnimation*/],
+                       });
                });
 }
 
 chrome.alarms.onAlarm.addListener(onAlarm);
 
-function date_prependZero (val) {
-       return val < 10 ? "0" + val : "" + val;
-}
-
-// yyyy-m-d h:i:s
-function date_format (d) {
-       var monthOneOffset = d.getMonth() + 1; // convert from 0-11 to 1-12
-
-       var formattedDate = d.getFullYear() + "-" + date_prependZero(monthOneOffset) + "-" + date_prependZero(d.getDate())
-               + " " + date_prependZero(d.getHours()) + ":" + date_prependZero(d.getMinutes()) + ":" + date_prependZero(d.getSeconds());
-
-       return formattedDate;
+// yyyy-mm-dd hh:mm:ss
+function date_format(d) {
+       const prependZero = (val) => val.toString().padStart(2, '0');
+       return d.getFullYear() + "-" +
+               prependZero(d.getMonth() + 1) + "-" +
+               prependZero(d.getDate()) + " " +
+               prependZero(d.getHours()) + ":" +
+               prependZero(d.getMinutes()) + ":" +
+               prependZero(d.getSeconds());
 }
 
 
@@ -89,54 +78,23 @@ function backupNowManual (callbackDone) {
 
 }
 
-function deleteOldestBackup () {
-       chrome.storage.local.get(function(items) {
-               if(!items.backups_list) {
-                       return;
-               }
-
-               var backupsList = items.backups_list;
-               var numItemsToDelete = backupsList.length - items.prefs_max_backup_items;
-               if (numItemsToDelete > 0) {
-                       var i = 0;
-                       var loopFunc = function () {
-                               //
-                               if (i > 0) {
-                                       var deletedBackupName = backupsList[i-1];
-                                       var popupViews = chrome.extension.getViews({type: "popup"});
-                                       if (popupViews.length > 0) {
-                                               for (var j = 0; j < popupViews.length; j++) {
-                                                       var popupView = popupViews[j];
-                                                       if (!popupView.removeBackupItemDiv) {
-                                                               continue;
-                                                       }
-
-                                                       popupView.removeBackupItemDiv(deletedBackupName);
-                                                       popupView.updateStorageInfo();
-                                               }
-                                       }
-                               }
-                               //
-
-                               if (i >= numItemsToDelete) {
-                                       return;
-                               }
-
-                               deleteBackup (backupsList[i], loopFunc);
-                               i++;
-                       };
-
-                       loopFunc ();
-               }
-
-               //for (var i = 0; i < numItemsToDelete; i++) {
-               // TODO WARNING: I'm calling deleteBackup rapidly, while deleting is async...(I should wait for each delete to complete before deleting the next)
-                       //deleteBackup (backupsList[i], function() {
+async function deleteOldestBackup() {
+       const items = await chrome.storage.local.get();
+       if (!items.backups_list) {
+               return;
+       }
 
-                       //});
-               //}
+       const backupsList = items.backups_list;
+       const numItemsToDelete = backupsList.length - items.prefs_max_backup_items;
+       for (let i = 0; i < numItemsToDelete; ++i) {
+               const deletedBackupName = backupsList[i];
+               await deleteBackup(deletedBackupName);
 
-       });
+               chrome.runtime.sendMessage({
+                       action: 'removeBackupItemDiv',
+                       args: [deletedBackupName],
+               });
+       }
 }
 
 //var isCreatingBackup = false;
@@ -193,6 +151,11 @@ function backupNow(isAutomatic, backupName, callbackDone) {
 
                                //console.log("==> Tab " + j + " (" + tab.index + "): " + tabUrl);
 
+                               // Ignore windows that we can't/shouldn't backup.
+                               if (tab.url.startsWith('chrome-untrusted://')) {
+                                       continue;
+                               }
+
                                var bkpTab = {
                                        url: tab.url,
                                        title: tab.title,
@@ -204,9 +167,11 @@ function backupNow(isAutomatic, backupName, callbackDone) {
                                bkpWindow.tabs.push(bkpTab);
                        }
 
-                       totNumTabs += windowTabs.length;
+                       if (bkpWindow.tabs.length) {
+                               totNumTabs += bkpWindow.tabs.length;
 
-                       fullBackup.windows.push(bkpWindow);
+                               fullBackup.windows.push(bkpWindow);
+                       }
                }
 
                if (totNumTabs == 0)
@@ -286,44 +251,30 @@ function updateBrowserActionIcon (status) {
        chrome.action.setIcon({path: icon});
 }
 
-function deleteBackup (backupName, callback) {
+async function deleteBackup(backupName) {
        console.log("Deleting backup " + backupName);
 
-       chrome.storage.local.remove(backupName, function() {
-               //console.log ("=> Deleted backup " + backupName);
-
-               chrome.storage.local.get("backups_list", function(items) {
-                       //console.log ("==> got backups_list " + backupName);
-
-                       if(!items.backups_list) {
-                               callback();
-                               return;
-                       }
-
-                       var backupsList = items.backups_list;
-
-                       var index = backupsList.indexOf(backupName);
-                       if (index >= 0) {
-                               backupsList.splice(index, 1);
-                       }
-
-                       //console.log ("===> Updating backups_list (removing " + backupName + ")");
-
-                       chrome.storage.local.set({"backups_list": backupsList}, function() {
-                               //console.log ("===> Updated backups_list (removed " + backupName + ")");
+       await chrome.storage.local.remove(backupName);
+       //console.log("=> Deleted backup " + backupName);
 
-                               callback();
-                       });
+       const items = await chrome.storage.local.get("backups_list");
+       //console.log("==> got backups_list " + backupName);
 
-                       //console.log ("==> EXIT got backups_list " + backupName);
-               });
+       if (!items.backups_list) {
+               return;
+       }
 
-               //console.log ("=> EXIT Deleted backup " + backupName);
-       });
+       var backupsList = items.backups_list;
 
-       //console.log("EXIT Deleting backup " + backupName);
+       var index = backupsList.indexOf(backupName);
+       if (index >= 0) {
+               backupsList.splice(index, 1);
+       }
 
+       //console.log("===> Updating backups_list (removing " + backupName + ")");
 
+       await chrome.storage.local.set({"backups_list": backupsList});
+       //console.log("===> Updated backups_list (removed " + backupName + ")");
 }
 
 function restoreNow(backupName) {
@@ -433,7 +384,7 @@ chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
                        break;
 
                case 'deleteBackup':
-                       deleteBackup(...request.args, sendResponse);
+                       deleteBackup(...request.args).then(sendResponse);
                        asyncResponse = true;
                        break;