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

Add argument --shuffle to download chunks in random order.

Browse source
This commit is contained in:
voussoir 2020-02-13 20:28:47 -08:00
parent cb4b6a3882
commit 0b11b522c9
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pixelcanvas.py
View file

@ -3,6 +3,7 @@ import datetime
import gzip import gzip
import logging import logging
import PIL.Image import PIL.Image
import random
import requests import requests
import sqlite3 import sqlite3
import sys import sys
@ -169,13 +170,17 @@ def download_bigchunk(bigchunk_x, bigchunk_y):
chunks = split_bigchunk(bigchunk_x, bigchunk_y, bigchunk_data) chunks = split_bigchunk(bigchunk_x, bigchunk_y, bigchunk_data)
return chunks return chunks
def download_bigchunk_range(bigchunk_xy1, bigchunk_xy2, threads=1): def download_bigchunk_range(bigchunk_xy1, bigchunk_xy2, shuffle=False, threads=1):
''' '''
Given (UPPERLEFT_X, UPPERLEFT_Y), (LOWERRIGHT_X, LOWERRIGHT_Y), Given (UPPERLEFT_X, UPPERLEFT_Y), (LOWERRIGHT_X, LOWERRIGHT_Y),
download multiple bigchunks, and yield all of the small chunks. download multiple bigchunks, and yield all of the small chunks.
''' '''
bigchunks = bigchunk_range_iterator(bigchunk_xy1, bigchunk_xy2) bigchunks = bigchunk_range_iterator(bigchunk_xy1, bigchunk_xy2)
if shuffle:
bigchunks = list(bigchunks)
random.shuffle(bigchunks)
if threads < 1: if threads < 1:
raise ValueError(threads) raise ValueError(threads)
@ -416,6 +421,9 @@ update:
The coordinates which you provided are chunk coordinates instead of The coordinates which you provided are chunk coordinates instead of
pixel coordinates. pixel coordinates.
--shuffle:
Download chunks in a random order instead of from corner to corner.
--threads X: --threads X:
Use X threads to download bigchunks. Use X threads to download bigchunks.
'''.strip(), '''.strip(),
@ -534,7 +542,7 @@ 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)
chunks = download_bigchunk_range(*bigchunk_range, threads=args.threads) chunks = download_bigchunk_range(*bigchunk_range, shuffle=args.shuffle, threads=args.threads)
try: try:
insert_chunks(chunks) insert_chunks(chunks)
except KeyboardInterrupt: except KeyboardInterrupt:
@ -546,6 +554,7 @@ subparsers = parser.add_subparsers()
p_update = subparsers.add_parser('update') p_update = subparsers.add_parser('update')
p_update.add_argument('coordinates') p_update.add_argument('coordinates')
p_update.add_argument('--chunks', dest='is_chunks', action='store_true') p_update.add_argument('--chunks', dest='is_chunks', action='store_true')
p_update.add_argument('--shuffle', dest='shuffle', action='store_true')
p_update.add_argument('--threads', dest='threads', type=int, default=1) p_update.add_argument('--threads', dest='threads', type=int, default=1)
p_update.set_defaults(func=update_argparse) p_update.set_defaults(func=update_argparse)