Merge pull request #375 from AndreWohnsland/dev

Add addon update option

Author: AndreWohnsland

src/api/routers/options.py

@@ -272,6 +272,18 @@ async def delete_addon(addon: AddonData) -> ApiMessage:
     return ApiMessage(message=f"Addon {addon.name} removed")
 
 
+@protected_router.post("/addon/update", summary="Update addon")
+async def update_addon(addon: AddonData) -> ApiMessage:
+    possible_addons = ADDONS.get_addon_data()
+    matched_addon = next((a for a in possible_addons if a.name == addon.name and a.official), None)
+    if not matched_addon:
+        raise HTTPException(400, detail="Addon is not official or not found")
+    if matched_addon.can_update:
+        ADDONS.reload_addon(matched_addon)
+        return ApiMessage(message=f"Addon {addon.name} updated")
+    raise HTTPException(400, detail="Addon cannot be updated")
+
+
 @protected_router.get("/connection", summary="Check internet connection")
 async def check_internet_connection() -> dict[str, Union[str, bool]]:  # noqa: UP007
     is_connected = has_connection()

src/ui/setup_addon_manager.py

@@ -43,28 +43,43 @@ def _fill_addon_list(self) -> None:
             if widget:
                 widget.deleteLater()
 
-        for i, addon in enumerate(self._addon_information):
-            if addon.installed and addon.official and not addon.is_installable:
-                btn = create_button("Remove", font_size=16, max_w=150, css_class="btn-inverted destructive")
-                btn.clicked.connect(lambda _, a=addon, b=btn, c=i: self._remove_addon(a, b, c))
-            elif addon.official and addon.is_installable:
-                btn = create_button("Install", font_size=16, max_w=150, css_class="btn-inverted")
-                btn.clicked.connect(lambda _, a=addon, b=btn, c=i: self._install_addon(a, b, c))
-            else:
-                if addon.disabled:
-                    text = "Disabled"
-                elif not addon.official:
-                    text = "Unofficial"
-                else:
-                    text = f"needs {addon.minimal_version}+"
-                btn = create_button(text, font_size=16, max_w=150, css_class="neutral btn-inverted")
-                btn.setEnabled(False)
+        current_grid_index = 0
 
-            self.gridLayout_2.addWidget(btn, i, 0)
+        for addon in sorted(
+            self._addon_information,
+            key=lambda x: (x.official, x.installed, x.is_installable, x.name),
+            reverse=True,
+        ):
+            btn = self._create_addon_button(current_grid_index, addon)
+            self.gridLayout_2.addWidget(btn, current_grid_index, 0)
             content = f"{addon.name} ({addon.file_name})\n{addon.description}"
             label = create_label(content, SMALL_FONT)
             label.setWordWrap(True)
-            self.gridLayout_2.addWidget(label, i, 1)
+            self.gridLayout_2.addWidget(label, current_grid_index, 1)
+            current_grid_index += 1
+            if addon.can_update:
+                btn = create_button(f"Update ({addon.version})", font_size=16, css_class="btn-inverted")
+                btn.clicked.connect(lambda _, a=addon, b=btn, c=current_grid_index: self._update_addon(a, b, c))
+                self.gridLayout_2.addWidget(btn, current_grid_index, 1)
+                current_grid_index += 1
+
+    def _create_addon_button(self, current_grid_index: int, addon: AddonData) -> QPushButton:
+        if addon.installed and addon.official:
+            btn = create_button("Remove", font_size=16, max_w=150, css_class="btn-inverted destructive")
+            btn.clicked.connect(lambda _, a=addon, b=btn, c=current_grid_index: self._remove_addon(a, b, c))
+        elif addon.official and addon.is_installable:
+            btn = create_button("Install", font_size=16, max_w=150, css_class="btn-inverted")
+            btn.clicked.connect(lambda _, a=addon, b=btn, c=current_grid_index: self._install_addon(a, b, c))
+        else:
+            if addon.disabled:
+                text = "Disabled"
+            elif not addon.official:
+                text = "Unofficial"
+            else:
+                text = f"needs {addon.minimal_version}+"
+            btn = create_button(text, font_size=16, max_w=150, css_class="neutral btn-inverted")
+            btn.setEnabled(False)
+        return btn
 
     def _install_addon(self, addon: AddonData, btn: QPushButton, pos: int) -> None:
         """Try to install addon, log if req is not ok or no connection."""
@@ -88,3 +103,12 @@ def _remove_addon(self, addon: AddonData, btn: QPushButton, pos: int) -> None:
         btn = create_button("Install", font_size=16, max_w=200, css_class="btn-inverted")
         btn.clicked.connect(lambda _, a=addon, b=btn, c=pos: self._install_addon(a, b, c))
         self.gridLayout_2.addWidget(btn, pos, 0)
+
+    def _update_addon(self, addon: AddonData, btn: QPushButton, pos: int) -> None:
+        """Try to update addon, log if req is not ok or no connection."""
+        try:
+            ADDONS.reload_addon(addon)
+            DIALOG_HANDLER.standard_box("Addon updated successfully", "Success")
+            btn.deleteLater()
+        except CouldNotInstallAddonError as e:
+            _logger.log_event("ERROR", str(e))

web_client/src/api/options.ts

@@ -142,6 +142,10 @@ export const deleteAddon = async (addon: AddonData): Promise<{ message: string }
     .then((res) => res.data);
 };
 
+export const updateAddon = async (addon: AddonData): Promise<{ message: string }> => {
+  return axiosInstance.post<{ message: string }>(`${optionsUrl}/addon/update`, addon).then((res) => res.data);
+};
+
 // Authentication
 export const validateMakerPassword = async (password: number): Promise<{ message: string }> => {
   return axiosInstance

web_client/src/components/options/AddonManager.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { FaPlus, FaTrashAlt } from 'react-icons/fa';
-import { addAddon, deleteAddon, useAddonData } from '../../api/options';
+import { addAddon, deleteAddon, updateAddon, useAddonData } from '../../api/options';
 import { AddonData } from '../../types/models';
 import { confirmAndExecute, executeAndShow } from '../../utils';
 import ErrorComponent from '../common/ErrorComponent';
@@ -45,6 +45,14 @@ const AddonManager: React.FC = () => {
     });
   };
 
+  const handleUpdate = async (addon: AddonData) => {
+    confirmAndExecute(t('addons.updateTheAddon', { addon: addon.name }), () => updateAddon(addon)).then((success) => {
+      if (success) {
+        refetch();
+      }
+    });
+  };
+
   const createAddonButton = (addon: AddonData) => {
     if (addon.is_installable && addon.official && !addon.installed) {
       return (
@@ -89,6 +97,11 @@ const AddonManager: React.FC = () => {
               {createAddonButton(addon)}
             </div>
             <p>{addon.description}</p>
+            {addon.can_update && (
+              <button onClick={() => handleUpdate(addon)} className='button-primary-filled p-2 px-4 mt-6 w-full'>
+                {t('addons.update', { version: addon.version })}
+              </button>
+            )}
           </div>
         ))}
       </div>

web_client/src/locales/de/translation.json

@@ -114,7 +114,9 @@
     "minVersionNotMet": "Braucht Version: {{version}}",
     "cannotBeInstalled": "Kann nicht installiert werden",
     "notOfficial": "Nicht Offiziell",
-    "deleteTheAddon": "Möchtest du das Addon '{{addon}}' löschen?"
+    "deleteTheAddon": "Möchtest du das Addon '{{addon}}' löschen?",
+    "updateTheAddon": "Möchtest du das Addon '{{addon}}' updaten?",
+    "update": "Update ({{version}})"
   },
   "wifi": {
     "setupWifi": "WLAN einrichten",

web_client/src/locales/en/translation.json

@@ -114,7 +114,9 @@
     "minVersionNotMet": "Needs Version: {{version}}",
     "cannotBeInstalled": "Cannot be Installed",
     "notOfficial": "Not Official",
-    "deleteTheAddon": "Do you want to delete the addon '{{addon}}'?"
+    "deleteTheAddon": "Do you want to delete the addon '{{addon}}'?",
+    "updateTheAddon": "Do you want to update the addon '{{addon}}'?",
+    "update": "Update ({{version}})"
   },
   "wifi": {
     "setupWifi": "Set Up WiFi",