refactor coloring, make file controller, add banner

juhakivekas · Dec 10, 2017 · 149c0d7 · 149c0d7
1 parent 418fa1f
commit 149c0d7
Show file tree

Hide file tree

Showing 10 changed files with 89 additions and 77 deletions.
diff --git a/add_diff_dump.py b/add_diff_dump.py
diff --git a/mdcli.py b/mdcli.py
@@ -1,32 +1,46 @@
 #!/usr/bin/python3
 import argparse
+from multidiff import MultidiffModel, StreamView, SocketController, FileController
 
-from multidiff import MultidiffModel, StreamView, SocketController
-import sys
-
-parser = argparse.ArgumentParser(description='The multidiff tool of the future.')
+parser = argparse.ArgumentParser(
+	formatter_class=argparse.RawDescriptionHelpFormatter,
+	description="""
+  \x1b[1mN E O N S E N S E\x1b[0m
+  augmentations inc
+  ┌───────────────┐
+  │ \x1b[1mM  U  L  T  I\x1b[0m │
+  │ \x1b[1mD   I   F   F\x1b[0m │
+  │ sensor module │
+  └───────────────┘
+""")
 
 parser.add_argument('file',
-	metavar='file',
 	type=str,
 	nargs='*',
-	help='a file or directory whose content is to be included in the multidiff')
+	help='file or directory to include in multidiff')
+
+parser.add_argument('-m', '--mode',
+	dest='mode',
+	default='sequence',
+	help='mode of operation, either "baseline" or "sequence"')
 
 parser.add_argument('-e','--encode',
 	dest='encode',
 	default='hexdump',
-	help='choose encoding of the data. One of "hex", "hexdump", or "utf8"')
+	help='encoding of the output data, one of "hex", "hexdump", or "utf8"')
 
 parser.add_argument('-p','--port',
 	dest='port',
+	default=0,
 	type=int,
 	help='start a local socket server on a port')
 
 if __name__ == '__main__':
 	args = parser.parse_args()
 	m = MultidiffModel()
 	v = StreamView(m, encoding=args.encode)
-	#f = FileController(m)
-	#f.add_files(args.files)
-	s = SocketController(('127.0.0.1', args.port), m)
-	s.serve_forever()
+	f = FileController(m)
+	f.add_paths(args.file)
+	if args.port != 0:
+		s = SocketController(('127.0.0.1', args.port), m)
+		s.serve_forever()
diff --git a/multidiff/Ansi.py b/multidiff/Ansi.py
@@ -0,0 +1,7 @@
+class Ansi:
+	reset    = '\x1b[0m'
+	bold     = '\x1b[1m'
+	on_red   = '\x1b[41m'
+	on_green = '\x1b[42m'
+	on_blue  = '\x1b[44m'
+	white    = '\x1b[37m'
diff --git a/multidiff/FileController.py b/multidiff/FileController.py
@@ -0,0 +1,19 @@
+import os
+
+class FileController:
+	def __init__(self, model):
+		self.model = model
+
+	def add_paths(self, paths):
+		for path in paths:
+			self.add_path(path)
+
+	def add_path(self, path):
+		if os.path.isdir(path):
+			for name in os.listdir(path):
+				self.add_path(os.path.join(path, name))
+		elif os.path.isfile(path):
+			data = open(path, 'rb').read(-1)
+			self.model.add(data, name=path)
+		else:
+			raise NotImplemented
diff --git a/multidiff/StreamView.py b/multidiff/StreamView.py
@@ -1,4 +1,4 @@
-from multidiff import Render
+from multidiff import Render, Ansi
 
 class StreamView():
 	def __init__(self, model, encoding='hexdump'):
@@ -7,12 +7,11 @@ def __init__(self, model, encoding='hexdump'):
 		model.add_listener(self)
 
 	def object_added(self, index):
-		if index == 0:
-			return
-		self.model.diff(index - 1, index)
+		if index > 0:
+			self.model.diff(index - 1, index)
 
 	def diff_added(self, diff):
-		print(self.model.objects[diff.target].name)
+		print(Ansi.bold + self.model.objects[diff.target].name + Ansi.reset)
 		print(self.render.render(self.model, diff))
 		#clean up model to not leak memory in long runs
 		del(self.model.diffs[0])

diff --git a/multidiff/__init__.py b/multidiff/__init__.py
@@ -1,20 +1,7 @@
-""" 
-
-   The  tool  of  future
-    ___________________
-   |                   |
-   |   M  U  L  T  I   |
-   |                   |
-   |   D   I   F   F   |
-   |___________________|
-
-   i n t e l l i g e c e
-
-
-"""
-
 from .multidiffmodel import MultidiffModel
 from .render import Render, HexdumpEncoder
+from .Ansi import Ansi
 from .baselineview import BaselineView
 from .SocketController import SocketController
 from .StreamView import StreamView
+from .FileController import FileController
diff --git a/multidiff/render.py b/multidiff/render.py
@@ -1,5 +1,5 @@
+from multidiff.Ansi import Ansi
 import binascii
-import termcolor
 import html
 
 class Render():
@@ -130,12 +130,12 @@ def ansi_colored(string, op):
 	if   op == 'equal':
 		return string
 	elif op == 'replace':
-		color = 'blue'
+		color = Ansi.on_blue
 	elif op == 'insert':
-		color = 'green'
+		color = Ansi.on_green
 	elif op == 'delete':
-		color = 'red'
-	return termcolor.colored(string, 'white', 'on_{}'.format(color))
+		color = Ansi.on_red
+	return Ansi.white + color + string + Ansi.reset
 	#return termcolor.colored(string, color, None)
 
 def html_colored(string, op):

diff --git a/test/hexdump_test.py b/test/hexdump_test.py
@@ -1,4 +1,5 @@
 from multidiff.render import *
+from multidiff import Ansi
 
 def mono(string, color):
 	return string
@@ -14,15 +15,20 @@ def test_multiple_line_mono():
 	hd = HexdumpEncoder(mono)
 	hd.append(bytes("0123456789abcdef012345678", "utf8"), "mono")
 	result = hd.final()
-	dump='000000: 30 31 32 33 34 35 36 37 38 39 61 62 63 64 65 66 |0123456789abcdef|\n000010: 30 31 32 33 34 35 36 37 38                      |012345678       |'
+	dump = '000000: 30 31 32 33 34 35 36 37 38 39 61 62 63 64 65 66 |0123456789abcdef|\n'
+	dump+= '000010: 30 31 32 33 34 35 36 37 38                      |012345678       |'
 	assert(result == dump)
 
 def test_single_line_insert():
 	hd = HexdumpEncoder(ansi_colored)
 	hd.append(bytes("foobar", "utf8"), "insert")
 	result = hd.final()
 	print(result)
-	dump = '000000: \x1b[42m\x1b[37m66 6f 6f 62 61 72\x1b[0m                               |\x1b[42m\x1b[37mfoobar\x1b[0m          |'
+	dump = '000000: '
+	dump+= Ansi.white + Ansi.on_green + '66 6f 6f 62 61 72' + Ansi.reset
+	dump+= '                               |'
+	dump+= Ansi.white + Ansi.on_green + 'foobar' + Ansi.reset
+	dump+= '          |'
 	assert(result == dump)
 
 def test_multiple_line_insert():
@@ -32,13 +38,13 @@ def test_multiple_line_insert():
 	result = hd.final()
 	#jesus!
 	dump = '000000: 30 31 32 33 34 35 36 37 38 61 '
-	dump += '\x1b[44m\x1b[37m30 31 32 33 34 35\x1b[0m'
+	dump += Ansi.white + Ansi.on_blue + '30 31 32 33 34 35' + Ansi.reset
 	dump += ' |012345678a'
-	dump += '\x1b[44m\x1b[37m012345\x1b[0m'
+	dump += Ansi.white + Ansi.on_blue + '012345' + Ansi.reset
 	dump += '|\n000010: '
-	dump += '\x1b[44m\x1b[37m36 37 38 61\x1b[0m'
+	dump += Ansi.white + Ansi.on_blue + '36 37 38 61' + Ansi.reset
 	dump += '                                     |'
-	dump += '\x1b[44m\x1b[37m678a\x1b[0m'
+	dump += Ansi.white + Ansi.on_blue + '678a' + Ansi.reset
 	dump += '            |'
 	assert(result == dump)
 
@@ -49,9 +55,9 @@ def test_empty_data_insert():
 	result = hd.final()
 	print(result)
 	dump = '000000: '
-	dump += '\x1b[44m\x1b[37m41\x1b[0m'
-	dump += '\x1b[41m\x1b[37m \x1b[0m'
+	dump += Ansi.white + Ansi.on_blue + '41' + Ansi.reset
+	dump += Ansi.white + Ansi.on_red + ' ' + Ansi.reset
 	dump += '                                             |'
-	dump += '\x1b[44m\x1b[37mA\x1b[0m'
+	dump += Ansi.white + Ansi.on_blue + 'A' + Ansi.reset
 	dump += '               |'
 	assert(result == dump)
diff --git a/test/minimal_res.txt b/test/minimal_res.txt
@@ -1,6 +1,6 @@
 foobar
-fooba[44m[37mg[0m
-[44m[37mgee[0mbar
-foo[42m[37mx[0mbar
-f[41m[37m[0mobar
-[41m[37m[0m
+fooba[37m[44mg[0m
+[37m[44mgee[0mbar
+foo[37m[42mx[0mbar
+f[37m[41m[0mobar
+[37m[41m[0m
diff --git a/test/pretty_json_res.txt b/test/pretty_json_res.txt
@@ -1,25 +1,25 @@
 {
   "d": {
-    "r": 45[44m[37m4[0m,
+    "r": 45[37m[44m4[0m,
     "b": {
-      "p": "/ps/6W1HJ648/chats/-KpBN[44m[37mFr[0mY[44m[37mEBtFQ41l9wJ[0mg[41m[37m[0m",
+      "p": "/ps/6W1HJ648/chats/-KpBN[37m[44mFr[0mY[37m[44mEBtFQ41l9wJ[0mg[37m[41m[0m",
       "d": {
         "message": "a",
-        "timestamp": "2017-07-16T17:10:1[42m[37m5.8[0m7[44m[37m5[0mZ"
+        "timestamp": "2017-07-16T17:10:1[37m[42m5.8[0m7[37m[44m5[0mZ"
       }
     }
   }
 }
 {
   "d": {
-    "r": 45[44m[37m1[0m,
+    "r": 45[37m[44m1[0m,
     "b": {
-      "p": "/ps/6W1HJ648/chats/-KpBNF[44m[37mI[0mY[44m[37mZdU8KG[0mw[44m[37mTKf2T[0m",
+      "p": "/ps/6W1HJ648/chats/-KpBNF[37m[44mI[0mY[37m[44mZdU8KG[0mw[37m[44mTKf2T[0m",
       "d": {
         "message": "a",
-        "timestamp": "2017-07-16T17:10:1[42m[37m3.[0m5[41m[37m[0m7[44m[37m0[0mZ"
+        "timestamp": "2017-07-16T17:10:1[37m[42m3.[0m5[37m[41m[0m7[37m[44m0[0mZ"
       }
     }
   }
-}[42m[37m
+}[37m[42m
 [0m