Finished updating reindex.

c10_tools/reindex.py

@@ -30,17 +30,25 @@ def write_node(self):
         offset = self.out.tell()
         packet = ComputerF3(
             index_type=1,
+            data_type=0x3,
             seq=self.get_seq(),
             count=len(self.messages),
             file_size_present=1,
-            rtc=self.messages[-1].ipts,
+            rtc=self.messages[-1][1].rtc,
             file_size=offset,
         )
-        packet._messages = self.messages
+        for o, p in self.messages:
+            m = packet.Message(
+                channel_id=p.channel_id,
+                data_type=p.data_type,
+                ipts=p.rtc,
+                offset=o
+            )
+            packet.append(m)
         self.out.write(bytes(packet))
         self.messages = []
-
-        self.nodes.append(ComputerF3.Message(ipts=packet.rtc, offset=offset))
+        
+        self.nodes.append((offset, packet))
 
     def write_root(self):
         """Generate a root index packet."""
@@ -49,12 +57,14 @@ def write_root(self):
         packet = ComputerF3(
             seq=self.get_seq(),
             count=len(self.nodes),
+            data_type=0x3,
             file_size_present=1,
-            rtc=self.nodes[-1].ipts,
+            rtc=self.nodes[-1][1].rtc,
             file_size=offset,
             root_offset=self.last_root if self.last_root else offset,
         )
-        packet._messages = self.nodes
+        for o, node in self.nodes:
+            packet.append(packet.Message(ipts=node.rtc, offset=o))
         self.out.write(bytes(packet))
         self.nodes = []
         self.last_root = offset
@@ -76,12 +86,9 @@ def main(self):
                 if self.args['--strip']:
                     continue
 
-                self.messages.append(ComputerF3.Message(
-                    channel_id=packet.channel_id,
-                    data_type=packet.data_type,
-                    ipts=packet.rtc,
-                    offset=self.out.tell() - packet.packet_length
-                ))
+                self.messages.append((
+                    self.out.tell() - packet.packet_length,
+                    packet))
 
                 # Projected index node packet size.
                 size = 36 + (20 * len(self.messages))
@@ -98,8 +105,7 @@ def main(self):
             # Final indices.
             if self.messages:
                 self.write_node()
-            if self.nodes:
-                self.write_root()
+            self.write_root()
 
         if self.args['--strip']:
             print('Stripped existing indices.')
@@ -128,4 +134,4 @@ def main(args):
         print('Destination file already exists. Use -f to overwrite.')
         raise SystemExit
 
-    Parser(args).main()
+    Parser(args).main()

tests/test_reindex.py

@@ -1,17 +1,44 @@
 
 from tempfile import NamedTemporaryFile
 
+from chapter10 import C10
+from chapter10.computer import ComputerF3
 import pytest
-import docopt
 
-from c10_tools.reindex import Parser
+from c10_tools.reindex import main
 
 
-def test_noargs():
-    with pytest.raises(docopt.DocoptExit):
-        Parser().main([])
+@pytest.fixture
+def args():
+    return {
+        '<src>': pytest.SAMPLE,
+        '<dst>': NamedTemporaryFile().name,
+        '--strip': False,
+        '--force': True,
+        '--quiet': False,
+    }
 
 
-def test_default():
-    path = NamedTemporaryFile().name
-    Parser([pytest.SAMPLE, path, '-f']).main()
+def test_root_offsets(args):
+    main(args)
+    with open(args['<dst>'], 'rb') as f:
+        packets = list(C10(f))
+        offsets = list(packets[-1])
+        assert len(offsets) == 2
+        for node in offsets:
+            f.seek(node.offset)
+            assert next(C10(f)).data_type == 0x3
+
+
+def test_node_offsets(args):
+    main(args)
+    with open(args['<dst>'], 'rb') as f:
+        for packet in C10(f):
+            if packet.data_type == 0x3 and packet.index_type == 1:
+                indices = [(index.offset, index.channel_id, index.data_type)
+                           for index in packet]
+                break
+        for offset, channel_id, data_type in indices:
+            f.seek(offset)
+            packet = next(C10(f))
+            assert (packet.channel_id, packet.data_type) == (channel_id, data_type)