spalencsar/bearhub
1
0
Fork 0
mirror of https://github.com/spalencsar/bearhub.git synced 2026-07-07 01:14:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

[flatpak] fix -> not handling empty array API response when filling the app data asynchronously

Browse Source
This commit is contained in:
Vinicius Moreira
2020-08-31 10:19:17 -03:00
parent 16eb8445fb
commit fede4fb210
1 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
bauh/gems/flatpak/worker.py
View File

@@ -47,42 +47,45 @@ class FlatpakAsyncDataLoader(Thread):
if res and res.text: if res and res.text:
data = res.json() data = res.json()
if not self.app.version: if not data:
self.app.version = data.get('version') self.logger.warning("No data returned for id {} ({})".format(self.app.id, self.app.name))
else:
if not self.app.version:
self.app.version = data.get('version')
if not self.app.name: if not self.app.name:
self.app.name = data.get('name') self.app.name = data.get('name')
self.app.description = data.get('description', data.get('summary', None)) self.app.description = data.get('description', data.get('summary', None))
self.app.icon_url = data.get('iconMobileUrl', None) self.app.icon_url = data.get('iconMobileUrl', None)
self.app.latest_version = data.get('currentReleaseVersion', self.app.version) self.app.latest_version = data.get('currentReleaseVersion', self.app.version)
if self.app.latest_version and (not self.app.version or not self.app.update): if self.app.latest_version and (not self.app.version or not self.app.update):
self.app.version = self.app.latest_version self.app.version = self.app.latest_version
if not self.app.installed and self.app.latest_version: if not self.app.installed and self.app.latest_version:
self.app.version = self.app.latest_version self.app.version = self.app.latest_version
if self.app.icon_url and self.app.icon_url.startswith('/'): if self.app.icon_url and self.app.icon_url.startswith('/'):
self.app.icon_url = FLATHUB_URL + self.app.icon_url self.app.icon_url = FLATHUB_URL + self.app.icon_url
if data.get('categories'): if data.get('categories'):
cats = [] cats = []
for c in data['categories']: for c in data['categories']:
cached = self.category_cache.get(c['name']) cached = self.category_cache.get(c['name'])
if not cached: if not cached:
cached = self.format_category(c['name']) cached = self.format_category(c['name'])
self.category_cache.add_non_existing(c['name'], cached) self.category_cache.add_non_existing(c['name'], cached)
cats.append(cached) cats.append(cached)
self.app.categories = cats self.app.categories = cats
loaded_data = self.app.get_data_to_cache() loaded_data = self.app.get_data_to_cache()
self.api_cache.add(self.app.id, loaded_data) self.api_cache.add(self.app.id, loaded_data)
self.persist = self.app.supports_disk_cache() self.persist = self.app.supports_disk_cache()
else: else:
self.logger.warning("Could not retrieve app data for id '{}'. Server response: {}. Body: {}".format(self.app.id, res.status_code, res.content.decode())) self.logger.warning("Could not retrieve app data for id '{}'. Server response: {}. Body: {}".format(self.app.id, res.status_code, res.content.decode()))
except: except: