fz0x1/HPI
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

emfit: patch up timezone for correct local sleep time

Browse source
This commit is contained in:
Dima Gerasimov 2020-08-21 00:08:55 +01:00 • committed by karlicoss
parent d9bbf7cbf0
commit 65781dd152
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
my/emfit/__init__.py
View file

@ -32,8 +32,28 @@ def dir_hash(path: Path):
# TODO take __file__ into account somehow? # TODO take __file__ into account somehow?
@mcachew(cache_path=cache_dir() / 'emfit.cache', hashf=dir_hash, logger=dal.log) @mcachew(cache_path=cache_dir() / 'emfit.cache', hashf=dir_hash, logger=dal.log)
def datas(path: Path=config.export_path) -> Iterable[Res[Emfit]]: def datas(path: Path=config.export_path) -> Iterable[Res[Emfit]]:
# TODO FIXME excluded_sids import dataclasses
yield from dal.sleeps(config.export_path)
# data from emfit is coming in UTC. There is no way (I think?) to know the 'real' timezone, and local times matter more for sleep analysis
emfit_tz = config.timezone
for x in dal.sleeps(config.export_path):
if isinstance(x, Exception):
yield x
else:
if x.sid in config.excluded_sids:
# TODO should be responsibility of export_path (similar to HPI?)
continue
# TODO maybe have a helper to 'patch up' all dattetimes in a namedtuple/dataclass?
# TODO do the same for jawbone data?
x = dataclasses.replace(
x,
start =x.start .astimezone(emfit_tz),
end =x.end .astimezone(emfit_tz),
sleep_start=x.sleep_start.astimezone(emfit_tz),
sleep_end =x.sleep_end .astimezone(emfit_tz),
)
yield x
# TODO should be used for jawbone data as well? # TODO should be used for jawbone data as well?
@ -49,7 +69,7 @@ def pre_dataframe() -> Iterable[Res[Emfit]]:
g.clear() g.clear()
yield r yield r
else: else:
err = RuntimeError('Multiple sleeps per night, not supprted yet: {g}') err = RuntimeError(f'Multiple sleeps per night, not supported yet: {g}')
g.clear() g.clear()
yield err yield err

1
tests/emfit.py
View file

@ -18,7 +18,6 @@ def test_tz() -> None:
[s0109] = [s for s in ds if s.date.strftime('%Y%m%d') == '20190109'] [s0109] = [s for s in ds if s.date.strftime('%Y%m%d') == '20190109']
assert s0109.end.strftime('%H:%M') == '06:42' assert s0109.end.strftime('%H:%M') == '06:42'
# TODO FIXME ugh, it's broken?...
# summer time, so UTC+1 # summer time, so UTC+1
[s0411] = [s for s in ds if s.date.strftime('%Y%m%d') == '20190411'] [s0411] = [s for s in ds if s.date.strftime('%Y%m%d') == '20190411']
assert s0411.end.strftime('%H:%M') == '09:30' assert s0411.end.strftime('%H:%M') == '09:30'