JDM170/show_comp_uptime
1
0
Fork 0
mirror of https://github.com/JDM170/show_comp_uptime synced 2024-10-25 13:44:29 +07:00
Code Issues Packages Projects Releases Wiki Activity

Testing git modules system

Browse Source 
Signed-off-by: Lev Rusanov <30170278+JDM170@users.noreply.github.com>
This commit is contained in:
Lev Rusanov
2022-08-29 10:59:48 +07:00
parent bab3fc4571
commit 168fb5f99b
4 changed files with 6 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored Normal file
View File

@@ -0,0 +1,3 @@
[submodule "m_match_name"]
path = m_match_name
url = https://github.com/JDM170/m_match_name

1
m_match_name Submodule

Submodule m_match_name added at c57718af7e

5
main.py
View File

@@ -7,7 +7,7 @@
# path.append(getcwd()) # path.append(getcwd())
from sys import exit, argv from sys import exit, argv
from match_name import MatchIO from m_match_name.main import MatchIO
import subprocess import subprocess
from json import loads from json import loads
from datetime import datetime from datetime import datetime
@@ -29,7 +29,7 @@ def timedelta_to_string(delta, pattern):
def main(): def main():
global is_debug global is_debug
pc_name = input("\nВведите имя ПК (пр. R54-630300THE01, Ctrl+C для выхода):\n> ").strip() pc_name = input("\nВведите имя ПК (пр. R54-630300THE01, Ctrl+C для выхода):\n> ").strip()
f_pc_name = matchio.check_arm_name(pc_name) f_pc_name = MatchIO().check_pc_name(pc_name)
if f_pc_name: if f_pc_name:
# C:\\WINDOWS\\system32\\WindowsPowerShell\\v1.0\\powershell.exe # C:\\WINDOWS\\system32\\WindowsPowerShell\\v1.0\\powershell.exe
# or # or
@@ -62,7 +62,6 @@ if __name__ == '__main__':
if len(argv) > 1: if len(argv) > 1:
is_debug = argv[1].strip() == "debug" is_debug = argv[1].strip() == "debug"
# is_debug = argv[1].strip() == "debug" if len(argv) > 1 # is_debug = argv[1].strip() == "debug" if len(argv) > 1
matchio = MatchIO()
main() main()
except KeyboardInterrupt: except KeyboardInterrupt:
exit() exit()

26
match_name.py
View File

@@ -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