ad/packmate
1
0
Fork 0
mirror of https://github.com/Av0idD4rk/packmate.git synced 2026-10-23 21:42:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Перенос слов, рефакторинг

Browse Source
This commit is contained in:
saber-nyan 2019-11-26 18:07:05 +03:00
parent 6534bc93d6
commit 07586b33d3
No known key found for this signature in database
GPG Key ID: 7B069E9C295E6B4A
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/Packet.vue
View File

@ -33,10 +33,14 @@
const dump = this.hexdump(dataString, this.$store.state.hexdumpBlockSize, this.$store.state.hexdumpLineNumberBase); const dump = this.hexdump(dataString, this.$store.state.hexdumpBlockSize, this.$store.state.hexdumpLineNumberBase);
return this.escapeHtml(dump) return this.escapeHtml(dump)
.split('\n') .split('\n')
.join('<br>'); .join('<br>'); // Replace all \n to <br>
}, },
stringdata() { stringdata() {
return this.base64ToHtml(this.packet.content); const dataString = atob(this.packet.content);
const dump = this.base64ToHtml(dataString);
return this.escapeHtml(dump)
.split('\n')
.join('<br>');
}, },
}, },
methods: { methods: {
@ -46,10 +50,10 @@
let lines = []; let lines = [];
const hex = '0123456789ABCDEF'; const hex = '0123456789ABCDEF';
for (let b = 0; b < buffer.length; b += blockSize) { for (let b = 0; b < buffer.length; b += blockSize) {
let block = buffer.slice(b, Math.min(b + blockSize, buffer.length)); const block = buffer.slice(b, Math.min(b + blockSize, buffer.length));
let addr = ('0000000000' + b.toString(lineNumberBase)).slice(-10); const addr = ('0000000000' + b.toString(lineNumberBase)).slice(-10);
let codes = block.split('').map(ch => { let codes = block.split('').map(ch => {
let code = ch.charCodeAt(0); const code = ch.charCodeAt(0);
return ' ' + hex[(0xF0 & code) >> 4] + hex[0x0F & code]; return ' ' + hex[(0xF0 & code) >> 4] + hex[0x0F & code];
}).join(''); }).join('');
codes += ' ..'.repeat(blockSize - block.length); codes += ' ..'.repeat(blockSize - block.length);
@ -83,8 +87,7 @@
return $1 ? $1 : entityMap[$0]; return $1 ? $1 : entityMap[$0];
}); });
}, },
base64ToHtml(in_) { // FIXME: Пересекающиеся паттерны приводят к неожиданным результатам base64ToHtml(raw) { // FIXME: Пересекающиеся паттерны приводят к неожиданным результатам
let raw = atob(in_);
const patterns = this.$store.state.patterns.reduce((obj, item) => { const patterns = this.$store.state.patterns.reduce((obj, item) => {
obj[item.id] = item; obj[item.id] = item;
return obj; return obj;
@ -109,7 +112,7 @@
raw = raw.substring(0, positionEnd) + secondTag + raw.substring(positionEnd); raw = raw.substring(0, positionEnd) + secondTag + raw.substring(positionEnd);
offset += secondTag.length; offset += secondTag.length;
}); });
return this.escapeHtml(raw).split('\n').join('<br>'); // Replace all \n to <br> return raw;
}, },
copyPythonBytes() { copyPythonBytes() {
@ -159,6 +162,7 @@
color: black; color: black;
margin-bottom: 10px; margin-bottom: 10px;
padding-bottom: 5px; padding-bottom: 5px;
word-break: break-word;
} }
button { button {