voussoir/pixelcanvas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't insert chunks during download_bigchunk, split out function.

Browse source
This commit is contained in:
voussoir 2020-02-11 17:21:51 -08:00
parent f22746d389
commit 6afa3b0e8d
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pixelcanvas.py
View file

@ -118,7 +118,8 @@ def get_chunk(chunk_x, chunk_y, *args, **kwargs):
return get_chunk_from_db(chunk_x, chunk_y, *args, **kwargs) return get_chunk_from_db(chunk_x, chunk_y, *args, **kwargs)
except IndexError: except IndexError:
(bigchunk_x, bigchunk_y) = chunk_to_bigchunk(chunk_x, chunk_y) (bigchunk_x, bigchunk_y) = chunk_to_bigchunk(chunk_x, chunk_y)
download_bigchunk(bigchunk_x, bigchunk_y) chunks = download_bigchunk(bigchunk_x, bigchunk_y)
insert_chunks(chunks)
return get_chunk_from_db(chunk_x, chunk_y, *args, **kwargs) return get_chunk_from_db(chunk_x, chunk_y, *args, **kwargs)
def insert_chunk(chunk_x, chunk_y, data, commit=True): def insert_chunk(chunk_x, chunk_y, data, commit=True):
@ -135,6 +136,12 @@ def insert_chunk(chunk_x, chunk_y, data, commit=True):
if commit: if commit:
sql.commit() sql.commit()
def insert_chunks(chunks, commit=True):
for chunk in chunks:
insert_chunk(*chunk, commit=False)
if commit:
sql.commit()
# API FUNCTIONS # API FUNCTIONS
################################################################################ ################################################################################
def url_for_bigchunk(bigchunk_x, bigchunk_y): def url_for_bigchunk(bigchunk_x, bigchunk_y):
@ -147,7 +154,7 @@ def request(url):
def download_bigchunk(bigchunk_x, bigchunk_y): def download_bigchunk(bigchunk_x, bigchunk_y):
''' '''
Download a bigchunk into the database, and return the list of chunks. Download a bigchunk and return the list of chunks.
''' '''
url = url_for_bigchunk(bigchunk_x, bigchunk_y) url = url_for_bigchunk(bigchunk_x, bigchunk_y)
logging.info('Downloading %s', url) logging.info('Downloading %s', url)
@ -158,9 +165,6 @@ def download_bigchunk(bigchunk_x, bigchunk_y):
message += 'Got %d instead of %d' % (len(bigchunk_data), BIGCHUNK_SIZE_BYTES) message += 'Got %d instead of %d' % (len(bigchunk_data), BIGCHUNK_SIZE_BYTES)
raise ValueError(message) raise ValueError(message)
chunks = split_bigchunk(bigchunk_x, bigchunk_y, bigchunk_data) chunks = split_bigchunk(bigchunk_x, bigchunk_y, bigchunk_data)
for chunk in chunks:
insert_chunk(*chunk, commit=False)
sql.commit()
return chunks return chunks
def download_bigchunk_range(bigchunk_xy1, bigchunk_xy2): def download_bigchunk_range(bigchunk_xy1, bigchunk_xy2):
@ -439,7 +443,7 @@ def parse_coordinate_string(coordinates):
return (int(x), int(y)) return (int(x), int(y))
(xy1, xy2) = (split_xy(xy1), split_xy(xy2)) (xy1, xy2) = (split_xy(xy1), split_xy(xy2))
log.debug('Parsed coordinates %s into %s %s', coordinates, xy1, xy2) # log.debug('Parsed coordinates %s into %s %s', coordinates, xy1, xy2)
return (xy1, xy2) return (xy1, xy2)
def overview_argparse(args): def overview_argparse(args):
@ -507,7 +511,8 @@ def update_argparse(args):
bigchunk_range = chunk_range_to_bigchunk_range(*coordinates) bigchunk_range = chunk_range_to_bigchunk_range(*coordinates)
else: else:
bigchunk_range = pixel_range_to_bigchunk_range(*coordinates) bigchunk_range = pixel_range_to_bigchunk_range(*coordinates)
download_bigchunk_range(*bigchunk_range) chunks = download_bigchunk_range(*bigchunk_range)
insert_chunks(chunks)
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
subparsers = parser.add_subparsers() subparsers = parser.add_subparsers()