Refactoring API de IndexIterator.

[Plinn.git] / HugePlinnFolder.py

diff --git a/HugePlinnFolder.py b/HugePlinnFolder.py
index 563bf18..6f971b4 100644 (file)
--- a/HugePlinnFolder.py
+++ b/HugePlinnFolder.py
@@ -138,6 +138,8 @@ class HugePlinnFolder(BTreeFolder2Base, PlinnFolder) :
     def moveObjectsAfter(self, ids, targetId, suppress_events=False):
         assert targetId not in ids
 
     def moveObjectsAfter(self, ids, targetId, suppress_events=False):
         assert targetId not in ids
 

+        # id2pos = dict(self._id2pos_index).copy()
+        # pos2id = dict(self._pos2id_index).copy()

         id2pos = self._id2pos_index
         pos2id = self._pos2id_index
         targetPos = id2pos[targetId]
         id2pos = self._id2pos_index
         pos2id = self._pos2id_index
         targetPos = id2pos[targetId]


@@ -150,14 +152,14 @@ class HugePlinnFolder(BTreeFolder2Base, PlinnFolder) :
         id2posUpdate = {}
         pos2idUpdate = {}
 
         id2posUpdate = {}
         pos2idUpdate = {}
 

-        # moved before the firt item position

         if targetPos < minMovedPos :
         if targetPos < minMovedPos :

+            # selection moved before the first item position

             for i, id in enumerate(ids) :
                 pos = i + targetPos + 1
                 id2posUpdate[id] = pos
                 pos2idUpdate[pos] = id
 
             for i, id in enumerate(ids) :
                 pos = i + targetPos + 1
                 id2posUpdate[id] = pos
                 pos2idUpdate[pos] = id
 

-            for id in IndexIterator(pos2id, maxMovedPos, start=targetPos+1):
+            for id in IndexIterator(pos2id, targetPos+1, maxMovedPos):

                 pos = pos + 1
                 id2posUpdate[id] = pos
                 pos2idUpdate[pos] = id
                 pos = pos + 1
                 id2posUpdate[id] = pos
                 pos2idUpdate[pos] = id


@@ -167,9 +169,18 @@ class HugePlinnFolder(BTreeFolder2Base, PlinnFolder) :
             print "déposé entre la première et la dernière de la sélection"
             raise NotImplementedError()
         else :
             print "déposé entre la première et la dernière de la sélection"
             raise NotImplementedError()
         else :

-            print minMovedPos, maxMovedPos, targetPos
-            print "déposé après la dernière"
-            raise NotImplementedError()
+            # selection moved after the last item position
+            pos = minMovedPos
+            for id in IndexIterator(pos2id, minMovedPos+1, targetPos) :
+                id2posUpdate[id] = pos
+                pos2idUpdate[pos] = id
+                pos += 1
+            
+            pos = targetPos - len(ids) + 1
+            for id in ids :
+                id2posUpdate[id] = pos
+                pos2idUpdate[pos] = id
+                pos +=1

         
         id2pos.update(id2posUpdate)
         pos2id.update(pos2idUpdate)
         
         id2pos.update(id2posUpdate)
         pos2id.update(pos2idUpdate)


@@ -178,6 +189,7 @@ class HugePlinnFolder(BTreeFolder2Base, PlinnFolder) :
         for pos in xrange(len(self)) :
             assert pos2id.has_key(pos)
             assert id2pos.has_key(pos2id[pos])
         for pos in xrange(len(self)) :
             assert pos2id.has_key(pos)
             assert id2pos.has_key(pos2id[pos])

+        

         if not suppress_events :
             for id, pos in id2posUpdate.items() :
                 notify(ObjectPositionModified(self[id], self, pos))
         if not suppress_events :
             for id, pos in id2posUpdate.items() :
                 notify(ObjectPositionModified(self[id], self, pos))


@@ -194,24 +206,20 @@ class HugePlinnFolder(BTreeFolder2Base, PlinnFolder) :
 
 
 class IndexIterator :
 
 
 class IndexIterator :

-    def __init__(self, d, maxPos, start=0, length=None) :
+    def __init__(self, d, start, stop) :

         self.d = d
         self.pos = start
         self.d = d
         self.pos = start

-        self.maxPos = maxPos
-        self.length = length
-        self.fetchedValuesCpt = 0
+        self.stop = stop

     
     def __iter__(self) :
         return self
     
     def next(self) :
         try :
     
     def __iter__(self) :
         return self
     
     def next(self) :
         try :

-            if self.pos > self.maxPos or \
-                 self.fetchedValuesCpt == self.length:
+            if self.pos > self.stop :

                 raise StopIteration
             v = self.d[self.pos]
             self.pos = self.pos + 1
                 raise StopIteration
             v = self.d[self.pos]
             self.pos = self.pos + 1

-            self.fetchedValuesCpt = self.fetchedValuesCpt + 1

             return v
         except KeyError :
             self.pos = self.pos + 1
             return v
         except KeyError :
             self.pos = self.pos + 1