From acc7b173f032e846f3e488a3026896f30521727b Mon Sep 17 00:00:00 2001
From: Vinicius Moreira <vinicius_fmoreira@hotmail.com>
Date: Mon, 14 Mar 2022 11:58:06 -0300
Subject: [PATCH] [appimage] fix: 'get_history' is not properly sorting
 releases by version

---
 CHANGELOG.md                     |  2 +-
 bauh/gems/appimage/controller.py | 14 +++++++++++---
 bauh/gems/appimage/query.py      |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f6f3e73..7e16014d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -75,7 +75,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - AppImage
   - info: displaying attributes related to the installation after the application has been removed (search)
-  - history: not ordering by release date
+  - history: not properly sorting releases by version
 
 - Arch:
   - AUR:
diff --git a/bauh/gems/appimage/controller.py b/bauh/gems/appimage/controller.py
index 6aebfd7d..aa946ca3 100644
--- a/bauh/gems/appimage/controller.py
+++ b/bauh/gems/appimage/controller.py
@@ -13,6 +13,7 @@ from typing import Set, Type, List, Tuple, Optional, Iterable, Generator
 
 from colorama import Fore
 from packaging.version import parse as parse_version
+from packaging.version import LegacyVersion
 
 from bauh.api.abstract.context import ApplicationContext
 from bauh.api.abstract.controller import SoftwareManager, SearchResult, UpgradeRequirements, UpgradeRequirement, \
@@ -461,6 +462,9 @@ class AppImageManager(SoftwareManager):
 
         return data
 
+    def _sort_release(self, rel: tuple):
+        return rel[0]
+
     def get_history(self, pkg: AppImage) -> PackageHistory:
         history = []
         res = PackageHistory(pkg, history, -1)
@@ -498,12 +502,16 @@ class AppImageManager(SoftwareManager):
             releases = cursor.execute(query.FIND_RELEASES_BY_APP_ID.format(app_tuple[0]))
 
             if releases:
-                for idx, tup in enumerate(releases):
-                    history.append({'0_version': tup[0],
+                treated_releases = [(LegacyVersion(r[0]), *r[1:]) for r in releases]
+                treated_releases.sort(key=self._sort_release, reverse=True)
+
+                for idx, tup in enumerate(treated_releases):
+                    ver = str(tup[0])
+                    history.append({'0_version': ver,
                                     '1_published_at': datetime.strptime(tup[2], '%Y-%m-%dT%H:%M:%SZ') if tup[
                                         2] else '', '2_url_download': tup[1]})
 
-                    if res.pkg_status_idx == -1 and pkg.version == tup[0]:
+                    if res.pkg_status_idx == -1 and pkg.version == ver:
                         res.pkg_status_idx = idx
 
                 return res
diff --git a/bauh/gems/appimage/query.py b/bauh/gems/appimage/query.py
index 4408519a..6c39c557 100644
--- a/bauh/gems/appimage/query.py
+++ b/bauh/gems/appimage/query.py
@@ -7,4 +7,4 @@ FIND_APP_ID_BY_NAME_AND_GITHUB = "SELECT id FROM apps WHERE lower(name) = '{}' a
 FIND_APPS_BY_NAME = "SELECT name, github, version, url_download FROM apps WHERE lower(name) IN ({})"
 FIND_APPS_BY_NAME_ONLY_NAME = "SELECT name FROM apps WHERE lower(name) IN ({})"
 FIND_APPS_BY_NAME_FULL = "SELECT {} FROM apps".format(','.join(APP_ATTRS)) + " WHERE lower(name) IN ({})"
-FIND_RELEASES_BY_APP_ID = "SELECT {} FROM releases".format(','.join(RELEASE_ATTRS)) + " WHERE app_id = {} ORDER BY published_at desc"
+FIND_RELEASES_BY_APP_ID = "SELECT {} FROM releases".format(','.join(RELEASE_ATTRS)) + " WHERE app_id = {}"