atomicshop 2.12.8__py3-none-any.whl → 2.12.9__py3-none-any.whl

atomicshop/__init__.py

@@ -1,4 +1,4 @@
 """Atomic Basic functions and classes to make developer life easier"""
 
 __author__ = "Den Kras"
-__version__ = '2.12.8'
+__version__ = '2.12.9'

atomicshop/basics/list_of_dicts.py

@@ -100,7 +100,13 @@ def merge_to_dict(list_of_dicts: list) -> dict:
     return result_dict
 
 
-def is_value_exist_in_key(list_of_dicts: list, key: str, value_to_match: str, prefix_suffix: bool = False) -> bool:
+def is_value_exist_in_key(
+        list_of_dicts: list,
+        key: str,
+        value_to_match: str,
+        value_case_insensitive: bool = False,
+        prefix_suffix: bool = False
+) -> bool:
     """
     The function will check if a value exists in a key in a list of dicts.
 
@@ -113,6 +119,7 @@ def is_value_exist_in_key(list_of_dicts: list, key: str, value_to_match: str, pr
     :param key: str, the key to check in each entry (dict) in the list.
     :param value_to_match: str, the value to find in the key.
         This values is a pattern, so it can be a part of the value and can contain wildcards as "*" character.
+    :param value_case_insensitive: bool, if True the value will be matched case insensitive.
     :param prefix_suffix: bool, related to how pattern of 'value_to_find' is matched against the value in the key.
         Check the 'strings.match_pattern_against_string' function for more information.
     :return: bool, True if the value exists in the key in any entry in the list of dicts, False if not.
@@ -121,7 +128,9 @@ def is_value_exist_in_key(list_of_dicts: list, key: str, value_to_match: str, pr
     for dictionary in list_of_dicts:
         try:
             # if value_to_find in dictionary.get(key, None):
-            if strings.match_pattern_against_string(value_to_match, dictionary.get(key, None), prefix_suffix):
+            if strings.match_pattern_against_string(
+                    value_to_match, dictionary.get(key, None), case_insensitive=value_case_insensitive,
+                    prefix_suffix=prefix_suffix):
                 return True
         # If the key is not present in the dict 'TypeError' will be raised, since 'None' doesn't have the 'in' operator.
         except TypeError:

atomicshop/basics/strings.py

@@ -108,7 +108,12 @@ def is_any_string_from_list_in_string(string_list: list, check_string: str) -> b
     return any(test_string in check_string for test_string in string_list)
 
 
-def match_pattern_against_string(pattern: str, check_string: str, prefix_suffix: bool = False) -> bool:
+def match_pattern_against_string(
+        pattern: str,
+        check_string: str,
+        case_insensitive: bool = False,
+        prefix_suffix: bool = False
+) -> bool:
     """
     Function checks the 'pattern' against 'check_string' and returns 'True' if pattern matches and 'False' if not.
 
@@ -121,6 +126,7 @@ def match_pattern_against_string(pattern: str, check_string: str, prefix_suffix:
 
     :param pattern: string, can include wildcards as '*'.
     :param check_string: string, to check the pattern against.
+    :param case_insensitive: boolean, if 'True' will treat the 'pattern' and 'check_string' as case-insensitive.
     :param prefix_suffix: boolean, that sets if the function should return 'True' also for all the cases that wildcard
         in the beginning of the pattern and in the end of the pattern, since the default behavior of regex to return
         'False' on these cases.
@@ -152,12 +158,16 @@ def match_pattern_against_string(pattern: str, check_string: str, prefix_suffix:
     # on complex strings.
     # return fnmatch.fnmatch(check_string, pattern)
 
+    # Determine the regex flags based on case_insensitive.
+    flags = re.IGNORECASE if case_insensitive else 0
+
     def search_pattern(function_pattern):
         # Use regex to match the pattern.
-        return re.search(fr'{function_pattern}', check_string)
+        return re.search(fr'{function_pattern}', check_string, flags)
 
     wildcard_str: str = '*'
     wildcard_re: str = '.+'
+    # wildcard_re: str = '.*'  # Adjusted to '.*' to match zero or more characters
 
     # Replace the wildcard string '*' with regex wildcard string '.+'.
     # In regex '.' is a wildcard, but only for 1 character, if you need more than 1 character you should add '+'.
@@ -204,13 +214,19 @@ def match_pattern_against_string(pattern: str, check_string: str, prefix_suffix:
     return False
 
 
-def match_list_of_patterns_against_string(patterns: list, check_string: str, prefix_suffix: bool = False) -> bool:
+def match_list_of_patterns_against_string(
+        patterns: list,
+        check_string: str,
+        case_insensitive: bool = False,
+        prefix_suffix: bool = False
+) -> bool:
     """
     Function checks each pattern in 'patterns' list against 'check_string' and returns 'True' if any pattern matches
     and 'False' if not.
 
     :param patterns: list, of string patterns to check against. May include wildcards.
     :param check_string: string, to check the pattern against.
+    :param case_insensitive: boolean, if 'True' will treat the 'pattern' and 'check_string' as case-insensitive.
     :param prefix_suffix: boolean, that sets if the function should return 'True' also for all the cases that wildcard
         in the beginning of the pattern and in the end of the pattern, since the default behavior of regex to return
         'False' on these cases.
@@ -221,7 +237,8 @@ def match_list_of_patterns_against_string(patterns: list, check_string: str, pre
     """
 
     for pattern in patterns:
-        if match_pattern_against_string(pattern, check_string, prefix_suffix=prefix_suffix):
+        if match_pattern_against_string(
+                pattern, check_string, case_insensitive=case_insensitive, prefix_suffix=prefix_suffix):
             return True
 
     return False

atomicshop/monitor/checks/process_running.py

@@ -20,7 +20,7 @@ def _execute_cycle(change_monitor_instance, print_kwargs: dict = None):
     processes = _get_list(change_monitor_instance)
 
     for process_name in change_monitor_instance.check_object_list:
-        result = list_of_dicts.is_value_exist_in_key(processes, 'cmdline', process_name)
+        result = list_of_dicts.is_value_exist_in_key(processes, 'cmdline', process_name, value_case_insensitive=True)
 
         # If the process name was found in the list of currently running processes.
         if result:

atomicshop/process.py

@@ -7,7 +7,7 @@ import shutil
 
 from .print_api import print_api
 from .inspect_wrapper import get_target_function_default_args_and_combine_with_current
-from .basics.strings import match_pattern_against_string
+from .basics import strings
 from .wrappers import ubuntu_terminal
 
 if os.name == 'nt':
@@ -247,12 +247,18 @@ def safe_terminate(popen_process: subprocess.Popen):
     popen_process.wait()
 
 
-def match_pattern_against_running_processes_cmdlines(pattern: str, first: bool = False, prefix_suffix: bool = False):
+def match_pattern_against_running_processes_cmdlines(
+        pattern: str,
+        process_name_case_insensitive: bool = False,
+        first: bool = False,
+        prefix_suffix: bool = False
+):
     """
     The function matches specified string pattern including wildcards against all the currently running processes'
     command lines.
 
     :param pattern: string, the pattern that we will search in the command line list of currently running processes.
+    :param process_name_case_insensitive: boolean, if True, the process name will be matched case insensitive.
     :param first: boolean, that will set if first pattern match found the iteration will stop, or we will return
         the list of all command lines that contain the pattern.
     :param prefix_suffix: boolean. Check the description in 'match_pattern_against_string' function.
@@ -268,7 +274,9 @@ def match_pattern_against_running_processes_cmdlines(pattern: str, first: bool =
     for process in processes:
         # Check if command line isn't empty and that string pattern is matched against command line.
         if process['cmdline'] and \
-                match_pattern_against_string(pattern, process['cmdline'], prefix_suffix):
+                strings.match_pattern_against_string(
+                    pattern, process['cmdline'], case_insensitive=process_name_case_insensitive,
+                    prefix_suffix=prefix_suffix):
             matched_cmdlines.append(process['cmdline'])
             # If 'first' was set to 'True' we will stop, since we found the first match.
             if first:

{atomicshop-2.12.8.dist-info → atomicshop-2.12.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: atomicshop
-Version: 2.12.8
+Version: 2.12.9
 Summary: Atomic functions and classes to make developer life easier
 Author: Denis Kras
 License: MIT License

{atomicshop-2.12.8.dist-info → atomicshop-2.12.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=I042GM8K4BPXWv_yalQoh8HGBDQ1Denw1R0XH2xM51k,123
+atomicshop/__init__.py,sha256=-vfpVbmmEp5MJjeiy8KXfc5AiYWei228hKs92EJDabk,123
 atomicshop/_basics_temp.py,sha256=6cu2dd6r2dLrd1BRNcVDKTHlsHs_26Gpw8QS6v32lQ0,3699
 atomicshop/_create_pdf_demo.py,sha256=Yi-PGZuMg0RKvQmLqVeLIZYadqEZwUm-4A9JxBl_vYA,3713
 atomicshop/_patch_import.py,sha256=ENp55sKVJ0e6-4lBvZnpz9PQCt3Otbur7F6aXDlyje4,6334
@@ -24,7 +24,7 @@ atomicshop/keyboard_press.py,sha256=1W5kRtOB75fulVx-uF2yarBhW0_IzdI1k73AnvXstk0,
 atomicshop/pbtkmultifile_argparse.py,sha256=aEk8nhvoQVu-xyfZosK3ma17CwIgOjzO1erXXdjwtS4,4574
 atomicshop/permissions.py,sha256=P6tiUKV-Gw-c3ePEVsst9bqWaHJbB4ZlJB4xbDYVpEs,4436
 atomicshop/print_api.py,sha256=DhbCQd0MWZZ5GYEk4oTu1opRFC-b31g1VWZgTGewG2Y,11568
-atomicshop/process.py,sha256=kOLrpUb5T5QN9ZvpGOjXyo7Kivrc14A9gcw9lvNMidI,15670
+atomicshop/process.py,sha256=Zgb4CUjy9gIBaawvtCOEcxGUCqvqPyARk0lpBjRzxWE,15950
 atomicshop/process_name_cmd.py,sha256=TNAK6kQZm5JKWzEW6QLqVHEG98ZLNDQiSS4YwDk8V8c,3830
 atomicshop/process_poller.py,sha256=WfmwCLALfTYOq8ri0vkPeqq8ruEyA_43DaN--CU2_XY,10854
 atomicshop/python_file_patcher.py,sha256=kd3rBWvTcosLEk-7TycNdfKW9fZbe161iVwmH4niUo0,5515
@@ -91,12 +91,12 @@ atomicshop/basics/guids.py,sha256=iRx5n18ATZWhpo748BwEjuLWLsu9y3OwF5-Adp-Dtik,40
 atomicshop/basics/hexs.py,sha256=i8CTG-J0TGGa25yFSbWEvpVyHFnof_qSWUrmXY-ylKM,1054
 atomicshop/basics/if_else.py,sha256=MakivJChofZCpr0mOVjwCthzpiaBxXVB-zv7GwMOqVo,202
 atomicshop/basics/isinstancing.py,sha256=fQ35xfqbguQz2BUn-3a4KVGskhTcIn8JjRtxV2rFcRQ,876
-atomicshop/basics/list_of_dicts.py,sha256=EeUh5FwUSmjQ7_Df7yTBgwHsou5jx3tP2a0dzgs8-fk,5773
+atomicshop/basics/list_of_dicts.py,sha256=qI2uoYIcHjR8RSD5vtkqhpMgL6XTYRGJDcr9cb2HbZM,6051
 atomicshop/basics/lists.py,sha256=I0C62vrDrNwCTNl0EjUZNa1Jsd8l0rTkp28GEx9QoEI,4258
 atomicshop/basics/multiprocesses.py,sha256=nSskxJSlEdalPM_Uf8cc9kAYYlVwYM1GonBLAhCL2mM,18831
 atomicshop/basics/numbers.py,sha256=ESX0z_7o_ok3sOmCKAUBoZinATklgMy2v-4RndqXlVM,1837
 atomicshop/basics/randoms.py,sha256=DmYLtnIhDK29tAQrGP1Nt-A-v8WC7WIEB8Edi-nk3N4,282
-atomicshop/basics/strings.py,sha256=9DH1190jgSpSRPgcywSysJ0iovqPOWjSokumP6ng2BI,17686
+atomicshop/basics/strings.py,sha256=T4MpEpwxqsiOSnXcwYkqMKB5okHiJfvUCO7t5kcRtBg,18316
 atomicshop/basics/threads.py,sha256=xvgdDJdmgN0wmmARoZ-H7Kvl1GOcEbvgaeGL4M3Hcx8,2819
 atomicshop/basics/timeit_template.py,sha256=fYLrk-X_dhdVtnPU22tarrhhvlggeW6FdKCXM8zkX68,405
 atomicshop/basics/tracebacks.py,sha256=cNfh_oAwF55kSIdqtv3boHZQIoQI8TajxkTnwJwpweI,535
@@ -137,7 +137,7 @@ atomicshop/monitor/checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 atomicshop/monitor/checks/dns.py,sha256=orp-TgqL6EPzXVm0MtjEceFE8LRfTP3iPR6hGc8Y3TQ,4499
 atomicshop/monitor/checks/hash.py,sha256=A6bJ7F5Qv_brdEh3sGhOyfviab2dsnvbXUufyBk5C1U,1951
 atomicshop/monitor/checks/network.py,sha256=I9f3KyNnlx97E8igGZXpVJl4MlUp9iU6aSbILCKqbA0,3820
-atomicshop/monitor/checks/process_running.py,sha256=hJmqP0-KMsi6x46k4-4hGK0Mj_Ij9wj3qMb8SlRTHrg,1863
+atomicshop/monitor/checks/process_running.py,sha256=948Sify4P2KFTE1ZrLHKLwd1B1HOgWmC11x3b6MCvz0,1892
 atomicshop/monitor/checks/hash_checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/monitor/checks/hash_checks/file.py,sha256=UDHrUphYSKeH4KJR5pC3ilPAGxX0oXTu3UD8ndnR5WU,2733
 atomicshop/monitor/checks/hash_checks/url.py,sha256=aNAL1bIeks6xsRDk-5arGy4rhzrJkJ4ZRCqCQTi4n3U,3237
@@ -251,8 +251,8 @@ atomicshop/wrappers/socketw/socket_server_tester.py,sha256=AhpurHJmP2kgzHaUbq5ey
 atomicshop/wrappers/socketw/socket_wrapper.py,sha256=aXBwlEIJhFT0-c4i8iNlFx2It9VpCEpsv--5Oqcpxao,11624
 atomicshop/wrappers/socketw/ssl_base.py,sha256=k4V3gwkbq10MvOH4btU4onLX2GNOsSfUAdcHmL1rpVE,2274
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=t3dtDEfN47CfYVi0CW6Kc2QHTEeZVyYhc57IYYh5nmA,826
-atomicshop-2.12.8.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.12.8.dist-info/METADATA,sha256=zHIPTb9wnVqipNdABp0gXEYDtJQvZ99EioWQdHJue8g,10478
-atomicshop-2.12.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.12.8.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.12.8.dist-info/RECORD,,
+atomicshop-2.12.9.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.12.9.dist-info/METADATA,sha256=p5kxZx91i1n0Os02yyC3ce6mvSZARM6G-jl2qFh8e_0,10478
+atomicshop-2.12.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.12.9.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.12.9.dist-info/RECORD,,