Merge pull request #17 from AartGoossens/feature/handle_missing_metadata

Handle missing metadata

Author: AartGoossens

opendata-python/opendata/models.py

@@ -75,14 +75,15 @@ def get_activity(self, activity_id):
             self.id,
             activity_id)
 
-        date_string = utils.match_filename_to_date_strings(
-            filename=activity_id,
-            date_strings=self.metadata['RIDES'].keys()
-        )
+        metadata = None
         if self.metadata is not None:
-            metadata = self.metadata['RIDES'][date_string]
-        else:
-            metadata = None
+            date_string = utils.match_filename_to_date_strings(
+                filename=activity_id,
+                date_strings=self.metadata['RIDES'].keys()
+            )
+            if date_string is not None:
+                metadata = self.metadata['RIDES'][date_string]
+
         return Activity(activity_id, data_filepath, metadata)
 
     def activities_generator(self):

opendata-python/tests/test_models.py

@@ -88,6 +88,12 @@ def test_get_activity(self, local_athlete):
         activity = local_athlete.get_activity('1970_01_01_00_00_00.csv')
         assert isinstance(activity, models.Activity)
 
+    def test_get_activity_missing_metadata(self, local_athlete):
+        local_athlete.metadata['RIDES'] = {}
+        activity = local_athlete.get_activity('1970_01_01_00_00_00.csv')
+        assert isinstance(activity, models.Activity)
+        assert activity.metadata is None
+
     def test_get_missing_activity(self, local_athlete):
         activity = local_athlete.get_activity('1900_01_01_00_00_00.csv')
         assert not activity.has_data()