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

handle errors in my.rescuetime more carefully

Browse source
This commit is contained in:
Dima Gerasimov 2020-03-14 15:08:07 +00:00
parent 094c775480
commit c96958be9c
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
my/rescuetime.py
View file

@ -1,10 +1,9 @@
import logging
from pathlib import Path from pathlib import Path
from datetime import datetime, timedelta from datetime import datetime, timedelta
from typing import NamedTuple, Dict, List, Set, Optional from typing import NamedTuple, Dict, List, Set, Optional
from functools import lru_cache
from .common import get_files from .common import get_files, LazyLogger
from .error import Res, split_errors
# TODO get rid of it # TODO get rid of it
from kython import group_by_cmp # type: ignore from kython import group_by_cmp # type: ignore
@ -12,8 +11,7 @@ from kython import group_by_cmp # type: ignore
from mycfg import paths from mycfg import paths
def get_logger(): log = LazyLogger('my.rescuetime', level='info')
return logging.getLogger("my.rescuetime")
def _get_exports() -> List[Path]: def _get_exports() -> List[Path]:
@ -30,10 +28,18 @@ def get_model(last=0) -> Model:
return Model(_get_exports()[-last:]) return Model(_get_exports()[-last:])
def get_groups(gap=timedelta(hours=3)): def _without_errors():
model = get_model() model = get_model()
it = model.iter_entries() it = model.iter_entries()
lit = list(it) # TODO get rid of it... vit, eit = split_errors(it, ET=Exception)
# TODO FIXME handle eit somehow?
yield from vit
def get_groups(gap=timedelta(hours=3)):
vit = _without_errors()
lit = list(vit) # TODO get rid of it...
return group_by_cmp(lit, lambda a, b: (b.dt - a.dt) <= gap, dist=1) return group_by_cmp(lit, lambda a, b: (b.dt - a.dt) <= gap, dist=1)
@ -45,8 +51,9 @@ def print_groups():
def check_backed_up(hours=24): def check_backed_up(hours=24):
model = get_model(last=1) vit = _without_errors()
last = list(model.iter_entries())[-1] # TODO use some itertools stuff to get a window only?
last = list(vit)[-1]
latest_dt = last.dt latest_dt = last.dt
assert (datetime.now() - latest_dt) < timedelta(hours=hours) assert (datetime.now() - latest_dt) < timedelta(hours=hours)
@ -60,12 +67,12 @@ def fill_influxdb():
db = 'test' db = 'test'
client.drop_database(db) client.drop_database(db)
client.create_database(db) client.create_database(db)
model = get_model() vit = _without_errors()
jsons = [{ jsons = [{
"measurement": 'phone', "measurement": 'phone',
"tags": {}, "tags": {},
"time": str(e.dt), "time": str(e.dt),
"fields": {"name": e.activity}, "fields": {"name": e.activity},
} for e in model.iter_entries()] } for e in vit]
client.write_points(jsons, database=db) # TODO?? client.write_points(jsons, database=db) # TODO??