Merge pull request #58 from jonathanrocher/fix/key_error_crash

Fix `KeyError` in image folder view in Stage 5.3

Author: jonathanrocher

stage5.3_fuller_application/pycasa/ui/image_folder_view.py

@@ -91,7 +91,7 @@ def traits_view(self):
     @observe("scan")
     def scan_for_faces(self, event):
         self.model.compute_num_faces()
-        self.all_data = self.model.data.copy()
+        self.all_data.update(self.model.data)
 
     @observe("selected_years")
     def update_years(self, event):
@@ -117,23 +117,25 @@ def _year_mask_default(self):
         return pd.Series(np.ones(len(self.model.data), dtype=bool))
 
     def _all_data_default(self):
+        # Enrich metadata with missing fields: date time, make
         data = self.model.data.copy()
+
         if DATETIME_COL not in data.columns:
             data[DATETIME_COL] = np.nan
 
         if MAKE_COL not in data.columns:
             data[MAKE_COL] = np.nan
 
+        def parse_year(x):
+            return x.split(":")[0] if isinstance(x, str) else "unknown"
+        data[YEAR_KEY] = data[DATETIME_COL].apply(parse_year)
+
         return data
 
     def _filtered_data_default(self):
         return self.all_data
 
     def _all_years_default(self):
-        def parse_year(x):
-            return x.split(":")[0] if isinstance(x, str) else "unknown"
-
-        self.all_data[YEAR_KEY] = self.all_data[DATETIME_COL].apply(parse_year)
         return sorted(self.all_data[YEAR_KEY].unique().tolist())