Add multi-username activity support

app/main.py

@@ -114,6 +114,33 @@ async def _fetch_with_cache(
         raise
 
 
+async def _fetch_source_usernames(
+    cache: FileCache | None,
+    source_prefix: str,
+    usernames: list[str],
+    from_date: date,
+    to_date: date,
+    fetcher_factory,
+) -> tuple[dict[str, int], bool]:
+    if not usernames:
+        return {}, False
+
+    cache_usernames = hashlib.sha1(",".join(sorted(usernames)).encode("utf-8")).hexdigest()[:12]
+    fetch_tasks: list[asyncio.Task[tuple[dict[str, int], bool]]] = []
+    for username in usernames:
+        key = f"{source_prefix}_{cache_usernames}_{username}_{from_date}_{to_date}"
+        fetch_tasks.append(asyncio.create_task(_fetch_with_cache(cache, key, fetcher_factory(username))))
+
+    combined: dict[str, int] = {}
+    stale = False
+    for data, entry_stale in await asyncio.gather(*fetch_tasks):
+        stale = stale or entry_stale
+        for day, count in data.items():
+            combined[day] = combined.get(day, 0) + int(count)
+
+    return combined, stale
+
+
 async def collect_merged_activity(
     settings: Settings,
     cache: FileCache | None,
@@ -121,58 +148,46 @@ async def collect_merged_activity(
 ) -> ActivityResult:
     from_date, to_date, days_count = compute_date_range(options)
 
-    gh_key = f"github_{settings.github_username}_{from_date}_{to_date}"
-    gt_key = f"gitea_{settings.gitea_username}_{from_date}_{to_date}"
-
     github_data: dict[str, int] = {}
     gitea_data: dict[str, int] = {}
     github_stale = False
     gitea_stale = False
 
-    fetch_names: list[str] = []
-    fetch_tasks: list[asyncio.Task[tuple[dict[str, int], bool]]] = []
-
     if options.source in ("all", "github"):
-        fetch_names.append("github")
-        fetch_tasks.append(
-            asyncio.create_task(
-                _fetch_with_cache(
-                    cache,
-                    gh_key,
-                    lambda: fetch_github_activity(
-                        username=settings.github_username,
-                        token=settings.github_token,
-                        from_date=from_date,
-                        to_date=to_date,
-                    ),
-                ),
-            )
+        github_data, github_stale = await _fetch_source_usernames(
+            cache,
+            "github",
+            settings.github_usernames,
+            from_date,
+            to_date,
+            lambda username: (
+                lambda: fetch_github_activity(
+                    username=username,
+                    token=settings.github_token,
+                    from_date=from_date,
+                    to_date=to_date,
+                )
+            ),
         )
 
     if options.source in ("all", "gitea"):
-        fetch_names.append("gitea")
-        fetch_tasks.append(
-            asyncio.create_task(
-                _fetch_with_cache(
-                    cache,
-                    gt_key,
-                    lambda: fetch_gitea_activity(
-                        base_url=settings.gitea_base_url,
-                        username=settings.gitea_username,
-                        token=settings.gitea_token,
-                        from_date=from_date,
-                        to_date=to_date,
-                    ),
-                ),
-            )
+        gitea_data, gitea_stale = await _fetch_source_usernames(
+            cache,
+            "gitea",
+            settings.gitea_usernames,
+            from_date,
+            to_date,
+            lambda username: (
+                lambda: fetch_gitea_activity(
+                    base_url=settings.gitea_base_url,
+                    username=username,
+                    token=settings.gitea_token,
+                    from_date=from_date,
+                    to_date=to_date,
+                )
+            ),
         )
 
-    for name, (data, stale) in zip(fetch_names, await asyncio.gather(*fetch_tasks), strict=True):
-        if name == "github":
-            github_data, github_stale = data, stale
-        else:
-            gitea_data, gitea_stale = data, stale
-
     merged = merge_activity(github_data, gitea_data, dates=_date_keys(from_date, to_date))
     merged = filter_activity_source(merged, options.source)
 

app/settings.py

@@ -1,9 +1,21 @@
 from functools import lru_cache
 
-from pydantic import Field
+from pydantic import Field, field_validator
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
+def split_usernames(raw: str) -> list[str]:
+    usernames: list[str] = []
+    seen: set[str] = set()
+    for part in raw.split(","):
+        username = part.strip()
+        if not username or username in seen:
+            continue
+        seen.add(username)
+        usernames.append(username)
+    return usernames
+
+
 class Settings(BaseSettings):
     model_config = SettingsConfigDict(env_file=".env", case_sensitive=False)
 
@@ -20,6 +32,21 @@ class Settings(BaseSettings):
     default_theme: str = Field(default="light", alias="DEFAULT_THEME")
     service_title: str = Field(default="git-activity-merge", alias="SERVICE_TITLE")
 
+    @field_validator("github_username", "gitea_username")
+    @classmethod
+    def _validate_username_list(cls, value: str) -> str:
+        if not split_usernames(value):
+            raise ValueError("must contain at least one username")
+        return value
+
+    @property
+    def github_usernames(self) -> list[str]:
+        return split_usernames(self.github_username)
+
+    @property
+    def gitea_usernames(self) -> list[str]:
+        return split_usernames(self.gitea_username)
+
 
 @lru_cache(maxsize=1)
 def get_settings() -> Settings: