Moved parse code to Antimation, now uses shlex.split (closes #1)

Author: mapio

examples/simple.txt

@@ -1,13 +1,13 @@
 ae 1 2
 ae 1 3
-ae 2 3
+ae 2 "a node"
 ns
 hn 1
 ns
 hn 2
-ln 2 mammamia
+ln 2 "foo bar"
 ns
-hn 3
+hn "a node"
 ae 1 4
 ns
 un 2

gvanim/__main__.py

@@ -16,7 +16,7 @@
 # "GraphvizAnim". If not, see <http://www.gnu.org/licenses/>.
 
 from argparse import ArgumentParser, FileType
-from sys import stdin, argv, stderr
+from sys import stdin
 
 import animation, render
 
@@ -29,30 +29,7 @@ def main():
 	args = parser.parse_args()
 
 	ga = animation.Animation()
-	cmd2method = {
-		'ns' : ga.next_step,
-		'an' : ga.add_node,
-		'hn' : ga.highlight_node,
-		'ln' : ga.label_node,
-		'un' : ga.unlabel_node,
-		'rn' : ga.remove_node,
-		'ae' : ga.add_edge,
-		'he' : ga.highlight_edge,
-		're' : ga.remove_edge,
-	}
-
-	for line in args.animation:
-		parts = line.strip().split()
-		cmd, params = parts[ 0 ], parts[ 1: ]
-		try:
-			cmd2method[ cmd ]( *params )
-		except KeyError:
-			print >>stderr, 'gvanim: unrecognized command: {}'.format( cmd )
-			return
-		except TypeError:
-			print >>stderr, 'gvanim: wrong number of parameters: {}'.format( line.strip() )
-			return
-
+	ga.parse( args.animation )
 	render.gif( render.render( ga.graphs(), args.basename, 'png' ), args.basename, args.delay )
 
 if __name__ == '__main__':

gvanim/animation.py

@@ -15,8 +15,13 @@
 # You should have received a copy of the GNU General Public License along with
 # "GraphvizAnim". If not, see <http://www.gnu.org/licenses/>.
 
+import shlex
+
 import action
 
+class ParseException( Exception ):
+	pass
+
 class Step( object ):
 
 	def __init__( self, step = None ):
@@ -86,6 +91,29 @@ def highlight_edge( self, u, v ):
 	def remove_edge( self, u, v ):
 		self._actions.append( action.RemoveEdge( u, v ) )
 
+	def parse( self, lines ):
+		action2method = {
+			'ns' : self.next_step,
+			'an' : self.add_node,
+			'hn' : self.highlight_node,
+			'ln' : self.label_node,
+			'un' : self.unlabel_node,
+			'rn' : self.remove_node,
+			'ae' : self.add_edge,
+			'he' : self.highlight_edge,
+			're' : self.remove_edge,
+		}
+		for line in lines:
+			parts = shlex.split( line.strip(), True )
+			action, params = parts[ 0 ], parts[ 1: ]
+			try:
+				action2method[ action ]( *params )
+			except KeyError:
+				raise ParseException( 'unrecognized command: {}'.format( action ) )
+			except TypeError:
+ 				raise ParseException( 'wrong number of parameters: {}'.format( line.strip() ) )
+				return
+
 	def steps( self ):
 		steps = [ Step() ]
 		for action in self._actions: