From 76d524ca06d1c1443883e542bed29f39e7285c08 Mon Sep 17 00:00:00 2001
From: saber-nyan <saber-nyan@ya.ru>
Date: Mon, 6 May 2019 19:48:21 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D0=B2=D0=B5=D0=BB=20=D0=BA=D1=80?=
 =?UTF-8?q?=D0=B0=D1=81=D0=BE=D1=82=D1=83=20=D0=B2=20hexdump,=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D1=87=D0=B8=D1=81=D1=82=D0=B8=D0=BB=20=D0=BA=D0=BE=D0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Content.vue | 18 +-----------------
 src/components/Navbar.vue  |  7 +------
 src/components/Packet.vue  | 39 +++++---------------------------------
 src/components/Sidebar.vue |  7 +------
 4 files changed, 8 insertions(+), 63 deletions(-)

diff --git a/src/components/Content.vue b/src/components/Content.vue
index c68995c..054a793 100644
--- a/src/components/Content.vue
+++ b/src/components/Content.vue
@@ -19,23 +19,7 @@ export default {
 	props: ['servicePort', 'streamId',],
 	data: function () {
 		return {
-			packets: [
-				// {
-				// 	id: 39,
-				// 	timestamp: 1556555231394,
-				// 	content: 'wuAAUEtPbKUAAAAAoAL///jUAAACBAW0BAIIChMcPpEAAAAAAQMDBw==',
-				// },
-				// {
-				// 	id: 40,
-				// 	timestamp: 1556555231392,
-				// 	content: 'AFDC4CVNkpxLT2ymoBJxIIKHAAACBAW0BAIICoTZHMUTHD6RAQMDBw==',
-				// },
-				// {
-				// 	id: 41,
-				// 	timestamp: 1556555231396,
-				// 	content: '0KLQtdGB0YLQvtCy0LDRjyDRgdGC0YDQvtC60LAuLi4=',
-				// },
-			],
+			packets: [],
 		}
 	},
 	watch: {
diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
index a74c21e..1314552 100644
--- a/src/components/Navbar.vue
+++ b/src/components/Navbar.vue
@@ -42,12 +42,7 @@ export default {
 	name: "Navbar",
 	data: function () {
 		return {
-			ctfServices: [
-				// {
-				// 	port: 1337,
-				// 	name: 'ShittyService',
-				// },
-			],
+			ctfServices: [],
 		}
 	},
 	methods: {
diff --git a/src/components/Packet.vue b/src/components/Packet.vue
index 6a29ab1..da4ce8d 100644
--- a/src/components/Packet.vue
+++ b/src/components/Packet.vue
@@ -9,8 +9,6 @@
 
 <script>
 
-// import {Hexdump,} from '@/components/hexdump.js' // Why the fuck is this working, Babel?!?!
-
 export default {
 	name: 'Packet',
 	props: ['id', 'content', 'timestamp',],
@@ -21,16 +19,16 @@ export default {
 			const hex = "0123456789ABCDEF";
 			for (let b = 0; b < buffer.length; b += blockSize) {
 				let block = buffer.slice(b, Math.min(b + blockSize, buffer.length));
-				let addr = ("0000" + b.toString(10)).slice(-4);
-				let codes = block.split('').map(function (ch) {
+				let addr = ("0000000000" + b.toString(10)).slice(-10);
+				let codes = block.split('').map(ch => {
 					let code = ch.charCodeAt(0);
 					return " " + hex[(0xF0 & code) >> 4] + hex[0x0F & code];
 				}).join("");
-				codes += "   ".repeat(blockSize - block.length);
+				codes += " ..".repeat(blockSize - block.length);
 				// eslint-disable-next-line no-control-regex
-				let chars = block.replace(/[\x00-\x1F\x20]/g, '.');
+				let chars = block.replace(/[\x00-\x1F]/g, '.');
 				chars += " ".repeat(blockSize - block.length);
-				lines.push(addr + " " + codes + "  " + chars);
+				lines.push(addr + ":" + codes + " |" + chars + "|");
 			}
 			return lines.join("\n");
 		},
@@ -42,33 +40,6 @@ export default {
 			return this.hexdump(dataString, this.$store.state.hexdumpBlockSize);
 		},
 	},
-	// mounted() {
-	//
-	// 	this.hex = new Hexdump(dataString, { // TODO: в настройки
-	// 		container: 'hexdump-' + this.$props.id,
-	// 		base: 'hex',
-	// 		width: 16,
-	// 		ascii: false,
-	// 		byteGrouping: 1,
-	// 		html: false,
-	// 		// endian: 'little',
-	// 		lineNumber: true,
-	// 		nonPrintable: '?',
-	// 		style: {
-	// 			lineNumberLeft: '',
-	// 			lineNumberRight: ':',
-	// 			stringLeft: '|',
-	// 			stringRight: '|',
-	// 			hexLeft: '',
-	// 			hexRight: '',
-	// 			hexNull: '.g',
-	// 			stringNull: ' ',
-	// 		},
-	// 	});
-	// },
-	// beforeDestroy() {
-	// 	delete this.hex;
-	// },
 }
 </script>
 <style scoped>
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 7d4306f..efdba4e 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -24,12 +24,7 @@ export default {
 	props: ['servicePort', 'streamId',],
 	data: function () {
 		return {
-			streams: [
-				// {
-				// 	id: 111,
-				// 	time: 1556411080,
-				// },
-			],
+			streams: [],
 		}
 	},
 	watch: {