jp (merge-request/set): if service and node are not specified, URIFinder is now used + ask confirmation before publishing

This commit is contained in:
Goffi 2018-03-31 18:23:06 +02:00
commit f4a15b0ffb

View file

@ -22,9 +22,11 @@ from sat.core.i18n import _
from sat.core import exceptions
from sat.tools.common import regex
from sat.tools.common.ansi import ANSI as A
from sat.tools.common import uri as xmpp_uri
from sat.tools import config
from ConfigParser import NoSectionError, NoOptionError
from collections import namedtuple
from functools import partial
import json
import os
import os.path
@ -663,3 +665,37 @@ class Table(object):
kwargs_ = {'col_sep':u' ', 'head_line_sep':u' ', 'show_borders':False}
kwargs_.update(kwargs)
return self.display(**kwargs_)
class URIFinder(object):
"""Helper class to find URIs in well-known locations"""
def __init__(self, command, path, key, callback):
if not command.args.service and not command.args.node:
self.host = command.host
self.args = command.args
self.key = key
self.callback = callback
self.host.bridge.URIFind(path,
[key],
callback=self.URIFindCb,
errback=partial(command.errback,
msg=_(u"can't find " + key + u" URI: {}"),
exit_code=C.EXIT_BRIDGE_ERRBACK))
else:
callback()
def URIFindCb(self, uri_data):
try:
uri = uri_data[self.key]
except KeyError:
self.host.disp(_(u"No {key} URI specified for this project, please specify service and node").format(key=self.key), error=True)
self.host.quit(C.EXIT_NOT_FOUND)
parsed_uri = xmpp_uri.parseXMPPUri(uri)
try:
self.args.service = parsed_uri[u'path']
self.args.node = parsed_uri[u'node']
except KeyError:
self.host.disp(_(u"Invalid URI found: {uri}").format(uri=uri), error=True)
self.host.quit(C.EXIT_DATA_ERROR)
self.callback()