jp (pubsub, common): fixed last item edition (keep item id instead of creating a new one)

This commit is contained in:
Goffi 2017-06-28 20:28:24 +02:00
commit 364130bcbe

View file

@ -331,7 +331,7 @@ class BaseEdit(object):
return max(available, key=lambda path: os.stat(path).st_mtime)
def getItemData(self, service, node, item):
"""return formatted content and metadata (or not if use_metadata is false)"""
"""return formatted content, metadata (or not if use_metadata is false), and item id"""
raise NotImplementedError
def getTmpSuff(self):
@ -426,9 +426,9 @@ class BaseEdit(object):
self.disp(u'Editing requested published item', 2)
try:
if self.use_metadata:
content, metadata = self.getItemData(pubsub_service, pubsub_node, pubsub_item)
content, metadata, pubsub_item = self.getItemData(pubsub_service, pubsub_node, pubsub_item)
else:
content = self.getItemData(pubsub_service, pubsub_node, pubsub_item)
content, pubsub_item = self.getItemData(pubsub_service, pubsub_node, pubsub_item)
except Exception as e:
self.disp(u"Error while retrieving last item: {}".format(e))
self.host.quit(1)
@ -455,9 +455,9 @@ class BaseEdit(object):
try:
# we try to get existing item
if self.use_metadata:
content, metadata = self.getItemData(pubsub_service, pubsub_node, self.args.item)
content, metadata, pubsub_item = self.getItemData(pubsub_service, pubsub_node, self.args.item)
else:
content = self.getItemData(pubsub_service, pubsub_node, self.args.item)
content, pubsub_item = self.getItemData(pubsub_service, pubsub_node, self.args.item)
except Exception as e:
# FIXME: ugly but we have not good may to check errors in bridge
if u'item-not-found' in unicode(e):