Merge lp:~facundo/magicicada-gui/support-move into lp:magicicada-gui

[Facundo Batista]

Support the Move op

[Natalia Bidart (nataliabidart)]

Niceee

review: Approve

=== modified file 'magicicada/syncdaemon.py'
--- magicicada/syncdaemon.py	2010-05-22 16:14:20 +0000
+++ magicicada/syncdaemon.py	2010-05-22 20:29:30 +0000
@@ -48,6 +48,9 @@
                 "(MakeFile)\(share_id=(.*?), parent_id=(.*?), name=(.*?), .*")
 RE_OP_MAKEDIR = re.compile(
                 "(MakeDir)\(share_id=(.*?), parent_id=(.*?), name=(.*?), .*")
+RE_OP_MOVE = re.compile(
+                "(Move)\(share_id=(.*?), node_id=(.*?), old_parent_id=(.*?), "
+                "new_parent_id=(.*?), new_name=(.*?)\)")
 
 # structure that hold content and queue information
 QueueData = collections.namedtuple('QueueData', 'operation path share node')
@@ -283,6 +286,19 @@
             path = '?' # we should get the real path, no API now
             return QueueData(operation=op, path=path, node=node, share=share)
 
+        m = RE_OP_MOVE.match(data)
+        if m:
+            op, share, node, old_parent, new_parent, new_name, = m.groups()
+
+            # we should get the real info, no API now
+            old_path = '/?...'
+            old_name = '?'
+            new_path = '/?...'
+            composed_path = "%s/%s -> %s/%s" % (old_path, old_name,
+                                                new_path, new_name)
+            return QueueData(operation=op, path=composed_path,
+                             node=node, share=share)
+
         raise ValueError("Not supported MetaQueue data: %r" % data)
 
     def _process_mq(self, data):

=== modified file 'magicicada/tests/test_syncdaemon.py'
--- magicicada/tests/test_syncdaemon.py	2010-05-22 16:14:20 +0000
+++ magicicada/tests/test_syncdaemon.py	2010-05-22 20:29:30 +0000
@@ -302,6 +302,14 @@
         cmd = 'Unlink(share_id=a, node_id=b, server_hash=c)'
         return self._metaqueuechanged_test([cmd], [r])
 
+    def test_Move(self):
+        """Test meta with Move."""
+        r = dict(operation='Move', path='/?.../? -> /?.../e',
+                 share='a', node='b')
+        cmd = 'Move(share_id=a, node_id=b, old_parent_id=c, '\
+              'new_parent_id=d, new_name=e)'
+        return self._metaqueuechanged_test([cmd], [r])
+
     def test_metaqueuechanged_twoitems(self):
         """Test MetaQueueChanged signal with two items in the queue."""
         r1 = dict(operation='AccountInquiry', path=None, share=None, node=None)