0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

move release url to config to be able to test updates before a release

Browse source
This commit is contained in:
j 2014-12-13 18:05:00 +01:00
parent f1863faf50
commit bc065c7fda
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
oml/settings.py
View file

@ -43,6 +43,7 @@ server_defaults = {
'localnode_discovery': True, 'localnode_discovery': True,
'directory_service': 'http://[2a01:4f8:120:3201::3]:25519', 'directory_service': 'http://[2a01:4f8:120:3201::3]:25519',
'meta_service': 'http://meta.openmedialibrary.com/api/', 'meta_service': 'http://meta.openmedialibrary.com/api/',
'release_url': 'http://downloads.openmedialibrary.com/release.json',
} }
for key in server_defaults: for key in server_defaults:

8
oml/update.py
View file

@ -18,7 +18,6 @@ import settings
ENCODING='base64' ENCODING='base64'
RELEASE_URL = 'http://downloads.openmedialibrary.com/release.json'
def verify(release): def verify(release):
vk = ed25519.VerifyingKey(settings.OML_UPDATE_KEY, encoding=ENCODING) vk = ed25519.VerifyingKey(settings.OML_UPDATE_KEY, encoding=ENCODING)
@ -54,7 +53,7 @@ def get(url, filename=None):
def check(): def check():
if settings.release: if settings.release:
release_data = get(RELEASE_URL) release_data = get(settings.server.get('release_url'))
release = json.loads(release_data.decode('utf-8')) release = json.loads(release_data.decode('utf-8'))
old = settings.release['modules']['openmedialibrary']['version'] old = settings.release['modules']['openmedialibrary']['version']
new = release['modules']['openmedialibrary']['version'] new = release['modules']['openmedialibrary']['version']
@ -64,7 +63,7 @@ def check():
def download(): def download():
if not os.path.exists(os.path.join(settings.config_path, 'release.json')): if not os.path.exists(os.path.join(settings.config_path, 'release.json')):
return True return True
release_data = get(RELEASE_URL) release_data = get(settings.server.get('release_url'))
release = json.loads(release_data.decode('utf-8')) release = json.loads(release_data.decode('utf-8'))
if verify(release): if verify(release):
ox.makedirs(settings.updates_path) ox.makedirs(settings.updates_path)
@ -73,7 +72,8 @@ def download():
for module in release['modules']: for module in release['modules']:
if release['modules'][module]['version'] > settings.release['modules'][module]['version']: if release['modules'][module]['version'] > settings.release['modules'][module]['version']:
module_tar = os.path.join(settings.updates_path, release['modules'][module]['name']) module_tar = os.path.join(settings.updates_path, release['modules'][module]['name'])
url = RELEASE_URL.replace('release.json', release['modules'][module]['name']) base_url = settings.server.get('release_url').rsplit('/', 1)[0]
url = '/'.join([base_url, release['modules'][module]['name']])
if not os.path.exists(module_tar): if not os.path.exists(module_tar):
print('download', os.path.basename(module_tar)) print('download', os.path.basename(module_tar))
get(url, module_tar) get(url, module_tar)