@@ -2,12 +2,15 @@ # P.C. Shyamshankar <sykora@lucentbeing.com> # http://lucentbeing.com -# TODO: Get this from optparse -inputDelimiter = ' ' -outputDelimiter = ' ' - +from optparse import OptionParser +from sys import argv def formatter(lines, inputDelimiter, outputDelimiter) : + # Split lines based on inputDelimiter. + + lines = [filter(None, line.split(inputDelimiter)) for line in lines] + + # Assuming all rows are the same length, numColumns = len(lines[0]) widths = [] @@ -29,7 +32,28 @@ def formatter(lines, inputDelimiter, outputDelimiter) : return output +def parseOptions(argv) : + parser = OptionParser() + + parser.add_option('-i', '--input-delimiter', + action = 'store', + type = 'string', + dest = 'inputDelimiter', + default = ' ') + + parser.add_option('-o', '--output-delimiter', + action = 'store', + type = 'string', + dest = 'outputDelimiter', + default = ' ') + + options, args = parser.parse_args(argv[1:]) + + return options + + def main() : + options = parseOptions(argv) # Get input. lines = [] @@ -39,13 +63,15 @@ def main() : return while True: - lines.append(filter(None, line.split(inputDelimiter))) + lines.append(line) try : line = raw_input() except EOFError : break - formattedLines = formatter(lines, inputDelimiter, outputDelimiter) + formattedLines = formatter(lines, + options.inputDelimiter, + options.outputDelimiter) for line in formattedLines : print line tablefmt.py 730867b66938574cc2a44a0bd19dd4ff478c9150 sykora sykora@lucentbeing.com http://github.com/sykora/tablefmt/commit/54efebbda89c207eddbadf2b0f8ce7fea99b26d6 54efebbda89c207eddbadf2b0f8ce7fea99b26d6 2008-10-18T02:23:25-07:00 2008-10-18T02:23:25-07:00 Added basic option parsing. 01f66c6b8338c21c0df52e0a0e7d8d4b5a855447 sykora sykora@lucentbeing.com