From 558af00402ebe35d4185ff901717bbd2c4440e22 Mon Sep 17 00:00:00 2001
From: Lev Rusanov <30170278+JDM170@users.noreply.github.com>
Date: Mon, 29 Aug 2022 11:04:53 +0700
Subject: [PATCH] Add MatchIO as module

Signed-off-by: Lev Rusanov <30170278+JDM170@users.noreply.github.com>
---
 .gitmodules   |  3 +++
 m_match_name  |  1 +
 main.py       |  9 ++-------
 match_name.py | 26 --------------------------
 settings.json | 14 --------------
 5 files changed, 6 insertions(+), 47 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 m_match_name
 delete mode 100644 match_name.py

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..840a0fb
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "m_match_name"]
+	path = m_match_name
+	url = https://github.com/JDM170/m_match_name
diff --git a/m_match_name b/m_match_name
new file mode 160000
index 0000000..c57718a
--- /dev/null
+++ b/m_match_name
@@ -0,0 +1 @@
+Subproject commit c57718af7ed72eb548d7918eb35beb6f82ebb6ec
diff --git a/main.py b/main.py
index a977df3..cff207f 100644
--- a/main.py
+++ b/main.py
@@ -9,11 +9,6 @@ from match_name import MatchIO
 
 
 default_values = {
-    "expr_list": [
-        [r"^[a-zA-Z]+\d+$", "R54-630300"],  # THE01
-        [r"^\d+[a-zA-Z]+\d+$", "R54-"],  # 630300THE01
-        [r"^[rR]\d*[-]\d+[a-zA-Z]+\d+$", ""]  # R54-630300THE01
-    ],
     "pc": {
         "2": [  # Пятидневка
             "IT01",
@@ -33,7 +28,7 @@ def main(comp_key, is_debug):
     list_pc_names = loaded_file.get("pc").get(comp_key)
     if list_pc_names is not None:
         for pc_name in list_pc_names:
-            formatted_pc_name = matchio.check_arm_name(pc_name)
+            formatted_pc_name = matchio.check_pc_name(pc_name)
             if formatted_pc_name is not False:
                 if is_debug is False:
                     # system("shutdown /m \\\{} /r /f /t 60 /c \"Плановая перезагрузка компьютера через 1 минуту!\"".format(formatted_pc_name))
@@ -53,7 +48,7 @@ if __name__ == "__main__":
         loaded_file = filesio.get_data()
         if loaded_file is False:
             raise OSError
-        matchio = MatchIO(loaded_file.get("expr_list"))
+        matchio = MatchIO()
         main(argv[1], argv[2].strip() == "debug")
     except OSError:
         print("Файл с настройками не найден. Создан файл со стандартными настройками.")
diff --git a/match_name.py b/match_name.py
deleted file mode 100644
index 242de85..0000000
--- a/match_name.py
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/python3
-# -*- coding: utf-8 -*-
-
-from re import match
-
-# Список выражений по которым проводится проверка
-# По дефолту стоит регион R54, индекс 630300
-default_expr_list = [
-    [r"^[a-zA-Z]+\d+$", "R54-630300"],  # THE01
-    [r"^\d+[a-zA-Z]+\d+$", "R54-"],  # 630300THE01
-    [r"^[rR]\d*[-]\d+[a-zA-Z]+\d+$", ""]  # R54-630300THE01
-]
-
-
-class MatchIO:
-    def __init__(self, expr_list=None):
-        self.expr_list = expr_list is None and default_expr_list or expr_list
-
-    def check_arm_name(self, pc_name):
-        for r in self.expr_list:
-            if match(r[0], pc_name):
-                pc_name = "{}{}".format(r[1], pc_name)
-                break
-        if match(self.expr_list[2][0], pc_name):
-            return pc_name
-        return False
diff --git a/settings.json b/settings.json
index 0bc7f44..20242b0 100644
--- a/settings.json
+++ b/settings.json
@@ -1,18 +1,4 @@
 {
-    "expr_list" : [
-        [
-            "^[a-zA-Z]+\\d+$",
-            "R54-630300"
-        ],
-        [
-            "^\\d+[a-zA-Z]+\\d+$",
-            "R54-"
-        ],
-        [
-            "^[rR]\\d*[-]\\d+[a-zA-Z]+\\d+$",
-            ""
-        ]
-    ],
     "pc" : {
         "2" : [
             "IT01",