From fa080171816ebf736a09dc7218b957ac692718b4 Mon Sep 17 00:00:00 2001
From: john liddell <jliddev@gmail.com>
Date: Tue, 17 Nov 2020 19:17:55 -0600
Subject: [PATCH] Fix some bugs

---
 .../pages/my-addons/my-addons.component.ts    |  2 +-
 .../src/app/services/addons/addon.service.ts  | 23 +++++++++++--------
 wowup-electron/src/assets/i18n/de.json        |  1 +
 wowup-electron/src/assets/i18n/en.json        |  1 +
 wowup-electron/src/assets/i18n/es.json        |  1 +
 wowup-electron/src/assets/i18n/fr.json        |  1 +
 wowup-electron/src/assets/i18n/it.json        |  1 +
 wowup-electron/src/assets/i18n/ko.json        |  1 +
 wowup-electron/src/assets/i18n/nb.json        |  1 +
 wowup-electron/src/assets/i18n/pt.json        |  1 +
 wowup-electron/src/assets/i18n/ru.json        |  1 +
 wowup-electron/src/assets/i18n/zh-TW.json     |  1 +
 wowup-electron/src/assets/i18n/zh.json        |  1 +
 13 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/wowup-electron/src/app/pages/my-addons/my-addons.component.ts b/wowup-electron/src/app/pages/my-addons/my-addons.component.ts
index 6c964e96..a91fc862 100644
--- a/wowup-electron/src/app/pages/my-addons/my-addons.component.ts
+++ b/wowup-electron/src/app/pages/my-addons/my-addons.component.ts
@@ -598,7 +598,7 @@ export class MyAddonsComponent implements OnInit, OnDestroy, AfterViewInit {
   }
 
   public getChannelTypeLocaleKey(channelType: string) {
-    return `COMMON.ENUM.ADDON_CHANNEL_TYPE.${channelType.toUpperCase()}`;
+    return `COMMON.ENUM.ADDON_CHANNEL_TYPE.${channelType?.toUpperCase()}`;
   }
 
   private async lazyLoad() {
diff --git a/wowup-electron/src/app/services/addons/addon.service.ts b/wowup-electron/src/app/services/addons/addon.service.ts
index a5c89c31..3b2ee328 100644
--- a/wowup-electron/src/app/services/addons/addon.service.ts
+++ b/wowup-electron/src/app/services/addons/addon.service.ts
@@ -309,9 +309,8 @@ export class AddonService {
 
       this._addonStorage.set(addon.id, addon);
 
-      const actionLabel = `${getEnumName(WowClientType, addon.clientType)}|${addon.providerName}|${addon.externalId}|${
-        addon.name
-      }`;
+      const actionLabel = `${getEnumName(WowClientType, addon.clientType)}|${addon.providerName}|${addon.externalId}|${addon.name
+        }`;
       this._analyticsService.trackAction("install-addon", {
         clientType: getEnumName(WowClientType, addon.clientType),
         provider: addon.providerName,
@@ -731,13 +730,17 @@ export class AddonService {
       return;
     }
 
-    const tocPaths = this.getTocPaths(addon);
-    console.debug("tocPaths", tocPaths);
-    const tocFiles = await Promise.all(_.map(tocPaths, (tocPath) => this._tocService.parse(tocPath)));
-    const orderedTocFiles = _.orderBy(tocFiles, ["wowInterfaceId", "loadOnDemand"], ["desc", "asc"]);
-    const primaryToc = _.first(orderedTocFiles);
-    this.setExternalIds(addon, primaryToc);
-    this.saveAddon(addon);
+    try {
+      const tocPaths = this.getTocPaths(addon);
+      console.debug("tocPaths", tocPaths);
+      const tocFiles = await Promise.all(_.map(tocPaths, (tocPath) => this._tocService.parse(tocPath)));
+      const orderedTocFiles = _.orderBy(tocFiles, ["wowInterfaceId", "loadOnDemand"], ["desc", "asc"]);
+      const primaryToc = _.first(orderedTocFiles);
+      this.setExternalIds(addon, primaryToc);
+      this.saveAddon(addon);
+    } catch (e) {
+      console.error(e);
+    }
   }
 
   public getTocPaths(addon: Addon) {
diff --git a/wowup-electron/src/assets/i18n/de.json b/wowup-electron/src/assets/i18n/de.json
index 4bf44edd..6ca18978 100644
--- a/wowup-electron/src/assets/i18n/de.json
+++ b/wowup-electron/src/assets/i18n/de.json
@@ -65,6 +65,7 @@
       "TOOLTIP": "{dependencyCount} {dependencyCount, plural, one{Abhängigkeit} other{Abhängigkeiten}} benötigt"
     },
     "DOWNLOAD_COUNT": {
+      "e+0": "{count}",
       "e+1": "{count}",
       "e+2": "{count}",
       "e+3": "{count} thousand",
diff --git a/wowup-electron/src/assets/i18n/en.json b/wowup-electron/src/assets/i18n/en.json
index 7f9f2bf7..960b61da 100644
--- a/wowup-electron/src/assets/i18n/en.json
+++ b/wowup-electron/src/assets/i18n/en.json
@@ -65,6 +65,7 @@
       "TOOLTIP": "{dependencyCount} required {dependencyCount, plural, =1{dependency} other{dependencies}}"
     },
     "DOWNLOAD_COUNT": {
+      "e+0": "{count}",
       "e+1": "{count}",
       "e+2": "{count}",
       "e+3": "{count} thousand",
diff --git a/wowup-electron/src/assets/i18n/es.json b/wowup-electron/src/assets/i18n/es.json
index d00d2b83..f340f3dc 100644
--- a/wowup-electron/src/assets/i18n/es.json
+++ b/wowup-electron/src/assets/i18n/es.json
@@ -65,6 +65,7 @@
       "TOOLTIP": "{dependencyCount} {dependencyCount, plural, one{dependencia requerida} other{dependencias requeridas}}"
     },
     "DOWNLOAD_COUNT": {
+      "e+0": "{count}",
       "e+1": "{count}",
       "e+2": "{count}",
       "e+3": "{count} mil",
diff --git a/wowup-electron/src/assets/i18n/fr.json b/wowup-electron/src/assets/i18n/fr.json
index d9aba063..13286ea7 100644
--- a/wowup-electron/src/assets/i18n/fr.json
+++ b/wowup-electron/src/assets/i18n/fr.json
@@ -65,6 +65,7 @@
       "TOOLTIP": "{dependencyCount} {dependencyCount, plural, one{dépendance requise} other{dépendances requises}}"
     },
     "DOWNLOAD_COUNT": {
+      "e+0": "{count}",
       "e+1": "{count}",
       "e+2": "{count}",
       "e+3": "{count} thousand",
diff --git a/wowup-electron/src/assets/i18n/it.json b/wowup-electron/src/assets/i18n/it.json
index 81d9f767..83deac83 100644
--- a/wowup-electron/src/assets/i18n/it.json
+++ b/wowup-electron/src/assets/i18n/it.json
@@ -65,6 +65,7 @@
       "TOOLTIP": "{dependencyCount} {dependencyCount, plural, one{dipendenza richiesta} other{dipendenze richieste}}"
     },
     "DOWNLOAD_COUNT": {
+      "e+0": "{count}",
       "e+1": "{count}",
       "e+2": "{count}",
       "e+3": "{count} thousand",
diff --git a/wowup-electron/src/assets/i18n/ko.json b/wowup-electron/src/assets/i18n/ko.json
index 368dbb8e..803717bb 100644
--- a/wowup-electron/src/assets/i18n/ko.json
+++ b/wowup-electron/src/assets/i18n/ko.json
@@ -65,6 +65,7 @@
       "TOOLTIP": "{dependencyCount}개의 다른 애드온 참조"
     },
     "DOWNLOAD_COUNT": {
+      "e+0": "{count}",
       "e+1": "{count}",
       "e+2": "{count} 백",
       "e+3": "{count} 천",
diff --git a/wowup-electron/src/assets/i18n/nb.json b/wowup-electron/src/assets/i18n/nb.json
index 74dbb69c..b2d10064 100644
--- a/wowup-electron/src/assets/i18n/nb.json
+++ b/wowup-electron/src/assets/i18n/nb.json
@@ -65,6 +65,7 @@
       "TOOLTIP": "{dependencyCount} required {dependencyCount, plural, one{dependency} other{dependencies}}"
     },
     "DOWNLOAD_COUNT": {
+      "e+0": "{count}",
       "e+1": "{count}",
       "e+2": "{count}",
       "e+3": "{count} thousand",
diff --git a/wowup-electron/src/assets/i18n/pt.json b/wowup-electron/src/assets/i18n/pt.json
index 53e0c317..4d1814e8 100644
--- a/wowup-electron/src/assets/i18n/pt.json
+++ b/wowup-electron/src/assets/i18n/pt.json
@@ -65,6 +65,7 @@
       "TOOLTIP": "{dependencyCount} required {dependencyCount, plural, one{dependência} other{dependências}}"
     },
     "DOWNLOAD_COUNT": {
+      "e+0": "{count}",
       "e+1": "{count}",
       "e+2": "{count}",
       "e+3": "{count} thousand",
diff --git a/wowup-electron/src/assets/i18n/ru.json b/wowup-electron/src/assets/i18n/ru.json
index 0c4c6e25..852f9677 100644
--- a/wowup-electron/src/assets/i18n/ru.json
+++ b/wowup-electron/src/assets/i18n/ru.json
@@ -65,6 +65,7 @@
       "TOOLTIP": "{dependencyCount, plural, one{Необходима} other{Необходимо}} {dependencyCount} {dependencyCount, plural, one{зависимость} few{зависимости} other{зависимостей}}"
     },
     "DOWNLOAD_COUNT": {
+      "e+0": "{count}",
       "e+1": "{count}",
       "e+2": "{count}",
       "e+3": "{count} {count, plural, one{тысяча} few{тысячи} other{тысяч}}",
diff --git a/wowup-electron/src/assets/i18n/zh-TW.json b/wowup-electron/src/assets/i18n/zh-TW.json
index 5826c245..7383e2ce 100644
--- a/wowup-electron/src/assets/i18n/zh-TW.json
+++ b/wowup-electron/src/assets/i18n/zh-TW.json
@@ -65,6 +65,7 @@
       "TOOLTIP": "{dependencyCount} 個依賴項"
     },
     "DOWNLOAD_COUNT": {
+      "e+0": "{count}",
       "e+1": "{count}",
       "e+2": "{count}",
       "e+3": "{count} thousand",
diff --git a/wowup-electron/src/assets/i18n/zh.json b/wowup-electron/src/assets/i18n/zh.json
index cf46e1d9..fe3a992a 100644
--- a/wowup-electron/src/assets/i18n/zh.json
+++ b/wowup-electron/src/assets/i18n/zh.json
@@ -65,6 +65,7 @@
       "TOOLTIP": "{dependencyCount} 个依赖项"
     },
     "DOWNLOAD_COUNT": {
+      "e+0": "{count}",
       "e+1": "{count}",
       "e+2": "{count}",
       "e+3": "{count} thousand",