From 2e3fe92d2be02120c58b8f492e6f279fc95ce2f6 Mon Sep 17 00:00:00 2001
From: Taka <taka@vm-linux-dev>
Date: Thu, 5 Nov 2020 06:49:02 +0000
Subject: [PATCH] Improved how we handle problems downloading the scenario
 index files.

---
 vasl_templates/webapp/downloads.py |  1 +
 vasl_templates/webapp/scenarios.py | 24 ++++++++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/vasl_templates/webapp/downloads.py b/vasl_templates/webapp/downloads.py
index 0e7a4ce..53b7c45 100644
--- a/vasl_templates/webapp/downloads.py
+++ b/vasl_templates/webapp/downloads.py
@@ -72,6 +72,7 @@ class DownloadedFile:
                 # happens in a background thread, the web page will probably have already finished rendering,
                 # and without the ability to push notifications, it's too late to tell the user.
                 _logger.error( "Can't install %s data: %s", self.key, ex )
+                self.error_msg = str(ex)
 
     def __enter__( self ):
         """Gain access to the underlying data.
diff --git a/vasl_templates/webapp/scenarios.py b/vasl_templates/webapp/scenarios.py
index f398074..034aa51 100644
--- a/vasl_templates/webapp/scenarios.py
+++ b/vasl_templates/webapp/scenarios.py
@@ -107,9 +107,14 @@ def get_scenario_index():
     # generate the scenario index
     with _asa_scenarios:
         if _asa_scenarios.index is None:
-            return _make_not_available_response(
-                "Please wait, the scenario index is still downloading.", _asa_scenarios.error_msg
-            )
+            if  _asa_scenarios.error_msg:
+                return _make_not_available_response(
+                    "Couldn't get the scenario index.", _asa_scenarios.error_msg
+                )
+            else:
+                return _make_not_available_response(
+                    "Please wait, the scenario index is still downloading.", None
+                )
         return jsonify( [
             make_entry( scenario )
             for scenario in _asa_scenarios.index.values()
@@ -120,9 +125,13 @@ def get_roar_scenario_index():
     """Return the ROAR scenario index."""
     with _roar_scenarios:
         if _roar_scenarios.index is None:
-            return _make_not_available_response(
-                "Please wait, the ROAR scenarios are still downloading.", _roar_scenarios.error_msg
-            )
+            if _roar_scenarios.error_msg:
+                return _make_not_available_response(
+                    "Couldn't get the ROAR scenarios.", _roar_scenarios.error_msg
+                )
+                return _make_not_available_response(
+                    "Please wait, the ROAR scenarios are still downloading.", None
+                )
         return jsonify( _roar_scenarios.index )
 
 def _make_not_available_response( msg, msg2 ):
@@ -248,6 +257,9 @@ def _match_roar_scenario( scenario ):
         return sum( r[1] for r in results )
 
     with _roar_scenarios:
+        if not getattr( _roar_scenarios, "index", None ):
+            # NOTE: We can get here if there was a problem downloading the ROAR scenarios.
+            return []
         # try to match by scenario title
         title = scenario.get( "title" )
         if not title: