Mirrors/humblebundle-downloader
2
0
Fork 0
mirror of https://github.com/xtream1101/humblebundle-downloader.git synced 2024-11-20 08:49:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed filtering when using --trove

Browse Source
This commit is contained in:
Eddy Hintze 2020-04-11 20:21:40 -04:00
parent 69de784a75
commit 2a29824280
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -1,5 +1,11 @@
# Change log # Change log
### WIP
- pip install now requires python version 3.4+
- `--trove` will only download trove products, nothing else
- Filtering flags now work when downloading trove content
### 0.2.2 ### 0.2.2
- Confirm the download is complete by checking the expected size to what downloaded - Confirm the download is complete by checking the expected size to what downloaded
- Fixed the platform filter - Fixed the platform filter

34
humblebundle_downloader/download_library.py
View File

@ -49,18 +49,13 @@ class DownloadLibrary:
self.purchase_keys = self.purchase_keys if self.purchase_keys else self._get_purchase_keys() # noqa: E501 self.purchase_keys = self.purchase_keys if self.purchase_keys else self._get_purchase_keys() # noqa: E501
if self.trove is True: if self.trove is True:
logger.info("Checking Humble Trove...") logger.info("Only checking the Humble Trove...")
self.trove_products = self._get_trove_products() for product in self._get_trove_products():
title = _clean_name(product['human-name'])
self._process_trove_product(title, product)
else: else:
self.trove_products = [] for order_id in self.purchase_keys:
self._process_order_id(order_id)
for product in self.trove_products:
title = _clean_name(product['human-name'])
self._process_trove_product(title, product)
# Always check your purchases
for order_id in self.purchase_keys:
self._process_order_id(order_id)
def _get_trove_download_url(self, machine_name, web_name): def _get_trove_download_url(self, machine_name, web_name):
try: try:
@ -78,17 +73,32 @@ class DownloadLibrary:
return None return None
logger.debug("Signed url response {sign_r}".format(sign_r=sign_r)) logger.debug("Signed url response {sign_r}".format(sign_r=sign_r))
if sign_r.json().get('_errors') == 'Unauthorized':
logger.critical("Your account does not have access to the Trove")
sys.exit()
signed_url = sign_r.json()['signed_url'] signed_url = sign_r.json()['signed_url']
logger.debug("Signed url {signed_url}".format(signed_url=signed_url)) logger.debug("Signed url {signed_url}".format(signed_url=signed_url))
return signed_url return signed_url
def _process_trove_product(self, title, product): def _process_trove_product(self, title, product):
for download in product['downloads'].values(): for platform, download in product['downloads'].items():
# Sometimes the name has a dir in it # Sometimes the name has a dir in it
# Example is "Broken Sword 5 - the Serpent's Curse" # Example is "Broken Sword 5 - the Serpent's Curse"
# Only the windows file has a dir like # Only the windows file has a dir like
# "revolutionsoftware/BS5_v2.2.1-win32.zip" # "revolutionsoftware/BS5_v2.2.1-win32.zip"
if self._should_download_platform(platform) is False: # noqa: E501
logger.info("Skipping {platform} for {product_title}"
.format(platform=platform,
product_title=title))
continue
web_name = download['url']['web'].split('/')[-1] web_name = download['url']['web'].split('/')[-1]
ext = web_name.split('.')[-1]
if self._should_download_file_type(ext) is False:
logger.info("Skipping the file {web_name}"
.format(web_name=web_name))
continue
cache_file_key = 'trove:{name}'.format(name=web_name) cache_file_key = 'trove:{name}'.format(name=web_name)
file_info = { file_info = {
'uploaded_at': download.get('uploaded_at'), 'uploaded_at': download.get('uploaded_at'),