YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[enh] rename app_id to app_instance_name when relevant

Browse source
This commit is contained in:
Julien Malik 2016-03-18 16:49:15 +01:00
parent 3641dead2e
commit ace470e04a
1 changed files with 45 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
src/yunohost/app.py
View file

@ -57,8 +57,8 @@ re_github_repo = re.compile(
'(/tree/(?P<tree>.+))?'
)
re_appid = re.compile(
r'^(?P<appid>[\w]+?)(__(?P<appinstance>[1-9][0-9]*))?$'
re_app_instance_name = re.compile(
r'^(?P<appid>[\w]+?)(__(?P<appinstancenb>[1-9][0-9]*))?$'
)
@ -335,69 +335,69 @@ def app_upgrade(auth, app=[], url=None, file=None):
elif not isinstance(app, list):
app = [ app ]
for app_id in app:
installed = _is_installed(app_id)
for app_instance_name in app:
installed = _is_installed(app_instance_name)
if not installed:
raise MoulinetteError(errno.ENOPKG,
m18n.n('app_not_installed', app=app_id))
m18n.n('app_not_installed', app=app_instance_name))
if app_id in upgraded_apps:
if app_instance_name in upgraded_apps:
continue
current_app_dict = app_info(app_id, raw=True)
new_app_dict = app_info(app_id, raw=True)
current_app_dict = app_info(app_instance_name, raw=True)
new_app_dict = app_info(app_instance_name, raw=True)
if file:
manifest = _extract_app_from_file(file)
elif url:
manifest = _fetch_app_from_git(url)
elif new_app_dict is None or 'lastUpdate' not in new_app_dict or 'git' not in new_app_dict:
logger.warning(m18n.n('custom_app_url_required', app=app_id))
logger.warning(m18n.n('custom_app_url_required', app=app_instance_name))
continue
elif (new_app_dict['lastUpdate'] > current_app_dict['lastUpdate']) \
or ('update_time' not in current_app_dict['settings'] \
and (new_app_dict['lastUpdate'] > current_app_dict['settings']['install_time'])) \
or ('update_time' in current_app_dict['settings'] \
and (new_app_dict['lastUpdate'] > current_app_dict['settings']['update_time'])):
manifest = _fetch_app_from_git(app_id)
manifest = _fetch_app_from_git(app_instance_name)
else:
continue
# Check requirements
_check_manifest_requirements(manifest)
app_setting_path = apps_setting_path +'/'+ app_id
app_setting_path = apps_setting_path +'/'+ app_instance_name
# Retrieve current app status
status = _get_app_status(app_id)
status = _get_app_status(app_instance_name)
status['remote'] = manifest.get('remote', None)
# Clean hooks and add new ones
hook_remove(app_id)
hook_remove(app_instance_name)
if 'hooks' in os.listdir(app_tmp_folder):
for hook in os.listdir(app_tmp_folder +'/hooks'):
hook_add(app_id, app_tmp_folder +'/hooks/'+ hook)
hook_add(app_instance_name, app_tmp_folder +'/hooks/'+ hook)
# Retrieve arguments list for upgrade script
# TODO: Allow to specify arguments
args_odict = _parse_args_from_manifest(manifest, 'upgrade', auth=auth)
args_list = args_odict.values()
args_list.append(app_id)
args_list.append(app_instance_name)
# Prepare env. var. to pass to script
env_dict = _make_environment_dict(args_odict)
app_id_withoutinstance, appinstance = _parse_appid(app_id)
env_dict["YNH_APP_INSTANCE_NUMBER"] = str(appinstance)
app_id, app_instance_nb = _parse_app_instance_name(app_instance_name)
env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
env_dict["YNH_APP_ID"] = app_id
# Execute App upgrade script
os.system('chown -hR admin: %s' % install_tmp)
if hook_exec(app_tmp_folder +'/scripts/upgrade', args=args_list, env=env_dict) != 0:
logger.error(m18n.n('app_upgrade_failed', app=app_id))
logger.error(m18n.n('app_upgrade_failed', app=app_instance_name))
else:
now = int(time.time())
# TODO: Move install_time away from app_setting
app_setting(app_id, 'update_time', now)
app_setting(app_instance_name, 'update_time', now)
status['upgraded_at'] = now
# Store app status
@ -409,8 +409,8 @@ def app_upgrade(auth, app=[], url=None, file=None):
os.system('mv "%s/manifest.json" "%s/scripts" %s' % (app_tmp_folder, app_tmp_folder, app_setting_path))
# So much win
upgraded_apps.append(app_id)
logger.success(m18n.n('app_upgraded', app=app_id))
upgraded_apps.append(app_instance_name)
logger.success(m18n.n('app_upgraded', app=app_instance_name))
if not upgraded_apps:
raise MoulinetteError(errno.ENODATA, m18n.n('app_no_upgrade'))
@ -469,40 +469,42 @@ def app_install(auth, app, label=None, args=None):
m18n.n('app_already_installed', app=app_id))
# Change app_id to the forked app id
app_id = app_id + '__' + str(instance_number)
app_instance_name = app_id + '__' + str(instance_number)
else:
app_instance_name = app_id
# Retrieve arguments list for install script
args_dict = {} if not args else \
dict(urlparse.parse_qsl(args, keep_blank_values=True))
args_odict = _parse_args_from_manifest(manifest, 'install', args=args_dict, auth=auth)
args_list = args_odict.values()
args_list.append(app_id)
args_list.append(app_instance_name)
# Prepare env. var. to pass to script
env_dict = _make_environment_dict(args_odict)
env_dict["YNH_APP_INSTANCE_NUMBER"] = str(instance_number)
env_dict["YNH_APP_ID"] = app_id
env_dict["YNH_APP_ID"] = app_instance_name
# Create app directory
app_setting_path = os.path.join(apps_setting_path, app_id)
app_setting_path = os.path.join(apps_setting_path, app_instance_name)
if os.path.exists(app_setting_path):
shutil.rmtree(app_setting_path)
os.makedirs(app_setting_path)
# Clean hooks and add new ones
hook_remove(app_id)
hook_remove(app_instance_name)
if 'hooks' in os.listdir(app_tmp_folder):
for file in os.listdir(app_tmp_folder +'/hooks'):
hook_add(app_id, app_tmp_folder +'/hooks/'+ file)
hook_add(app_instance_name, app_tmp_folder +'/hooks/'+ file)
# Set initial app settings
app_settings = {
'id': app_id,
'id': app_instance_name,
'label': label if label else manifest['name'],
}
# TODO: Move install_time away from app settings
app_settings['install_time'] = status['installed_at']
_set_app_settings(app_id, app_settings)
_set_app_settings(app_instance_name, app_settings)
os.system('chown -R admin: '+ app_tmp_folder)
@ -528,7 +530,7 @@ def app_install(auth, app, label=None, args=None):
raise MoulinetteError(errno.EIO, m18n.n('installation_failed'))
except:
# Execute remove script and clean folders
hook_remove(app_id)
hook_remove(app_instance_name)
shutil.rmtree(app_setting_path)
shutil.rmtree(app_tmp_folder)
@ -1531,32 +1533,32 @@ def _make_environment_dict(args_dict):
env_dict[ "YNH_APP_ARG_%s" % arg_name.upper() ] = arg_value
return env_dict
def _parse_appid(appid):
def _parse_app_instance_name(app_instance_name):
"""
Parse a Yunohost app identifier and extracts the original appid
Parse a Yunohost app instance name and extracts the original appid
and the application instance number
>>> _parse_appid('yolo') == ('yolo', 1)
>>> _parse_app_instance_name('yolo') == ('yolo', 1)
True
>>> _parse_appid('yolo1') == ('yolo1', 1)
>>> _parse_app_instance_name('yolo1') == ('yolo1', 1)
True
>>> _parse_appid('yolo__0') == ('yolo__0', 1)
>>> _parse_app_instance_name('yolo__0') == ('yolo__0', 1)
True
>>> _parse_appid('yolo__1') == ('yolo', 1)
>>> _parse_app_instance_name('yolo__1') == ('yolo', 1)
True
>>> _parse_appid('yolo__23') == ('yolo', 23)
>>> _parse_app_instance_name('yolo__23') == ('yolo', 23)
True
>>> _parse_appid('yolo__42__72') == ('yolo__42', 72)
>>> _parse_app_instance_name('yolo__42__72') == ('yolo__42', 72)
True
>>> _parse_appid('yolo__23qdqsd') == ('yolo__23qdqsd', 1)
>>> _parse_app_instance_name('yolo__23qdqsd') == ('yolo__23qdqsd', 1)
True
>>> _parse_appid('yolo__23qdqsd56') == ('yolo__23qdqsd56', 1)
>>> _parse_app_instance_name('yolo__23qdqsd56') == ('yolo__23qdqsd56', 1)
True
"""
match = re_appid.match(appid)
match = re_app_instance_name.match(app_instance_name)
appid = match.groupdict().get('appid')
appinstance = int(match.groupdict().get('appinstance')) if match.groupdict().get('appinstance') is not None else 1
return (appid, appinstance)
app_instance_nb = int(match.groupdict().get('appinstancenb')) if match.groupdict().get('appinstancenb') is not None else 1
return (appid, app_instance_nb)
def is_true(arg):
"""