From d308fad51cc3ff6d3f6c150692b102e68b4812a6 Mon Sep 17 00:00:00 2001
From: DevilXD <bartosz.peszek@gmail.com>
Date: Tue, 22 Nov 2022 09:02:20 +0100
Subject: [PATCH] Remove the counter from the fetching campaigns step

---
 lang/Deutsch.json  |  2 +-
 lang/Čeština.json  |  2 +-
 lang/简体中文.json |  2 +-
 translate.py       |  5 ++---
 twitch.py          | 19 +++++++------------
 5 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/lang/Deutsch.json b/lang/Deutsch.json
index 01f4804..d4bcf0b 100644
--- a/lang/Deutsch.json
+++ b/lang/Deutsch.json
@@ -34,7 +34,7 @@
             "gathering": "Kanäle sammeln...",
             "switching": "Wechsel des Kanals...",
             "fetching_inventory": "Lade Inventar...",
-            "fetching_campaigns": "Lade Kampagnen... {counter}",
+            "fetching_campaigns": "Lade Kampagnen...",
             "adding_campaigns": "Kampagnen dem Inventar hinzufügen... {counter}"
         },
         "tabs": {
diff --git a/lang/Čeština.json b/lang/Čeština.json
index b98abf6..bbc1926 100644
--- a/lang/Čeština.json
+++ b/lang/Čeština.json
@@ -34,7 +34,7 @@
             "switching": "Přepínám mezi kanály...",
             "watching": "Sledování kanálu {channel}",
             "fetching_inventory": "Načítání inventáře...",
-            "fetching_campaigns": "Načítání dropů... {counter}",
+            "fetching_campaigns": "Načítání dropů...",
             "adding_campaigns": "Přidávám dropy... {counter}"
         },
         "tabs": {
diff --git a/lang/简体中文.json b/lang/简体中文.json
index 1703e85..81666c8 100644
--- a/lang/简体中文.json
+++ b/lang/简体中文.json
@@ -34,7 +34,7 @@
             "switching": "切换直播频道中...",
             "watching": "正在观看 {channel}",
             "fetching_inventory": "获取库存中...",
-            "fetching_campaigns": "获取掉宝活动... {counter}",
+            "fetching_campaigns": "获取掉宝活动...",
             "adding_campaigns": "将掉宝活动列表添加至库存... {counter}"
         },
         "tabs": {
diff --git a/translate.py b/translate.py
index ba71224..20d1fc6 100644
--- a/translate.py
+++ b/translate.py
@@ -242,7 +242,7 @@ default_translation: Translation = {
             "gathering": "Gathering channels...",
             "switching": "Switching the channel...",
             "fetching_inventory": "Fetching inventory...",
-            "fetching_campaigns": "Fetching campaigns... {counter}",
+            "fetching_campaigns": "Fetching campaigns...",
             "adding_campaigns": "Adding campaigns to inventory... {counter}",
         },
         "tabs": {
@@ -392,8 +392,7 @@ class Translator:
         # if we're in dev, update the template English.json file
         if not IS_PACKAGED:
             default_langpath = LANG_PATH.joinpath(f"{DEFAULT_LANG}.json")
-            if not default_langpath.exists():
-                json_save(default_langpath, default_translation)
+            json_save(default_langpath, default_translation)
         self._translation["language_name"] = DEFAULT_LANG
         # load available translation names
         for filepath in LANG_PATH.glob("*.json"):
diff --git a/twitch.py b/twitch.py
index e53946e..25008f0 100644
--- a/twitch.py
+++ b/twitch.py
@@ -1375,24 +1375,19 @@ class Twitch:
             if c["status"] in applicable_statuses  # that are currently not expired
         }
         # fetch detailed data for each campaign, in chunks
-        for i, chunk_coro in enumerate(
-            # specifically use an intermediate list per a Python bug
-            # https://github.com/python/cpython/issues/88342
-            asyncio.as_completed([
+        # specifically use an intermediate list per a Python bug
+        # https://github.com/python/cpython/issues/88342
+        status_update(_("gui", "status", "fetching_campaigns"))
+        for chunk_coro in asyncio.as_completed(
+            [
                 self.fetch_campaigns(campaigns_chunk)
                 for campaigns_chunk in chunk(available_campaigns.items(), 20)
-            ]),
-            start=1,
+            ]
         ):
-            status_update(
-                _("gui", "status", "fetching_campaigns").format(
-                    counter=f"({i}/{len(available_campaigns)})"
-                )
-            )
             chunk_campaigns_data = await chunk_coro
             # merge the inventory and campaigns datas together
             inventory_data = self._merge_data(inventory_data, chunk_campaigns_data)
-        # # use it to create campaign objects
+        # use the merged data to create campaign objects
         campaigns: list[DropsCampaign] = [
             DropsCampaign(self, campaign_data, claimed_benefits)
             for campaign_data in inventory_data.values()