GH-17: Refactor calory downloading a bit

geo_activity_playground/__main__.py

@@ -105,9 +105,6 @@ def make_activity_repository(
     apply_cache_migrations()
     config = get_config()
 
-    if "strava" in config and not skip_strava:
-        download_missing_calories()
-
     repository = ActivityRepository()
 
     if pathlib.Path("Activities").exists():
@@ -116,6 +113,7 @@ def make_activity_repository(
         import_from_strava_checkout(repository)
     if "strava" in config and not skip_strava:
         import_from_strava_api(repository)
+        download_missing_calories(repository)
 
     embellish_time_series(repository)
     compute_tile_visits(repository)

geo_activity_playground/core/activities.py

@@ -61,10 +61,13 @@ def commit(self) -> None:
             self.meta.index = self.meta["id"]
             self.meta.index.name = "index"
             self.meta.sort_values("start", inplace=True)
-            activity_path.parent.mkdir(exist_ok=True, parents=True)
-            self.meta.to_parquet(activity_path)
+            self.save()
             self._loose_activities = []
 
+    def save(self) -> None:
+        activity_path.parent.mkdir(exist_ok=True, parents=True)
+        self.meta.to_parquet(activity_path)
+
     def has_activity(self, activity_id: int) -> bool:
         if len(self.meta):
             if activity_id in self.meta["id"]:

geo_activity_playground/importers/strava_api.py

@@ -210,24 +210,18 @@ def get_detailed_activity(activity_id: int, client: Client):
     return detailed_activity
 
 
-def download_missing_calories() -> None:
-    activity_meta_path = pathlib.Path("Cache/activities.parquet")
-    if not activity_meta_path.exists():
-        return
-
-    activity_meta = pd.read_parquet(activity_meta_path)
-    activity_meta.index = activity_meta["id"]
-
+def download_missing_calories(repository: ActivityRepository) -> None:
     client = Client(access_token=get_current_access_token())
 
     try:
         for activity in tqdm(
             client.get_activities(after="2000-01-01T00:00:00Z"),
             desc="Downloading calories from Strava",
         ):
-            calories = get_detailed_activity(activity.id, client).calories
-            activity_meta.loc[activity.id, "calories"] = calories
+            if repository.has_activity(activity.id):
+                calories = get_detailed_activity(activity.id, client).calories
+                repository.meta.loc[activity.id, "calories"] = calories
     except RateLimitExceeded:
         pass
     finally:
-        activity_meta.to_parquet(activity_meta_path)
+        repository.save()