git_time_tracker/__init__.py

@@ -26,18 +26,67 @@ And the ([Hamster](https://github.com/projecthamster/hamster)) manual time track
 """
 
 import argparse
+import dataclasses
 import datetime
 import logging
 import sys
-from collections.abc import Iterator
+import time
+from collections.abc import Iterator, Sequence
 from pathlib import Path
 
-from .data import HIDDEN_LABEL_PREFIX, HIDDEN_LABEL_TOTAL, WorkSample
+import git
-from .source import git_repo
 
 logger = logging.getLogger(__name__)
 
 
+@dataclasses.dataclass(frozen=True, order=True)
+class WorkSample:
+    registered_at: datetime.datetime
+    labels: Sequence[str]
+
+
+def determine_default(repo: git.Repo):
+    try:
+        repo.commit('main')
+        return 'main'
+    except:
+        return 'master'
+
+
+HIDDEN_LABEL_PREFIX = '__'
+HIDDEN_LABEL_TOTAL = HIDDEN_LABEL_PREFIX + 'TOTAL'
+
+
+def determine_project_name(repo: git.Repo) -> str:
+    remotes = repo.remotes
+    if len(remotes) > 0:
+        return remotes.origin.url.removeprefix('git@gitfub.space:')
+    return Path(repo.working_tree_dir).name
+
+
+def get_samples_from_project(repo: git.Repo) -> Iterator[WorkSample]:
+    project_name = determine_project_name(repo)
+    assert project_name is not None
+
+    # TODO: Branch on main or master or default
+
+    repo.commit()
+
+    for commit in repo.iter_commits(determine_default(repo)):
+        labels = [HIDDEN_LABEL_TOTAL]
+        labels.append('project:' + project_name)
+        labels.append('author:' + commit.author.email)
+        yield WorkSample(
+            datetime.datetime.fromtimestamp(commit.authored_date, tz=datetime.UTC),
+            tuple(labels),
+        )
+        yield WorkSample(
+            datetime.datetime.fromtimestamp(commit.committed_date, tz=datetime.UTC),
+            tuple(labels),
+        )
+        del labels
+
+
 DEFAULT_EST_TIME = datetime.timedelta(hours=1)
 
 ZERO_DURATION = datetime.timedelta(seconds=0)
@@ -61,20 +110,15 @@ def fmt_year_ranges_internal(years: list[int]) -> Iterator[str]:
             elif not range_after:
                 yield ','
 
-
 def fmt_year_ranges(years: list[int]) -> str:
     return ''.join(list(fmt_year_ranges_internal(years)))
 
-
 def fmt_line(label_type: str, label: str, total_time: datetime.timedelta) -> str:
     hours = int(total_time / HOUR)
     minutes = int((total_time - hours*HOUR)/MINUTE)
     return f'  {label_type:10} {label:40}  {hours:-4d}h {minutes:-2d}m'
 
-
+def generate_report(samples: list[WorkSample], sample_filter = frozenset()) -> Iterator[str]:
-def generate_report(
-    samples: list[WorkSample], sample_filter=frozenset(),
-) -> Iterator[str]:
     LABEL_FILTER = {}
 
     # Time spent per label
@@ -129,17 +173,8 @@ def generate_report(
 
 def parse_arguments():
     parser = argparse.ArgumentParser()
-    parser.add_argument(
+    parser.add_argument('repositories', action='extend', nargs='+', type=Path)
-        '--git-repo', action='extend', nargs='+', type=Path, dest='repositories',
+    parser.add_argument('--filter', action='extend', nargs='+', type=str, dest='sample_filter', default=[])
-    )
-    parser.add_argument(
-        '--filter',
-        action='extend',
-        nargs='+',
-        type=str,
-        dest='sample_filter',
-        default=[],
-    )
     return parser.parse_args()
 
 
@@ -150,10 +185,13 @@ def main():
 
     shared_time_stamps: set[WorkSample] = set()
     for repo_path in args.repositories:
+        try:
+            repo = git.Repo(repo_path)
+        except git.exc.InvalidGitRepositoryError:
+            logger.warning('Ignoring non-repo %s', repo_path)
+            continue
         logger.warning('Visit %s', repo_path)
-        shared_time_stamps |= set(
+        shared_time_stamps |= set(get_samples_from_project(repo))
-            git_repo.iterate_samples_from_git_repository(repo_path),
-        )
 
     shared_time_stamps = sorted(shared_time_stamps)
 

git_time_tracker/data.py

@@ -1,12 +0,0 @@
-import dataclasses
-import datetime
-from collections.abc import Sequence
-
-HIDDEN_LABEL_PREFIX = '__'
-HIDDEN_LABEL_TOTAL = HIDDEN_LABEL_PREFIX + 'TOTAL'
-
-
-@dataclasses.dataclass(frozen=True, order=True)
-class WorkSample:
-    registered_at: datetime.datetime
-    labels: Sequence[str]

git_time_tracker/source/git_repo.py

@@ -1,55 +0,0 @@
-import datetime
-import logging
-from collections.abc import Iterator
-from pathlib import Path
-
-import git
-
-from ..data import HIDDEN_LABEL_TOTAL, WorkSample
-
-logger = logging.getLogger(__name__)
-
-
-def determine_default_branch(repo: git.Repo):
-    try:
-        repo.commit('main')
-        return 'main'
-    except:
-        return 'master'
-
-
-def determine_project_name(repo: git.Repo) -> str:
-    remotes = repo.remotes
-    if len(remotes) > 0:
-        return remotes.origin.url.removeprefix('git@gitfub.space:')
-    return Path(repo.working_tree_dir).name
-
-
-def get_samples_from_project(repo: git.Repo) -> Iterator[WorkSample]:
-    project_name = determine_project_name(repo)
-    assert project_name is not None
-
-    # TODO: Branch on main or master or default
-
-    repo.commit()
-
-    for commit in repo.iter_commits(determine_default_branch(repo)):
-        labels = [HIDDEN_LABEL_TOTAL]
-        labels.append('project:' + project_name)
-        labels.append('author:' + commit.author.email)
-        yield WorkSample(
-            datetime.datetime.fromtimestamp(commit.authored_date, tz=datetime.UTC),
-            tuple(labels),
-        )
-        yield WorkSample(
-            datetime.datetime.fromtimestamp(commit.committed_date, tz=datetime.UTC),
-            tuple(labels),
-        )
-        del labels
-
-
-def iterate_samples_from_git_repository(repo_path: Path) -> Iterator[WorkSample]:
-    try:
-        yield from get_samples_from_project(git.Repo(repo_path))
-    except git.exc.InvalidGitRepositoryError:
-        logger.warning('Ignoring non-repo %s', repo_path)

test/test_util.py

@@ -1,17 +1,13 @@
 import git_time_tracker
 
-
 def test_year_ranges_1():
     assert git_time_tracker.fmt_year_ranges([1,2,3]) == '1-3'
 
-
 def test_year_ranges_2():
     assert git_time_tracker.fmt_year_ranges([1,3]) == '1,3'
 
-
 def test_year_ranges_3():
     assert git_time_tracker.fmt_year_ranges([1,2,4]) == '1-2,4'
 
-
 def test_year_ranges_4():
     assert git_time_tracker.fmt_year_ranges([1,2,4,5]) == '1-2,4-5'