libsodium-recipe-update to url

Author: gon

pythonforandroid/recipes/libsodium/__init__.py

@@ -1,58 +1,27 @@
 from pythonforandroid.recipe import Recipe
 from pythonforandroid.util import current_directory
-from pythonforandroid.logger import shprint, error
+from pythonforandroid.logger import shprint
 from multiprocessing import cpu_count
-from urllib.request import urlopen
-from os import environ
-import json
 import sh
-
-
-def get_libsodium_urls():
-    """
-    Retrieves the download url formats for libsodium versions
-
-    Returns dict with version to url format mappings 
-    """
-    releases_url = 'https://api.github.com/repos/jedisct1/libsodium/releases'
-    with urlopen(releases_url) as response:
-        response = response.read().decode()
-    releases = json.loads(response)
-    urls = {}
-    for release in releases:
-        version = release['name']
-        file_name = 'libsodium-{}.tar.gz'.format(version)
-        for asset in release['assets']:
-            if asset['name'] == file_name:
-                download_url = asset['browser_download_url']
-                urls[version] = download_url.replace(version, '{version}')
-                break
-    return urls
-
-try:
-    URLS = get_libsodium_urls()
-except:
-    message = 'failed to get libsodium url formats'
-    error(message)
-    raise Exception(message)
+from packaging import version as packaging_version
 
 
 class LibsodiumRecipe(Recipe):
-    env_version = environ.get('VERSION_libsodium')
-    if not env_version:
-        version = '1.0.16'
-    else:
-        version = env_version
-    try:
-        url = URLS[version]
-    except KeyError:
-        message = "libsodium version '{}' not found".format(version)
-        error(message)
-        raise Exception(message)
+    version = '1.0.16'
+    url = 'https://github.com/jedisct1/libsodium/releases/download/{}/libsodium-{}.tar.gz'
     depends = []
     patches = ['size_max_fix.patch']
     built_libraries = {'libsodium.so': 'src/libsodium/.libs'}
 
+    @property
+    def versioned_url(self):
+        asked_version = packaging_version.parse(self.version)
+        recipe_version = packaging_version.parse(self._version)
+        if asked_version > recipe_version:
+            return self._url.format(self.version + '-RELEASE', self.version)
+        else:
+            return self._url.format(self.version, self.version)
+
     def build_arch(self, arch):
         env = self.get_recipe_env(arch)
         with current_directory(self.get_build_dir(arch.arch)):