Compare commits
No commits in common. "9656b884e0c7f6af4dc56df8aab27ceb9ed77f96" and "7ab46bc48edc905d35c17c3960733e931d87123f" have entirely different histories.
9656b884e0
...
7ab46bc48e
|
@ -32,12 +32,7 @@ import sys
|
|||
from collections.abc import Iterator
|
||||
from pathlib import Path
|
||||
|
||||
from .data import (
|
||||
HIDDEN_LABEL_PREFIX,
|
||||
HIDDEN_LABEL_TOTAL,
|
||||
RealizedWorkSample,
|
||||
WorkSample,
|
||||
)
|
||||
from .data import HIDDEN_LABEL_PREFIX, HIDDEN_LABEL_TOTAL, WorkSample, RealizedWorkSample
|
||||
from .format import cli, icalendar
|
||||
from .source import git_repo
|
||||
|
||||
|
@ -50,16 +45,11 @@ HOUR = datetime.timedelta(hours=1)
|
|||
MINUTE = datetime.timedelta(minutes=1)
|
||||
|
||||
|
||||
def filter_samples(
|
||||
samples: list[WorkSample], sample_filter: set[str],
|
||||
) -> list[WorkSample]:
|
||||
def filter_samples(samples: list[WorkSample], sample_filter: set[str]) -> list[WorkSample]:
|
||||
assert len(sample_filter) > 0
|
||||
return [s for s in samples if set(s.labels).intersection(sample_filter)]
|
||||
|
||||
|
||||
def heuristically_realize_samples(
|
||||
samples: list[WorkSample],
|
||||
) -> Iterator[RealizedWorkSample]:
|
||||
def heuristically_realize_samples(samples: list[WorkSample]) -> Iterator[RealizedWorkSample]:
|
||||
"""Secret sauce.
|
||||
|
||||
Guarentees that:
|
||||
|
@ -85,7 +75,6 @@ def heuristically_realize_samples(
|
|||
previous_sample_end = sample.end_at
|
||||
del sample
|
||||
|
||||
|
||||
def parse_arguments():
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument(
|
||||
|
@ -126,7 +115,7 @@ def main():
|
|||
git_repo.iterate_samples_from_git_repository(repo_path),
|
||||
)
|
||||
|
||||
shared_time_stamps = sorted(shared_time_stamps_set, key=lambda s: s.end_at)
|
||||
shared_time_stamps = sorted(shared_time_stamps_set, key = lambda s: s.end_at)
|
||||
del shared_time_stamps_set
|
||||
|
||||
sample_filter = args.sample_filter
|
||||
|
@ -142,6 +131,4 @@ def main():
|
|||
for t in cli.generate_report(shared_time_stamps):
|
||||
sys.stdout.write(t)
|
||||
elif args.format_mode == 'icalendar':
|
||||
icalendar.generate_icalendar_file(
|
||||
shared_time_stamps, file='./output/samples.ics',
|
||||
)
|
||||
icalendar.generate_icalendar_file(shared_time_stamps, file='./output/samples.ics')
|
||||
|
|
|
@ -1 +1 @@
|
|||
__version__ = '0.1.16'
|
||||
__version__ = '0.1.15'
|
||||
|
|
|
@ -12,7 +12,6 @@ class WorkSample:
|
|||
start_at: datetime.datetime | None
|
||||
end_at: datetime.datetime | None
|
||||
|
||||
|
||||
@dataclasses.dataclass(frozen=True, order=True)
|
||||
class RealizedWorkSample(WorkSample):
|
||||
start_at: datetime.datetime
|
||||
|
|
|
@ -1,8 +1,15 @@
|
|||
import datetime
|
||||
from collections.abc import Iterator
|
||||
import argparse
|
||||
import datetime
|
||||
import urllib.parse
|
||||
|
||||
import icalendar
|
||||
|
||||
from ..data import HIDDEN_LABEL_PREFIX, RealizedWorkSample
|
||||
from personal_data.util import load_csv_file
|
||||
|
||||
|
||||
from ..data import HIDDEN_LABEL_PREFIX, HIDDEN_LABEL_TOTAL, RealizedWorkSample
|
||||
|
||||
ZERO_DURATION = datetime.timedelta(seconds=0)
|
||||
HOUR = datetime.timedelta(hours=1)
|
||||
|
@ -22,7 +29,7 @@ def create_title(sample: RealizedWorkSample) -> str:
|
|||
|
||||
def generate_calendar(
|
||||
samples: list[RealizedWorkSample],
|
||||
) -> icalendar.Calendar:
|
||||
) -> icalendar.Calendar:
|
||||
max_title_parts = 2
|
||||
|
||||
cal = icalendar.Calendar()
|
||||
|
@ -30,6 +37,7 @@ def generate_calendar(
|
|||
cal.add('version', '2.0')
|
||||
|
||||
for sample in samples:
|
||||
|
||||
title = create_title(sample)
|
||||
|
||||
description = ''
|
||||
|
@ -44,9 +52,7 @@ def generate_calendar(
|
|||
|
||||
for label_and_type in sample.labels:
|
||||
if label_and_type.startswith('author:'):
|
||||
event.add(
|
||||
'organizer', 'mailto:' + label_and_type.removeprefix('author:'),
|
||||
)
|
||||
event.add('organizer', 'mailto:'+label_and_type.removeprefix('author:'))
|
||||
|
||||
cal.add_component(event)
|
||||
del event
|
||||
|
@ -58,6 +64,7 @@ def generate_icalendar_file(
|
|||
samples: list[RealizedWorkSample],
|
||||
file: str,
|
||||
) -> None:
|
||||
|
||||
calendar = generate_calendar(samples)
|
||||
|
||||
with open(file, 'wb') as f:
|
||||
|
|
|
@ -38,23 +38,19 @@ def get_samples_from_project(repo: git.Repo) -> Iterator[WorkSample]:
|
|||
labels.append('project:' + project_name)
|
||||
labels.append('author:' + commit.author.email)
|
||||
|
||||
authored_date = datetime.datetime.fromtimestamp(
|
||||
commit.authored_date, tz=datetime.UTC,
|
||||
)
|
||||
committed_date = datetime.datetime.fromtimestamp(
|
||||
commit.committed_date, tz=datetime.UTC,
|
||||
)
|
||||
authored_date = datetime.datetime.fromtimestamp(commit.authored_date, tz=datetime.UTC)
|
||||
committed_date = datetime.datetime.fromtimestamp(commit.committed_date, tz=datetime.UTC)
|
||||
|
||||
yield WorkSample(
|
||||
labels=tuple(labels),
|
||||
start_at=None,
|
||||
end_at=authored_date,
|
||||
labels = tuple(labels),
|
||||
start_at = None,
|
||||
end_at = authored_date,
|
||||
)
|
||||
if authored_date != committed_date:
|
||||
yield WorkSample(
|
||||
labels=tuple(labels),
|
||||
start_at=None,
|
||||
end_at=committed_date,
|
||||
labels = tuple(labels),
|
||||
start_at = None,
|
||||
end_at = committed_date,
|
||||
)
|
||||
del labels
|
||||
|
||||
|
|
Reference in New Issue
Block a user