ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-14 08:17:13 +03:00
Code Issues Projects Releases Wiki Activity

Utilise 'return None' to reduce check_appcast() indentation

Browse Source
This commit is contained in:
Athanasius 2020-07-19 12:06:59 +01:00
parent 739dfec114
commit bd81f05514
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
update.py
View File

@ -153,26 +153,29 @@ class Updater(object):
r = requests.get(update_feed, timeout=10) r = requests.get(update_feed, timeout=10)
except requests.RequestException as ex: except requests.RequestException as ex:
print('Error retrieving update_feed file: {}'.format(str(ex)), file=sys.stderr) print('Error retrieving update_feed file: {}'.format(str(ex)), file=sys.stderr)
else:
try:
feed = ElementTree.fromstring(r.text)
except SyntaxError as ex:
print('Syntax error in update_feed file: {}'.format(str(ex)), file=sys.stderr)
else:
for item in feed.findall('channel/item'): return None
ver = item.find('enclosure').attrib.get('{http://www.andymatuschak.org/xml-namespaces/sparkle}version')
# This will change A.B.C.D to A.B.C+D
sv = semantic_version.Version.coerce(ver)
items[sv] = EDMCVersion(version=ver, # sv might have mangled version try:
title=item.find('title').text, feed = ElementTree.fromstring(r.text)
sv=sv except SyntaxError as ex:
) print('Syntax error in update_feed file: {}'.format(str(ex)), file=sys.stderr)
# Look for any remaining version greater than appversion return None
simple_spec = semantic_version.SimpleSpec('>' + appversion)
newversion = simple_spec.select(items.keys()) for item in feed.findall('channel/item'):
ver = item.find('enclosure').attrib.get('{http://www.andymatuschak.org/xml-namespaces/sparkle}version')
# This will change A.B.C.D to A.B.C+D
sv = semantic_version.Version.coerce(ver)
items[sv] = EDMCVersion(version=ver, # sv might have mangled version
title=item.find('title').text,
sv=sv
)
# Look for any remaining version greater than appversion
simple_spec = semantic_version.SimpleSpec('>' + appversion)
newversion = simple_spec.select(items.keys())
if newversion: if newversion:
return items[newversion] return items[newversion]