[Commit-gnuradio] [gnuradio] 01/02: grc: fix flowgraph loading: update message ports keys

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit f333b666577d24a02e3423f288dd8c44c96b34f3
Author: Sebastian Koslowski <address@hidden>
Date:   Fri Dec 20 09:55:24 2013 +0100

    grc: fix flowgraph loading: update message ports keys
---
 grc/base/FlowGraph.py | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/grc/base/FlowGraph.py b/grc/base/FlowGraph.py
index 2f2d8c6..c85e3ce 100644
--- a/grc/base/FlowGraph.py
+++ b/grc/base/FlowGraph.py
@@ -274,6 +274,7 @@ class FlowGraph(Element):
             if block: block.import_data(block_n)
             else: Messages.send_error_load('Block key "%s" not found in 
%s'%(key, self.get_parent()))
         #build the connections
+        block_ids = map(lambda b: b.get_id(), self.get_blocks())
         for connection_n in connections_n:
             #try to make the connection
             try:
@@ -284,7 +285,6 @@ class FlowGraph(Element):
                 source_key = connection_n.find('source_key')
                 sink_key = connection_n.find('sink_key')
                 #verify the blocks
-                block_ids = map(lambda b: b.get_id(), self.get_blocks())
                 if source_block_id not in block_ids:
                     raise LookupError('source block id "%s" not in block 
ids'%source_block_id)
                 if sink_block_id not in block_ids:
@@ -292,6 +292,9 @@ class FlowGraph(Element):
                 #get the blocks
                 source_block = self.get_block(source_block_id)
                 sink_block = self.get_block(sink_block_id)
+                # update numeric message ports keys
+                source_key = self.update_message_port_key(source_key, 
source_block.get_sources())
+                sink_key = self.update_message_port_key(sink_key, 
sink_block.get_sinks())
                 #verify the ports
                 if source_key not in source_block.get_source_keys():
                     raise LookupError('source key "%s" not in source block 
keys'%source_key)
@@ -308,3 +311,23 @@ class FlowGraph(Element):
                 )
             )
         self.rewrite() #global rewrite
+
+
+    def update_message_port_key(self, key, ports):
+        """Backward compatibility for message port keys
+
+        Message ports use their names as key (like in the 'connect' method).
+        Flowgraph files from former versions still have numeric keys stored for
+        message connections. These have to be replaced by the name of the
+        respective port. The correct message port is deduced from the integer
+        value of the key (assuming the order has not changed).
+
+        :param key: the port key to be updated
+        :param ports: list of candidate ports
+        :returns: the updated key or the original one
+        """
+        if key.isdigit():  # don't bother current message port keys
+            port = ports[int(key)]  # get port (assuming liner indexed keys)
+            if port.get_type() == "message":
+                return port.get_key()  # for message ports get updated key
+        return key  # do nothing
\ No newline at end of file