From 28dec5a8fbf9a00f4a956bfaf2948e84e51e11ef Mon Sep 17 00:00:00 2001
From: saber-nyan <saber-nyan@ya.ru>
Date: Mon, 9 Mar 2020 17:17:32 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20API=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F?=
 =?UTF-8?q?=20=D0=BF=D0=B0=D1=82=D1=82=D0=B5=D1=80=D0=BD=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PatternsDropdown.vue | 11 ++++++++---
 src/views/AddPattern.vue            | 18 +++++++++++-------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/components/PatternsDropdown.vue b/src/components/PatternsDropdown.vue
index 88db3e7..c346db4 100644
--- a/src/components/PatternsDropdown.vue
+++ b/src/components/PatternsDropdown.vue
@@ -10,10 +10,10 @@
 		<b-dropdown-item-button v-for="pattern in this.$store.state.patterns"
 								:key="pattern.id" @click.stop.prevent="openPattern(pattern.id)">
 			<strong :style="`color: ${pattern.color};`">{{ pattern.name }}</strong>:
-			<code>{{ pattern.regex ? `/${pattern.value}/` : `'${pattern.value}'` }}</code>;
+			<code>{{ getSearchTypeValue(pattern.searchType, pattern.value) }}</code>;
 			search
-			<template v-if="pattern.type === 'BOTH'">anywhere</template>
-			<template v-else-if="pattern.type === 'INPUT'">in request</template>
+			<template v-if="pattern.directionType === 'BOTH'">anywhere</template>
+			<template v-else-if="pattern.directionType === 'INPUT'">in request</template>
 			<template v-else>in response</template>
 			<div class="float-right" style="margin-left: 2em;">
 				<button type="button" class="btn btn-outline-danger btn-block btn-sm"
@@ -36,6 +36,11 @@
 			this.updatePatterns();
 		},
 		methods: {
+			getSearchTypeValue(searchType, value) {
+				if (searchType === 'REGEX') return `/${value}/`;
+				else if (searchType === 'SUBSTRING') return `'${value}'`;
+				else return `0x${value}`;
+			},
 			showAddService() {
 				this.$bvModal.show('addPatternModal');
 			},
diff --git a/src/views/AddPattern.vue b/src/views/AddPattern.vue
index 52ce84e..5d4a20b 100644
--- a/src/views/AddPattern.vue
+++ b/src/views/AddPattern.vue
@@ -32,10 +32,14 @@
 			<b-form-group
 					label-cols-sm="4"
 					label-cols-lg="3"
-					label="Регулярное выражение?"
-					description="Искать регулярное выражение в Java-формате вместо подстроки?"
-					label-for="pattern-regex">
-				<b-form-checkbox id="pattern-regex" required v-model="newPattern.regex"/>
+					label="Способ поиска"
+					description="Каким способом искать указанное выражение?"
+					label-for="pattern-searchType">
+				<b-form-select id="pattern-searchType" required v-model="newPattern.searchType">
+					<option value="REGEX" selected>Регулярное выражение</option>
+					<option value="SUBSTRING">Подстрока</option>
+					<option value="SUBBYTES">В байтах (WIP)</option>
+				</b-form-select>
 			</b-form-group>
 			<b-form-group
 					label-cols-sm="4"
@@ -43,7 +47,7 @@
 					label="Тип поиска"
 					description="В каких пакетах искать паттерн"
 					label-for="pattern-type">
-				<b-form-select id="pattern-type" required v-model="newPattern.type">
+				<b-form-select id="pattern-type" required v-model="newPattern.directionType">
 					<option value="INPUT">Запрос</option>
 					<option value="OUTPUT">Ответ</option>
 					<option value="BOTH" selected>Везде</option>
@@ -62,8 +66,8 @@
 					name: String(),
 					value: String(),
 					color: String(),
-					regex: Boolean(),
-					type: String(),
+					searchType: String(),
+					directionType: String(),
 				},
 			};
 		},