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

fix hash function

Browse source
This commit is contained in:
Dima Gerasimov 2019-07-26 21:31:48 +01:00
parent d23a0abca2
commit 8bbcf6aa1d
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
location/__init__.py
View file

@ -52,12 +52,12 @@ def tagger(dt: datetime, point: geopy.Point) -> Tag:
return "other" return "other"
def _iter_locations_fo(fo) -> Iterator[Location]: def _iter_locations_fo(fo, start, stop) -> Iterator[Location]:
logger = get_logger() logger = get_logger()
total = 0 total = 0
errors = 0 errors = 0
for j in ijson.items(fo, 'locations.item'): for j in islice(ijson.items(fo, 'locations.item'), start, stop):
dt = datetime.utcfromtimestamp(int(j["timestampMs"]) / 1000) dt = datetime.utcfromtimestamp(int(j["timestampMs"]) / 1000)
if total % 10000 == 0: if total % 10000 == 0:
logger.info('processing item %d %s', total, dt) logger.info('processing item %d %s', total, dt)
@ -89,22 +89,20 @@ def _iter_locations_fo(fo) -> Iterator[Location]:
# TODO hope they are sorted... # TODO hope they are sorted...
# TODO that could also serve as basis for tz provider # TODO that could also serve as basis for tz provider
@dbcache @dbcache
def _iter_locations(path: Path) -> Iterator[Location]: def _iter_locations(path: Path, start=0, stop=None) -> Iterator[Location]:
limit = None
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, 'Takeout/Location History/Location History.json')
with ctx as fo: with ctx as fo:
yield from islice(_iter_locations_fo(fo), 0, limit) yield from _iter_locations_fo(fo, start=start, stop=stop)
# TODO wonder if old takeouts could contribute as well?? # TODO wonder if old takeouts could contribute as well??
def iter_locations() -> Iterator[Location]: def iter_locations(**kwargs) -> Iterator[Location]:
last_takeout = max(TAKEOUTS_PATH.glob('takeout*.zip')) last_takeout = max(TAKEOUTS_PATH.glob('takeout*.zip'))
return _iter_locations(last_takeout) return _iter_locations(path=last_takeout, **kwargs)
def get_locations() -> Sequence[Location]: def get_locations() -> Sequence[Location]: