feat: reset container number on startup (#280)

stoically · Nov 2, 2019 · 728bdc9 · 728bdc9
1 parent d2781cc
commit 728bdc9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
@@ -110,6 +110,9 @@
   "optionsGeneralContainerNumberKeepCounting": {
     "message": "Keep counting (default)"
   },
+  "optionsGeneralContainerNumberKeepCountingUntilRestart": {
+    "message": "Keep counting until browser restart"
+  },
   "optionsGeneralContainerNumberReuseNumbers": {
     "message": "Reuse available numbers"
   },

diff --git a/src/background/container.js b/src/background/container.js
@@ -205,7 +205,7 @@ class Container {
 
   getContainerNameIconColor(url) {
     let tempContainerNumber;
-    if (this.pref.container.numberMode === 'keep') {
+    if (this.pref.container.numberMode.startsWith('keep')) {
       this.storage.local.tempContainerCounter++;
       tempContainerNumber = this.storage.local.tempContainerCounter;
     }

diff --git a/src/background/runtime.js b/src/background/runtime.js
@@ -144,8 +144,14 @@ class Runtime {
 
   async onStartup() {
     // queue a container cleanup
-    await delay(15000);
-    this.container.cleanup(true);
+    delay(15000).then(() => 
+      this.container.cleanup(true)
+    );
+
+    if (this.pref.container.numberMode === 'keepuntilrestart') {
+      this.storage.local.tempContainerCounter = 0;
+      this.storage.persist();
+    }
   }
 }
 

diff --git a/src/ui/components/general.vue b/src/ui/components/general.vue
@@ -306,6 +306,9 @@ export default {
           <option value="keep">
             {{ t('optionsGeneralContainerNumberKeepCounting') }}
           </option>
+          <option value="keepuntilrestart">
+            {{ t('optionsGeneralContainerNumberKeepCountingUntilRestart') }}
+          </option>
           <option value="reuse">
             {{ t('optionsGeneralContainerNumberReuseNumbers') }}
           </option>