flake8 clean up

This commit is contained in:
Eddy Hintze
2020-01-19 09:40:41 -05:00
parent e6817cc1de
commit 6fa1a54228
5 changed files with 94 additions and 32 deletions

View File

@@ -9,7 +9,12 @@ logger = logging.getLogger(__name__)
def _clean_name(dirty_str):
allowed_chars = (' ', '_', '.', '-', ':', '[', ']')
return "".join([c for c in dirty_str.replace('+', '_') if c.isalpha() or c.isdigit() or c in allowed_chars]).strip()
clean = []
for c in dirty_str.replace('+', '_'):
if c.isalpha() or c.isdigit() or c in allowed_chars:
clean.append(c)
return "".join(c.strip())
def download_library(cookie_path, library_path, progress_bar=False):
@@ -29,9 +34,12 @@ def download_library(cookie_path, library_path, progress_bar=False):
headers={'cookie': account_cookies})
logger.debug(f"Library request: {library_r}")
library_page = parsel.Selector(text=library_r.text)
orders_json = json.loads(library_page.css('#user-home-json-data')
.xpath('string()').extract_first())
for order_id in json.loads(library_page.css('#user-home-json-data').xpath('string()').extract_first())['gamekeys']:
order_r = requests.get(f'https://www.humblebundle.com/api/v1/order/{order_id}?all_tpkds=true',
for order_id in orders_json['gamekeys']:
order_url = f'https://www.humblebundle.com/api/v1/order/{order_id}?all_tpkds=true' # noqa: E501
order_r = requests.get(order_url,
headers={'cookie': account_cookies})
logger.debug(f"Order request: {order_r}")
order = order_r.json()
@@ -41,8 +49,11 @@ def download_library(cookie_path, library_path, progress_bar=False):
item_title = _clean_name(item['human_name'])
# Get all types of download for a product
for download_type in item['downloads']:
# platform = download_type['platform'] # Type of product, ebook, videos, etc...
item_folder = os.path.join(library_path, bundle_title, item_title)
# Type of product, ebook, videos, etc...
# platform = download_type['platform']
item_folder = os.path.join(
library_path, bundle_title, item_title
)
# Create directory to save the files to
try: os.makedirs(item_folder) # noqa: E701
@@ -55,7 +66,7 @@ def download_library(cookie_path, library_path, progress_bar=False):
filename = os.path.join(item_folder, f"{item_title}.{ext}")
item_r = requests.get(url, stream=True)
logger.debug(f"Item request: {item_r}, Url: {url}")
# Not sure which value will be best to use, so save them all for now
# Not sure which value will be best to use, so use them all
file_info = {
'md5': file_type['md5'],
'sha1': file_type['sha1'],
@@ -74,17 +85,24 @@ def download_library(cookie_path, library_path, progress_bar=False):
else:
dl = 0
total_length = int(total_length)
for data in item_r.iter_content(chunk_size=4096):
for data in item_r.iter_content(chunk_size=4096): # noqa E501
dl += len(data)
outfile.write(data)
pb_width = 50
done = int(pb_width * dl / total_length)
if progress_bar: print(f"Downloading: {item_title}.{ext}: {int(done * (100 / pb_width))}% [{'=' * done}{' ' * (pb_width-done)}]", end='\r') # noqa: E501, E701
if progress_bar:
print(f"Downloading: {item_title}.{ext}: {int(done * (100 / pb_width))}% [{'=' * done}{' ' * (pb_width-done)}]", end='\r') # noqa: E501, E701
if progress_bar:
print() # print new line so next progress bar is on its own line
# print new line so next progress bar
# is on its own line
print()
cache_data[filename] = file_info
# Update cache file with newest data so if the script quits it can keep track of the progress
# Update cache file with newest data so if the script
# quits it can keep track of the progress
with open(cache_file, 'w') as outfile:
json.dump(cache_data, outfile, sort_keys=True, indent=4)
json.dump(
cache_data, outfile,
sort_keys=True, indent=4,
)