lyrpy 1.0.0__py3-none-any.whl → 2024.0.2__py3-none-any.whl

{SRC/LIB/lyrpy → lyr}/LUConsole.py

@@ -28,7 +28,7 @@ from colorama import Fore, Back, Style
 #------------------------------------------
 # БИБЛИОТЕКИ LU
 #------------------------------------------
-import lyrpy.LUSupport as LUSupport
+import lyr.LUSupport as LUSupport
 
 #------------------------------------------
 # CONST

lyr/LUConst.py

@@ -0,0 +1,45 @@
+"""LUConst.py"""
+# -*- coding: UTF-8 -*-
+__annotations__ = """
+ =======================================================
+Copyright (c) 2023-2024
+  Author:
+     Lisitsin Y.R.
+ Project:
+     LU_PY
+     Python (LU)
+ Module:
+     LUConst.py
+
+ =======================================================
+"""
+
+#------------------------------------------
+# БИБЛИОТЕКИ python
+#------------------------------------------
+
+#------------------------------------------
+# БИБЛИОТЕКИ сторонние
+#------------------------------------------
+
+#------------------------------------------
+# БИБЛИОТЕКИ LU
+#------------------------------------------
+
+#-------------------------------------------------------------------------------
+#
+#-------------------------------------------------------------------------------
+def main ():
+#beginfunction
+    print('main LUConst.py ...')
+#endfunction
+
+#------------------------------------------
+#
+#------------------------------------------
+#beginmodule
+if __name__ == "__main__":
+    main()
+#endif
+
+#endmodule

{SRC/LIB/lyrpy → lyr}/LUDateTime.py

@@ -18,7 +18,9 @@ __annotations__ = """
 # БИБЛИОТЕКИ python
 #------------------------------------------
 import datetime
+import time
 import calendar
+import logging
 import platform
 
 #------------------------------------------
@@ -28,7 +30,7 @@ import platform
 #------------------------------------------
 # БИБЛИОТЕКИ LU
 #------------------------------------------
-import lyrpy.LUStrUtils as LUStrUtils
+import lyr.LUSupport as LUSupport
 
 #------------------------------------------
 # CONST
@@ -150,7 +152,7 @@ def DayOfWeek (ADateTime: datetime.date):
 def DaysInMonth (AYear: int, AMonth: int):
     """DaysInMonth"""
 #beginfunction
-    return calendar.monthrange (AYear, AMonth) [1]
+    return monthrange (AYear, AMonth) [1]
 #endfunction
 
 #---------------------------------------------------------------

{SRC/LIB/lyrpy → lyr}/LUDecotators.py

@@ -18,6 +18,7 @@ __annotations__ = """
 # БИБЛИОТЕКИ python
 #------------------------------------------
 import time
+import logging
 from functools import wraps
 import smtplib
 import traceback
@@ -30,7 +31,7 @@ from email.mime.text import MIMEText
 #------------------------------------------
 # БИБЛИОТЕКИ LU
 #------------------------------------------
-import lyrpy.LULog as LULog
+import lyr.LULog as LULog
 
 #---------------------------------------------------------------
 # TIMING
@@ -44,7 +45,7 @@ def TIMING(func):
         result = func(*args, **kwargs)
         end_time = time.time()
         s = f"Функция {func.__name__} работала {end_time - start_time} секунд..."
-        LULog.LoggerAdd (LULog.LoggerTOOLS, LULog.DEBUGTEXT, s)
+        LULog.LoggerTOOLS_AddLevel (LULog.DEBUGTEXT, s)
         return result
     #endfunction
 

{SRC/LIB/lyrpy → lyr}/LUDict.py

@@ -18,6 +18,7 @@ __annotations__ = """
 # БИБЛИОТЕКИ python
 #------------------------------------------
 import sys
+import logging
 
 #------------------------------------------
 # БИБЛИОТЕКИ сторонние

{SRC/LIB/lyrpy → lyr}/LUDoc.py

@@ -17,7 +17,7 @@ __annotations__ = """
 #------------------------------------------
 # БИБЛИОТЕКИ python
 #------------------------------------------
-#import sys
+import sys
 
 #------------------------------------------
 # БИБЛИОТЕКИ сторонние
@@ -26,7 +26,7 @@ __annotations__ = """
 #------------------------------------------
 # БИБЛИОТЕКИ LU
 #------------------------------------------
-import lyrpy.LULog as LULog
+import lyr.LULog as LULog
 
 #---------------------------------------------------------------
 # PrintInfoObject
@@ -38,8 +38,8 @@ def PrintInfoObject (AObject):
     # print (inspect.stack () [0] [3], '...')
     # print (traceback.extract_stack () [-1].name, '...')
     s = f'{AObject}'
-    #LULog.LoggerAdd (LULog.LoggerTOOLS, LULog.DEBUGTEXT, s)
-    print (s)
+    #LULog_LoggerTOOLS_log(LULog.DEBUGTEXT, s)
+    LULog.LoggerTOOLS_AddLevel(LULog.DEBUGTEXT, s)
 #endfunction
 
 #---------------------------------------------------------------
@@ -48,7 +48,6 @@ def PrintInfoObject (AObject):
 def main ():
 #beginfunction
     print('main LUDoc.py...')
-    ...
 #endfunction
 
 #------------------------------------------

{SRC/LIB/lyrpy → lyr}/LUErrors.py

@@ -17,6 +17,7 @@ __annotations__ = """
 #------------------------------------------
 # БИБЛИОТЕКИ python
 #------------------------------------------
+import logging
 
 #------------------------------------------
 # БИБЛИОТЕКИ сторонние

{SRC/LIB/lyrpy → lyr}/LUFile.py

@@ -14,7 +14,6 @@ __annotations__ = """
  =======================================================
 """
 
-import errno
 #------------------------------------------
 # БИБЛИОТЕКИ python
 #------------------------------------------
@@ -47,12 +46,11 @@ import chardet
 #------------------------------------------
 # БИБЛИОТЕКА LU
 #------------------------------------------
-import lyrpy.LUErrors as LUErrors
-import lyrpy.LUStrDecode as LUStrDecode
-import lyrpy.LUDateTime as LUDateTime
-import lyrpy.LUos as LUos
-import lyrpy.LULog as LULog
-# import lyrpy.LUFile as LUFile
+import lyr.LUErrors as LUErrors
+import lyr.LUStrDecode as LUStrDecode
+import lyr.LUDateTime as LUDateTime
+import lyr.LUos as LUos
+import lyr.LULog as LULog
 
 """
 #--------------------------------------------------------------------------------
@@ -80,8 +78,7 @@ ab+ Откроет для добавления нового содержимог
 #--------------------------------------------------------------------------------
 """
 
-# cDefaultEncoding = 'cp1251'
-cDefaultEncoding = 'utf-8'
+cDefaultEncoding = 'cp1251'
 
 #--------------------------------------------------------------------------------
 # DirectoryExists
@@ -102,8 +99,7 @@ def ForceDirectories (ADir: str) -> bool:
         os.makedirs (ADir, exist_ok = True)
     except:
         s = f'Unable to create directory {ADir:s} ...'
-        # LULog.LoggerTOOLS_AddLevel(logging.error, s)
-        LULog.LoggerAdd(LULog.LoggerTOOLS, logging.error, s)
+        LULog.LoggerTOOLS_AddLevel(logging.error, s)
     #endtry
     LResult = DirectoryExists (ADir)
     return LResult
@@ -138,9 +134,8 @@ def DeleteDirectoryTree (ADir: str) -> bool:
     def remove_readonly (func, path, _):
         """remove_readonly"""
     #beginfunction
-        Ls = f'Clear the readonly bit and reattempt the removal {path:s} ...'
-        # LULog.LoggerTOOLS_AddLevel(logging.DEBUG, Ls)
-        LULog.LoggerAdd(LULog.LoggerTOOLS, logging.DEBUG, Ls)
+        s = f'Clear the readonly bit and reattempt the removal {path:s} ...'
+        LULog.LoggerTOOLS_AddLevel(logging.DEBUG, s)
         os.chmod (path, stat.S_IWRITE)
         func (path)
     #endfunction
@@ -161,19 +156,16 @@ def DeleteDirectoryTree (ADir: str) -> bool:
     #endfunction
 
 #beginfunction
-    LResult = True
     if DirectoryExists (ADir):
         s = f'DeleteDirectoryTree {ADir:s} ...'
-        # LULog.LoggerTOOLS_AddLevel(logging.DEBUG, s)
-        LULog.LoggerAdd(LULog.LoggerTOOLS, logging.DEBUG, s)
+        LULog.LoggerTOOLS_AddLevel(logging.DEBUG, s)
         try:
             # shutil.rmtree (ADirectoryName, ignore_errors = True, onexc = None)
             shutil.rmtree (ADir, ignore_errors = False, onerror = remove_readonly)
             LResult = True
         except:
             s = f'Unable delete directory {ADir:s} ...'
-            # LULog.LoggerTOOLS_AddLevel (logging.error, s)
-            LULog.LoggerAdd (LULog.LoggerTOOLS, logging.error, s)
+            LULog.LoggerTOOLS_AddLevel (logging.error, s)
             LResult = False
         #endtry
     #endif
@@ -197,8 +189,8 @@ def DirectoryClear (ADir: str) -> bool:
             for file in files:
                 os.remove (os.path.join (root, file))
             #endfor
-            for ldir in dirs:
-                os.rmdir (os.path.join (root, ldir))
+            for dir in dirs:
+                os.rmdir (os.path.join (root, dir))
             #endfor
         #endfor
         LResult = True
@@ -498,7 +490,6 @@ def GetTempDir () -> str:
 #beginfunction
     # LResult = win32api.GetTempPath()
     LResult = tempfile.gettempdir ()
-    print('TEMP:',LResult)
     return LResult
 #endfunction
 
@@ -696,9 +687,7 @@ def GetFileAttr (AFileName: str) -> int:
     """GetFileAttr"""
 #beginfunction
     s = f'GetFileAttr: {AFileName:s}'
-    # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-    LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
-
+    LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
     LResult = 0
 
     if FileExists (AFileName) or DirectoryExists (AFileName):
@@ -709,26 +698,22 @@ def GetFileAttr (AFileName: str) -> int:
             case 'Windows':
                 Lmode = LStat.st_mode
                 s = f'Lmode: {Lmode:d} {hex (Lmode):s} {bin (Lmode):s} {stat.filemode (Lmode):s}'
-                # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-                LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
+                LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
                 Lattr = LStat.st_file_attributes
 
                 # Lattr = win32api.GetFileAttributes (AFileName)
 
                 s = f'Lattr:{Lattr:d} {hex (Lattr):s} {bin (Lattr):s} {GetFileAttrStr (Lattr):s}'
-                # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-                LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
+                LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
                 LResult = Lattr
             case 'Linux':
                 Lmode = LStat.st_mode
                 s = f'Lmode:{Lmode:d} {hex (Lmode):s} {bin (Lmode):s} {GetFileModeStrUnix (Lmode):s}'
-                # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-                LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
+                LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
                 LResult = Lmode
             case _:
                 s = f'Неизвестная система ...'
-                # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-                LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
+                LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
                 LResult = 0
         #endmatch
     #endif
@@ -742,27 +727,23 @@ def SetFileAttr (AFileName: str, Aattr: int, AClear: bool):
     """SetFileAttr"""
 #beginfunction
     s = f'SetFileAttr: {Aattr:d} {hex (Aattr):s} {bin (Aattr):s}'
-    # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-    LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
+    LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
 
     LOSInfo = LUos.TOSInfo ()
     match LOSInfo.system:
         case 'Windows':
             Lattr = GetFileAttr(AFileName)
             s = f'Lattr - current: {Lattr:d} {hex (Lattr):s} {bin (Lattr):s}'
-            # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-            LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
+            LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
 
             if AClear:
                 LattrNew = Lattr & ~Aattr
                 s = f'[clear]: {bin (LattrNew):s} {LattrNew:d} {hex (LattrNew):s} {bin (LattrNew):s}'
-                # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-                LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
+                LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
             else:
-                LattrNew = Lattr | ~Aattr
+                LattrNew = Lattr | Aflags
                 s = f'[set]: {bin (LattrNew):s} {LattrNew:d} {hex (LattrNew):s} {bin (LattrNew):s}'
-                # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-                LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
+                LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
             #endif
 
             # if os.path.isdir (AFileName):
@@ -776,22 +757,18 @@ def SetFileAttr (AFileName: str, Aattr: int, AClear: bool):
             raise NotImplementedError('SetFileAttr Linux not implemented ...')
         case _:
             s = f'Неизвестная система ...'
-            # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-            LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
+            LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
     #endmatch
 #endfunction
 
 #-------------------------------------------------------------------------------
 # SetFileMode
 #-------------------------------------------------------------------------------
-def SetFileMode (AFileName: str, Amode: int, AClear: bool, Aflags: int):
+def SetFileMode (AFileName: str, Amode: int):
     """SetFileMode"""
 #beginfunction
     s = f'SetFileMode: {Amode:d} {hex (Amode):s} {bin (Amode):s}'
-    # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-    LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
-
-    Lattr = 0
+    LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
 
     LOSInfo = LUos.TOSInfo ()
     match LOSInfo.system:
@@ -806,33 +783,29 @@ def SetFileMode (AFileName: str, Amode: int, AClear: bool, Aflags: int):
             if AClear:
                 LattrNew = Lattr & ~Aflags
                 s = f'SetFileAttr [clear]: {bin (Aflags):s} {LattrNew:d} {hex (LattrNew):s} {bin (LattrNew):s}'
-                # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-                LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
+                LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
             else:
                 LattrNew = Lattr | Aflags
                 s = f'SetFileAttr [set]: {bin (Aflags):s}{LattrNew:d} {hex (LattrNew):s} {bin (LattrNew):s}'
-                # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-                LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
+                LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
             #endif
             os.chflags (AFileName, Aflags)
         case _:
             s = f'Неизвестная система ...'
-            # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-            LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
+            LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
     #endmatch
 #endfunction
 
 #-------------------------------------------------------------------------------
 # SetFileFlags
 #-------------------------------------------------------------------------------
-def SetFileFlags (AFileName: str, Aflags: int, AClear: bool):
+def SetFileFlags (AFileName: str, Aflags: int):
     """SetFileMode"""
 #beginfunction
     s = f'SetFileMode: {Aflags:d} {hex (Aflags):s} {bin (Aflags):s}'
-    # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-    LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
+    LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
 
-    LOSInfo = LUos.TOSInfo ()
+    LOSInfo = lyr.LUos.TOSInfo ()
     match LOSInfo.system:
         case 'Windows':
             raise NotImplementedError('SetFileAttr Windows not implemented...')
@@ -846,19 +819,16 @@ def SetFileFlags (AFileName: str, Aflags: int, AClear: bool):
             if AClear:
                 LflagsNew = Lattr & ~Aflags
                 s = f'[clear]: {bin (LflagsNew):s} {LflagsNew:d} {hex (LflagsNew):s} {bin (LflagsNew):s}'
-                # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-                LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
+                LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
             else:
-                LflagsNew = Lattr | ~Aflags
+                LflagsNew = Lflags | Aflags
                 s = f'[set]: {bin (LflagsNew):s} {LflagsNew:d} {hex (LflagsNew):s} {bin (LflagsNew):s}'
-                # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-                LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
+                LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
             #endif
             os.chflags (AFileName, LflagsNew)
         case _:
             s = f'Неизвестная система ...'
-            # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-            LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
+            LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
     #endmatch
 #endfunction
 
@@ -869,12 +839,7 @@ def FileDelete (AFileName: str) -> bool:
     """FileDelete"""
 #beginfunction
     s = f'FileDelete: {AFileName:s}'
-
-    # LULog.LoggerTOOLS_setLevel(logging.INFO)
-    # LULog.LoggerTOOLS_setLevel(logging.DEBUG)
-
-    # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-    LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
+    LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
     LResult = True
 
     if FileExists (AFileName):
@@ -885,9 +850,8 @@ def FileDelete (AFileName: str) -> bool:
                     Lattr = GetFileAttr (AFileName)
                     if Lattr & stat.FILE_ATTRIBUTE_READONLY:
                         s = f'Clear ReadOnly ...'
-                        # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-                        LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
-                        SetFileAttr (AFileName, stat.FILE_ATTRIBUTE_READONLY, True)
+                        LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
+                        LUFile.SetFileAttr (AFileName, stat.FILE_ATTRIBUTE_READONLY, True)
 
                         # FileSetAttr (FileName, FileGetAttr(FileName) and (faReadOnly xor $FF));
                         # Change the file's permissions to writable
@@ -898,16 +862,14 @@ def FileDelete (AFileName: str) -> bool:
                     LResult = True
                 except:
                     s = f'ERROR: FileDelete ...'
-                    # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-                    LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
+                    LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
                     LResult = False
                 #endtry
             case 'Linux':
                 raise NotImplementedError('FileDelete Linux not implemented...')
             case _:
                 s = f'Неизвестная система ...'
-                # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-                LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
+                LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
         #endmatch
     #endif
     return LResult
@@ -920,10 +882,7 @@ def FileCopy (AFileNameSource: str, AFileNameDest: str, Overwrite: bool) -> bool
     """FileCopy"""
 #beginfunction
     s = f'FileCopy: {AFileNameSource:s} -> {AFileNameDest:s}'
-    # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-    LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
-
-    LResult = True
+    LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
 
     if FileExists (AFileNameSource):
 
@@ -932,7 +891,7 @@ def FileCopy (AFileNameSource: str, AFileNameDest: str, Overwrite: bool) -> bool
             ForceDirectories (LDestPath)
         #endif
 
-        LOSInfo = LUos.TOSInfo ()
+        LOSInfo = lyr.LUos.TOSInfo ()
         match LOSInfo.system:
             case 'Windows':
                 try:
@@ -942,28 +901,26 @@ def FileCopy (AFileNameSource: str, AFileNameDest: str, Overwrite: bool) -> bool
 
                     # LResult = shutil.copy (AFileNameSource, AFileNameDest) != ''
 
-                    # LResult = True
                     LResult = shutil.copy2 (AFileNameSource, AFileNameDest) != ''
                     # LResult = shutil.copy2 (AFileNameSource, LDestPath) != ''
                     # shutil.copystat (AFileNameSource, AFileNameDest)
 
+                    LResult = True
                 except:
                     s = f'ERROR: FileCopy ...'
-                    # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-                    LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
+                    LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
                     LResult = False
                 #endtry
             case 'Linux':
                 # unix
-                # LFileNameSource_stat = os.stat (AFileNameSource)
-                # Lowner = LFileNameSource_stat [stat.ST_UID]
-                # Lgroup = LFileNameSource_stat [stat.ST_GID]
+                LFileNameSource_stat = os.stat (AFileNameSource)
+                Lowner = LFileNameSource_stat [stat.ST_UID]
+                Lgroup = LFileNameSource_stat [stat.ST_GID]
                 # os.chown (AFileNameDest, Lowner, Lgroup)
                 raise NotImplementedError('FileCopy Linux not implemented...')
             case _:
                 s = f'Неизвестная система ...'
-                # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-                LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
+                LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
         #endmatch
     #endif
     return LResult
@@ -976,14 +933,13 @@ def FileMove (AFileNameSource: str, APathNameDest: str) -> bool:
     """FileMove"""
 #beginfunction
     s = f'FileMove: {AFileNameSource:s} -> {APathNameDest:s}'
-    # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-    LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
-
-    if not DirectoryExists(APathNameDest):
-        ForceDirectories(APathNameDest)
+    LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
+    LResult = True
+    if not LUFile.DirectoryExists(APathNameDest):
+        LUFile.ForceDirectories(APathNameDest)
     #endif
-    # LFileNameSource = ExtractFileName (AFileNameSource)
-    # LFileNameDest = os.path.join (APathNameDest, LFileNameSource)
+    LFileNameSource = ExtractFileName (AFileNameSource)
+    LFileNameDest = os.path.join (APathNameDest, LFileNameSource)
     LResult = shutil.move(AFileNameSource, APathNameDest, copy_function=shutil.copy2())
     return LResult
 #endfunction
@@ -1002,19 +958,15 @@ def CheckFileNameMask (AFileName: str, AMask: str) -> bool:
         # LMask = '^[\\S ]*.py$'              # *.py - все символы включая пробелы
         # LMask = '^[a-zA-Z0-9]*.py$'         # *.py - только латинские буквы и цифры
         LMask = AMask
-        # print (LMask, LFileName)
+
         #-------------------------------------------------------------------------------
         # regex = re.compile (LMask)
         # Lresult = regex.match(LFileName)
         #-------------------------------------------------------------------------------
         # эквивалентно
         #-------------------------------------------------------------------------------
-        try:
-            Lresult = re.match (LMask, LFileName)
-            # Lresult = re.search (LMask, LFileName)
-        except Exception as e:
-            Lresult = False
-        #endtry
+        Lresult = re.match (LMask, LFileName)
+        # Lresult = re.search (LMask, LFileName)
         #-------------------------------------------------------------------------------
     else:
         Lresult = False
@@ -1029,8 +981,7 @@ def CreateTextFile(AFileName: str, AText: str, AEncoding: str):
     """CreateTextFile"""
 #beginfunction
     s = f'CreateTextFile: {AFileName:s} ...'
-    # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-    LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
+    LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
 
     LEncoding = AEncoding
     if AEncoding == '':
@@ -1053,24 +1004,21 @@ def CreateTextFile(AFileName: str, AText: str, AEncoding: str):
 #--------------------------------------------------------------------------------
 # WriteStrToFile
 #--------------------------------------------------------------------------------
-def WriteStrToFile (AFileName: str, AStr: str, AEncoding: str = ''):
+def WriteStrToFile (AFileName: str, AStr: str):
     """WriteStrToFile"""
 #beginfunction
     s = f'WriteStrToFile: {AFileName:s} ...'
-    # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-    LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
+    LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
 
     # Откроет для добавления нового содержимого.
     # Создаст новый файл для чтения записи, если не найдет с указанным именем.
     LEncoding = GetFileEncoding (AFileName)
-    if AEncoding == '':
-        LEncoding = LUStrDecode.cCP1251
+    if LEncoding == '':
+        # LEncoding = LUStrDecode.cCP1251
         LEncoding = cDefaultEncoding
-    else:
-        LEncoding = AEncoding
     #endif
 
-    if len(AStr) >= 0:
+    if len(AStr) > 0:
         LHandle = open (AFileName, 'a+', encoding = LEncoding)
         LHandle.write (AStr + '\n')
         LHandle.flush ()
@@ -1085,8 +1033,7 @@ def OpenTextFile(AFileName: str, AEncoding: str) -> int:
     """OpenTextFile"""
 #beginfunction
     s = f'OpenTextFile: {AFileName:s} ...'
-    # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-    LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
+    LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
 
     LEncoding = AEncoding
     if AEncoding == '':
@@ -1114,8 +1061,7 @@ def CloseTextFile (AHandle):
     """CloseTextFile"""
 #beginfunction
     s = f'CloseTextFile ...'
-    # LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
-    LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
+    LULog.LoggerTOOLS_AddLevel (logging.DEBUG, s)
 
     AHandle.flush ()
     AHandle.close ()