Merge pull request #139 from GliderGeek/138-do-not-crash-on-one-faile…

…d-analysis skip competitors for which analysis fails
GliderGeek · Jul 11, 2018 · 433ea14 · 433ea14
2 parents 469eebc + de21d9d
commit 433ea14
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,7 @@
 Master
 - Use opensoar and aerofiles functionalities (#100, #123)
+- Do not skip HC contestants
+- Skip contestant for which analysis fails
 
 v0.56.3
 - Fix aat with fixed sector orientation

diff --git a/PySoar/analysis.py b/PySoar/analysis.py
@@ -57,7 +57,13 @@ def run(url, source, url_status=None, download_progress_label=None, analysis_pro
         return
 
     classification_method = 'pysoar'
-    competition_day.analyse_flights(classification_method, analysis_progress)
+    failed_comp_ids = competition_day.analyse_flights(classification_method, analysis_progress,
+                                                      skip_failed_analyses=True)
+
+    # remove failed competitors for which the analysis failed
+    for competitor in competition_day.competitors:
+        if competitor.competition_id in failed_comp_ids:
+            competition_day.competitors.remove(competitor)
 
     for competitor in competition_day.competitors:
 

diff --git a/requirements.txt b/requirements.txt
@@ -2,4 +2,4 @@ xlwt==1.3.0
 numpy==1.12.0b1
 pyinstaller==3.2
 aerofiles==0.4.1
-opensoar==0.1.0
+opensoar==0.1.1