jp (base): fixed URI's item with use_pubsub
This commit is contained in:
parent
86a09b6c90
commit
d4511e8e3a
1 changed files with 11 additions and 3 deletions
|
|
@ -504,14 +504,22 @@ class Jp(object):
|
||||||
self.args.node = uri_data[u'node']
|
self.args.node = uri_data[u'node']
|
||||||
uri_item = uri_data.get(u'item')
|
uri_item = uri_data.get(u'item')
|
||||||
if uri_item:
|
if uri_item:
|
||||||
|
# there is an item in URI
|
||||||
|
# we use it only if item is not already set
|
||||||
|
# and item_last is not used either
|
||||||
try:
|
try:
|
||||||
item, item_magic = self.args.item, self.args.item_magic
|
item = self.args.item
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
if not self.args.items:
|
if not self.args.items:
|
||||||
self.args.items = [uri_item]
|
self.args.items = [uri_item]
|
||||||
else:
|
else:
|
||||||
if not item and not item_magic:
|
if not item:
|
||||||
self.args.item = uri_item
|
try:
|
||||||
|
item_last = self.args.item_last
|
||||||
|
except AttributeError:
|
||||||
|
item_last = False
|
||||||
|
if not item_last:
|
||||||
|
self.args.item = uri_item
|
||||||
else:
|
else:
|
||||||
self.parser.error(_(u'XMPP URL is not a pubsub one: {url}').format(url=url))
|
self.parser.error(_(u'XMPP URL is not a pubsub one: {url}').format(url=url))
|
||||||
flags = self.args._cmd._pubsub_flags
|
flags = self.args._cmd._pubsub_flags
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue