Engine downloader API for #31 (#42)

* Add is_engine_available_to_download API call

* Fix issue with worker never throwing error if engine is not found

* Add API call to get most recent engine version

* Fix some minor import issues

* Fix web urls

* Fix default server log level

* Add progress bar for project download worker_factory downloads missing engine versions

* Better error handling when invalid version is given

* Add timeouts to engine downloaders

src/engines/ffmpeg/ffmpeg_downloader.py

@@ -1,11 +1,11 @@
 import logging
 import os
-import platform
 import re
 
 import requests
 
 from src.engines.core.downloader_core import download_and_extract_app
+from src.utilities.misc_helper import current_system_cpu, current_system_os
 
 logger = logging.getLogger()
 supported_formats = ['.zip', '.tar.xz', '.dmg']
@@ -24,7 +24,7 @@ class FFMPEGDownloader:
     windows_api_url = "https://api.github.com/repos/GyanD/codexffmpeg/releases"
 
     @classmethod
-    def get_macos_versions(cls):
+    def __get_macos_versions(cls):
         response = requests.get(cls.macos_url)
         response.raise_for_status()
 
@@ -34,7 +34,7 @@ class FFMPEGDownloader:
         return [link.split('-')[-1].split('.zip')[0] for link in link_matches]
 
     @classmethod
-    def get_linux_versions(cls):
+    def __get_linux_versions(cls):
 
         # Link 1 / 2 - Current Version
         response = requests.get(cls.linux_url)
@@ -50,7 +50,7 @@ class FFMPEGDownloader:
         return releases
 
     @classmethod
-    def get_windows_versions(cls):
+    def __get_windows_versions(cls):
         response = requests.get(cls.windows_api_url)
         response.raise_for_status()
 
@@ -63,36 +63,65 @@ class FFMPEGDownloader:
 
     @classmethod
     def find_most_recent_version(cls, system_os, cpu, lts_only=False):
-        pass
+        return cls.all_versions(system_os, cpu)[0]
 
     @classmethod
-    def download_engine(cls, version, download_location, system_os=None, cpu=None):
-        system_os = system_os or platform.system().lower().replace('darwin', 'macos')
-        cpu = cpu or platform.machine().lower().replace('amd64', 'x64')
-
-        # Verify requested version is available
-        remote_url = None
-        versions_per_os = {'linux': cls.get_linux_versions, 'macos': cls.get_macos_versions, 'windows': cls.get_windows_versions}
+    def all_versions(cls, system_os=None, cpu=None):
+        system_os = system_os or current_system_os()
+        cpu = cpu or current_system_cpu()
+        versions_per_os = {'linux': cls.__get_linux_versions, 'macos': cls.__get_macos_versions, 'windows': cls.__get_windows_versions}
         if not versions_per_os.get(system_os):
             logger.error(f"Cannot find version list for {system_os}")
             return
-        if version not in versions_per_os[system_os]():
-            logger.error(f"Cannot find FFMPEG version {version} for {system_os}")
 
+        results = []
+        all_versions = versions_per_os[system_os]()
+        for version in all_versions:
+            remote_url = cls.__get_remote_url_for_version(version, system_os, cpu)
+            results.append({'cpu': cpu, 'file': os.path.basename(remote_url), 'system_os': system_os, 'url': remote_url,
+                    'version': version})
+        return results
+
+    @classmethod
+    def version_is_available_to_download(cls, version, system_os=None, cpu=None):
+        for ver in cls.all_versions(system_os, cpu):
+            if ver['version'] == version:
+                return ver
+        return None
+
+    @classmethod
+    def __get_remote_url_for_version(cls, version, system_os, cpu):
         # Platform specific naming cleanup
+        remote_url = None
         if system_os == 'macos':
             remote_url = os.path.join(cls.macos_url, f"ffmpeg-{version}.zip")
-            download_location = os.path.join(download_location, f'ffmpeg-{version}-{system_os}-{cpu}')  # override location to match linux
         elif system_os == 'linux':
-            release_dir = 'releases' if version == cls.get_linux_versions()[0] else 'old-releases'
+            release_dir = 'releases' if version == cls.__get_linux_versions()[0] else 'old-releases'
             remote_url = os.path.join(cls.linux_url, release_dir, f'ffmpeg-{version}-{cpu}-static.tar.xz')
         elif system_os == 'windows':
             remote_url = f"{cls.windows_download_url.strip('/')}/{version}/ffmpeg-{version}-full_build.zip"
+        else:
+            logger.error("Unknown system os")
+        return remote_url
+
+    @classmethod
+    def download_engine(cls, version, download_location, system_os=None, cpu=None, timeout=120):
+        system_os = system_os or current_system_os()
+        cpu = cpu or current_system_os()
+
+        # Verify requested version is available
+        if version not in cls.all_versions(system_os):
+            logger.error(f"Cannot find FFMPEG version {version} for {system_os}")
+
+        # Platform specific naming cleanup
+        remote_url = cls.__get_remote_url_for_version(version, system_os, cpu)
+        if system_os == 'macos':  # override location to match linux
+            download_location = os.path.join(download_location, f'ffmpeg-{version}-{system_os}-{cpu}')
 
         # Download and extract
         try:
             logger.info(f"Requesting download of ffmpeg-{version}-{system_os}-{cpu}")
-            download_and_extract_app(remote_url=remote_url, download_location=download_location)
+            download_and_extract_app(remote_url=remote_url, download_location=download_location, timeout=timeout)
 
             # naming cleanup to match existing naming convention
             if system_os == 'linux':