Skip to content

Commit

Permalink
fix cancel_message
Browse files Browse the repository at this point in the history
  • Loading branch information
@LipuFei
LipuFei committed Jan 21, 2015
1 parent a095d2c commit c7fdd05
Showing 1 changed file with 22 additions and 23 deletions.
45 changes: 22 additions & 23 deletions community.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,12 @@ def create_community(cls, dispersy, my_member, *args, **kargs):

# ensure that undo_callback is available
if message.undo_callback:
# we do not support undo permissions for authorize, revoke, undo-own, and
# undo-other (yet)
# we do not support undo permissions for authorize, revoke, undo-own, undo-other,
# cancel-own, and cancel-other (yet)
if not message.name in message_names:
permission_triplets.append((my_member, message, u"undo"))

# ensure that cancel_callback is available
# TODO: This is a DUPLICATE of undo, add comments after we remove undo.
if message.cancel_callback:
if not message.name in message_names:
permission_triplets.append((my_member, message, u"cancel"))
Expand All @@ -165,19 +165,18 @@ def create_community(cls, dispersy, my_member, *args, **kargs):
elif isinstance(message.distribution, SyncDistribution) and isinstance(message.resolution, PublicResolution):
# ensure that undo_callback is available
if message.undo_callback:
# we do not support undo and cancel permissions for authorize, revoke, undo-own, undo-other,
# we do not support undo permissions for authorize, revoke, undo-own, undo-other,
# cancel-own, and cancel-other (yet)
if not message.name in message_names:
for allowed in (u"authorize", u"revoke", u"undo", u"cancel"):
for allowed in (u"authorize", u"revoke", u"undo"):
permission_triplets.append((my_member, message, allowed))

# ensure that cancel_callback is available
if message.cancel_callback:
# we do not support undo and cancel permissions for authorize, revoke, undo-own, undo-other,
# cancel-own, and cancel-other (yet)
# TODO: This is a DUPLICATE of undo, add comments after we remove undo.
if message.undo_callback:
if not message.name in message_names:
for allowed in (u"authorize", u"revoke", u"undo", u"cancel"):
permission_triplets.append((my_member, message, allowed))
for allowed in (u"authorize", u"revoke", u"cancel"):
if (my_member, message, allowed) not in permission_triplets:
permission_triplets.append((my_member, message, allowed))

if permission_triplets:
community.create_authorize(permission_triplets, sign_with_master=True, forward=False)
Expand Down Expand Up @@ -3414,16 +3413,15 @@ def on_cancel(self, messages):
(self.database_id, message.payload.member.database_id, message.payload.global_time)).next()
if undone != 0:
try:
mid, global_time = self._dispersy._database.execute(
u"SELECT member.mid, sync.global_time FROM sync"
packet, = self._dispersy._database.execute(
u"SELECT sync.packet FROM sync"
u" JOIN meta_message ON meta_message.id == sync.meta_message"
u" JOIN member ON member.id == sync.member"
u" WHERE meta_message.name == 'CancelMessage' AND sync.id == ?", (undone,)).next()
except StopIteration:
u" WHERE meta_message.name LIKE 'dispersy-cancel-%' AND sync.id == ?", (undone,)).next()
except StopIteration as ex:
# no previous cancel for this message
pass
else:
categoried_msg_dict[key]["cancel_in_db"] = (global_time, mid, undone)
categoried_msg_dict[key]["cancel_in_db"] = (str(packet), undone)

categoried_msg_dict[key]["messages"].append(message)

Expand All @@ -3440,8 +3438,7 @@ def on_cancel(self, messages):
parameters = list()
real_messages = list()
for key, item in categoried_msg_dict.iteritems():
all_item_list = [(msg.payload.global_time, msg.payload.member.mid, msg.packet_id)
for msg in item["messages"]]
all_item_list = [(msg.packet, msg.packet_id) for msg in item["messages"]]

# add the database msg if it exists
if item.get("cancel_in_db", None):
Expand All @@ -3451,6 +3448,7 @@ def on_cancel(self, messages):

# sort and get the latest one
all_item_list.sort()
self._logger.debug("!!! %s", all_item_list)
the_latest_one = all_item_list[-1]
if not item.get("cancel_in_db", None) or the_latest_one[-1] != item["cancel_in_db"][-1]:
# need to update the undone pointer in database
Expand All @@ -3467,8 +3465,8 @@ def on_cancel(self, messages):
# send the latest packet to other people
the_latest_packet_id = the_latest_one[-1]
try:
the_latest_packet = self._dispersy._database.execute(u"SELECT packet FROM sync WHERE id = ?",
(the_latest_one[-1],)).next()
the_latest_packet, = self._dispersy._database.execute(u"SELECT packet FROM sync WHERE id = ?",
(the_latest_one[-1],)).next()
except StopIteration:
pass
else:
Expand All @@ -3477,8 +3475,9 @@ def on_cancel(self, messages):
self._dispersy._send_packets([msg.candidate], [str(the_latest_packet)],
self, "-caused by on_cancel-")

self._dispersy._database.executemany(u"UPDATE sync SET undone = ? "
u"WHERE community = ? AND member = ? AND global_time = ?", parameters)
if parameters:
self._dispersy._database.executemany(u"UPDATE sync SET undone = ? "
u"WHERE community = ? AND member = ? AND global_time = ?", parameters)

for meta, sub_messages in groupby(real_messages, key=lambda x: x.payload.packet.meta):
meta.cancel_callback([(message.payload.member, message.payload.global_time, message.payload.packet)
Expand Down

0 comments on commit c7fdd05

Please sign in to comment.