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

Fix separate takeout archives for location provider

Browse source
This commit is contained in:
Dima Gerasimov 2020-02-26 22:02:55 +01:00
parent 4226ad4abc
commit f71ff39aad
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
my/location/takeout.py
View file

@ -25,9 +25,9 @@ except:
# fallback to default backend. warning? # fallback to default backend. warning?
import ijson # type: ignore import ijson # type: ignore
from kython import kompress # TODO
from ..common import get_files from ..common import get_files
from ..takeout import get_last_takeout
from ..kython import kompress
def get_logger(): def get_logger():
@ -107,6 +107,9 @@ def _iter_locations_fo(fo, start, stop) -> Iterator[Location]:
tag=tag tag=tag
) )
_LOCATION_JSON = 'Takeout/Location History/Location History.json'
# TODO hope they are sorted... (could assert for it) # TODO hope they are sorted... (could assert for it)
# TODO actually, path includes timestamp already... so mtime_hash isn't _really_ necessary # TODO actually, path includes timestamp already... so mtime_hash isn't _really_ necessary
# TODO CACHEW_OFF env variable? # TODO CACHEW_OFF env variable?
@ -117,7 +120,7 @@ def _iter_locations(path: Path, start=0, stop=None) -> Iterator[Location]:
if path.suffix == '.json': if path.suffix == '.json':
ctx = path.open('r') ctx = path.open('r')
else: # must be a takeout archive else: # must be a takeout archive
ctx = kompress.open(path, 'Takeout/Location History/Location History.json') ctx = kompress.open(path, _LOCATION_JSON)
with ctx as fo: with ctx as fo:
yield from _iter_locations_fo(fo, start=start, stop=stop) yield from _iter_locations_fo(fo, start=start, stop=stop)
@ -127,7 +130,7 @@ def _iter_locations(path: Path, start=0, stop=None) -> Iterator[Location]:
def iter_locations(**kwargs) -> Iterator[Location]: def iter_locations(**kwargs) -> Iterator[Location]:
from mycfg import paths from mycfg import paths
# TODO need to include older data # TODO need to include older data
last_takeout = max(get_files(paths.google.takeout_path, glob='takeout*.zip')) last_takeout = get_last_takeout(path=_LOCATION_JSON)
return _iter_locations(path=last_takeout, **kwargs) return _iter_locations(path=last_takeout, **kwargs)