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

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

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