From 67f64740c4175c13bad3e17611820a3e84fa59ac Mon Sep 17 00:00:00 2001
From: Abdo <abd.nh25@gmail.com>
Date: Fri, 17 Jun 2022 04:10:29 +0300
Subject: [PATCH] Accept .zip as an alias for .ankiaddon too (#1914)

---
 qt/aqt/addons.py | 12 +++++++-----
 qt/aqt/main.py   |  3 ++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/qt/aqt/addons.py b/qt/aqt/addons.py
index b5b0f1b19..30e75e173 100644
--- a/qt/aqt/addons.py
+++ b/qt/aqt/addons.py
@@ -177,7 +177,7 @@ def package_name_valid(name: str) -> bool:
 # fixme: this class should not have any GUI code in it
 class AddonManager:
 
-    ext: str = ".ankiaddon"
+    exts: list[str] = [".ankiaddon", ".zip"]
     _manifest_schema: dict = {
         "type": "object",
         "properties": {
@@ -774,8 +774,8 @@ class AddonsDialog(QDialog):
         if not mime.hasUrls():
             return None
         urls = mime.urls()
-        ext = self.mgr.ext
-        if all(url.toLocalFile().endswith(ext) for url in urls):
+        exts = self.mgr.exts
+        if all(any(url.toLocalFile().endswith(ext) for ext in exts) for url in urls):
             event.acceptProposedAction()
 
     def dropEvent(self, event: QDropEvent) -> None:
@@ -932,9 +932,11 @@ class AddonsDialog(QDialog):
 
     def onInstallFiles(self, paths: list[str] | None = None) -> bool | None:
         if not paths:
-            key = f"{tr.addons_packaged_anki_addon()} (*{self.mgr.ext})"
+            filter = f"{tr.addons_packaged_anki_addon()} " + "({})".format(
+                " ".join(f"*{ext}" for ext in self.mgr.exts)
+            )
             paths_ = getFile(
-                self, tr.addons_install_addons(), None, key, key="addons", multi=True
+                self, tr.addons_install_addons(), None, filter, key="addons", multi=True
             )
             paths = paths_  # type: ignore
             if not paths:
diff --git a/qt/aqt/main.py b/qt/aqt/main.py
index c836230e0..5772fdedf 100644
--- a/qt/aqt/main.py
+++ b/qt/aqt/main.py
@@ -1790,7 +1790,8 @@ title="{}" {}>{}</button>""".format(
         return None
 
     def _isAddon(self, buf: str) -> bool:
-        return buf.endswith(self.addonManager.ext)
+        # only accept primary extension here to avoid conflicts with deck packages
+        return buf.endswith(self.addonManager.exts[0])
 
     def interactiveState(self) -> bool:
         "True if not in profile manager, syncing, etc."