lyrpy 2024.0.4__py3-none-any.whl → 2025.0.1__py3-none-any.whl

{lyrpy → SRC/LIB/lyrpy}/LULog.py

@@ -26,6 +26,7 @@ import logging
 import logging.config
 import yaml
 import json
+import shutil
 
 import inspect
 import traceback
@@ -50,15 +51,13 @@ import lyrpy.LUParserINI as LUParserINI
 import lyrpy.LUDict as LUDict
 import lyrpy.LUSupport as LUSupport
 
-# ===========================================================================
-# CONST
-# ===========================================================================
 import rich
 import rich.console as console
 GConsoleRich = rich.console.Console ()
 
-STATLogging = True
-
+# ===========================================================================
+# CONST
+# ===========================================================================
 """CONST"""
 ctlsNOTSET = ' '
 ctlsDEBUG = 'D'
@@ -108,6 +107,7 @@ def AddLevelName():
 #endfunction
 
 CDefaultFileLogINI = 'logging.ini'
+CDefaultFileLogINI_CONSOLE = 'logging_CONSOLE.INI'
 CDefaultFileLogCONFIG = 'logging.CONFIG'
 CDefaultFileLogYAML = 'logging.YAML'
 
@@ -283,9 +283,9 @@ class TFileMemoLog (object):
     #beginfunction
         del self.__FLogStrings
         del self.__FLogSave
-        LClassName = self.__class__.__name__
-        s = '{} уничтожен'.format (LClassName)
-        #print (s)
+        # LClassName = self.__class__.__name__
+        # s = '{} уничтожен'.format (LClassName)
+        # print (s)
     #endfunction
 
     def Clear(self):
@@ -461,7 +461,7 @@ class TFileMemoLog (object):
                 #endfor
             except:
                 s = f'TruncateLog: Неправильная кодировка журнала!'
-                LoggerTOOLS.error (s)
+                LoggerTOOLS.error(s)
             finally:
                 LFile.close ()
             # TruncateMemo (ts)
@@ -497,7 +497,7 @@ class TFileMemoLog (object):
                 _s = s
             else:
                 _s = self._LogDateStr (False) + ' ' + str(T.value) + ' ' + s
-            if not LUSupport.ISTerminal ():
+            if not LUSupport.IsTerminal ():
                 LCOLOR = COLORS_tls.get (T)
                 if LCOLOR is not None:
                     LFmt = LUConsole.sBEGIN_oct + LCOLOR + _s + LUConsole.sRESET
@@ -594,6 +594,7 @@ class TFileMemoLog (object):
         self.__FLogStringAnsi = Value
         if self.LogEnabled:
             self._Execute(T)
+        #endif
     #endfunction
 
     def AddLogFile (self, AFileName: str):
@@ -603,6 +604,7 @@ class TFileMemoLog (object):
             LEncoding = LUFile.GetFileEncoding (AFileName)
             if LEncoding == '':
                 LEncoding = LUFile.cDefaultEncoding
+            #endif
             try:
                 # работа с файлом
                 with open (AFileName, 'r', encoding = LEncoding) as LFile:
@@ -614,7 +616,7 @@ class TFileMemoLog (object):
                 self.AddLog (TTypeLogString.tlsERROR, AFileName)
                 s = f'AddLogFile: Неправильная кодировка журнала!'
                 LoggerTOOLS.error (s)
-
+            #endtry
         #endif
     #endfunction
 #endclass
@@ -907,6 +909,7 @@ class TFormatter(logging.Formatter):
                 else:
                     LFmt = _s
                 return LFmt
+            #endif
         else:
             return AFmt
         #endif
@@ -1411,7 +1414,7 @@ def LogFileName(ALog: int, ALogDir: str, ALogFile: str) -> str:
                 s = LUDateTime.DateTimeStr (False, LToday, LUDateTime.cFormatDateYYMMDD_01, False)
                 LLogFile = s+'.log'
             #endif
-            LLogFileName = s.path.join([LLogDir, LLogFile])
+            LLogFileName = os.path.join(LLogDir, LLogFile)
             if ALog == 10 or ALog == 30:
                 if LUFile.FileExists(LLogFileName):
                     try:
@@ -1439,7 +1442,7 @@ def LogAdd (ALog: int, ALogFile: str, AOpt: TTypeLogString, AMessage: str):
 
     def _WriteConsole(_s, T):
     #beginfunction
-        if not LUSupport.ISTerminal ():
+        if not LUSupport.IsTerminal ():
             LCOLOR = COLORS_tls.get (T)
             if LCOLOR is not None:
                 LFmt = LUConsole.sBEGIN_oct + LCOLOR + _s + LUConsole.sRESET
@@ -1569,7 +1572,7 @@ def GetHandler (ALogger: logging.Logger, ANameHandler: str):
     """Printhandlers"""
 #beginfunction
     for item in ALogger.root.handlers:
-        s = f'{item.name}={item}'
+        # s = f'{item.name}={item}'
         # LoggerTOOLS.info(s)
         if item.name == ANameHandler:
             return item
@@ -1593,6 +1596,7 @@ def WinToUnix (Astr: str) -> str:
             # print ('INFO: Only LINUX or WINDOWS')
             Lstr = Astr
     #endmatch
+    return Lstr
 #endfunction
 
 #-------------------------------------------------
@@ -1677,6 +1681,9 @@ def CreateLoggerCONFIG (AFileNameCONFIG: str, ALogerName: str,
 #beginfunction
     global CONFIG
     CONFIG = {}
+    global LoggerTOOLS
+
+    #print ('CONFIG:ADirectoryLOG:',ADirectoryLOG)
 
     LPath = LUFile.ExtractFileDir(__file__)
     LFileNameCONFIG = os.path.join (LPath, AFileNameCONFIG)
@@ -1687,8 +1694,7 @@ def CreateLoggerCONFIG (AFileNameCONFIG: str, ALogerName: str,
                 CONFIG = json.load(FileCONFIG)
             #endwith
         except FileNotFoundError as ERROR:
-            print ('Невозможно открыть файл', ERROR)
-            GLULogger.error('Невозможно открыть файл')
+            print ('ERROR: Невозможно открыть файл', ERROR)
         #endtry
     else:
         CONFIG = copy.deepcopy (LOGGING_CONFIG)
@@ -1699,21 +1705,21 @@ def CreateLoggerCONFIG (AFileNameCONFIG: str, ALogerName: str,
 
     if AFileNameLOG == '':
         LOptionValue_01 = CONFIG['handlers']['FILE_01']['filename']
-        print ('LOptionValue_01:',LOptionValue_01)
+        # print ('LOptionValue_01:',LOptionValue_01)
         LFileNameLOG = LUFile.ExtractFileName (LOptionValue_01)
     else:
         LFileNameLOG = LUFile.ExtractFileName (AFileNameLOG)
     #endif
-    print('LFileNameLOG:',LFileNameLOG)
+    # print('LFileNameLOG:',LFileNameLOG)
 
     if AFileNameLOGjson == '':
         LOptionValue_02 = CONFIG['handlers']['FILE_02']['filename']
-        print ('LOptionValue_02:',LOptionValue_02)
+        # print ('LOptionValue_02:',LOptionValue_02)
         LFileNameLOGjson = LUFile.ExtractFileName (LOptionValue_02)
     else:
         LFileNameLOGjson = LUFile.ExtractFileName (AFileNameLOGjson)
     #endif
-    print('LFileNameLOGjson:',LFileNameLOGjson)
+    # print('LFileNameLOGjson:',LFileNameLOGjson)
 
     if ADirectoryLOG == '':
         # log будет создан в текущем каталоге (по умолчанию)
@@ -1729,16 +1735,18 @@ def CreateLoggerCONFIG (AFileNameCONFIG: str, ALogerName: str,
 
     # установить имена log файлов в CONFIG
     LOptionValue_01 = os.path.join (LDirectoryLOG, LFileNameLOG)
-    print('LOptionValue_01:', LOptionValue_01)
+    # print('LOptionValue_01:', LOptionValue_01)
     CONFIG ['handlers'] ['FILE_01'] ['filename'] = LOptionValue_01
 
     LOptionValue_02 = os.path.join (LDirectoryLOG, LFileNameLOGjson)
-    print('LOptionValue_02:', LOptionValue_02)
+    # print('LOptionValue_02:', LOptionValue_02)
     CONFIG ['handlers'] ['FILE_02'] ['filename'] = LOptionValue_02
 
     if len(CONFIG) > 0:
         #-------------------------------------------------------------------
-        LFileNameCONFIG = os.path.join (LUos.GetCurrentDir (), CDefaultFileLogCONFIG)
+        # LFileNameCONFIG = os.path.join (LUos.GetCurrentDir (), CDefaultFileLogCONFIG)
+        LFileNameCONFIG = os.path.join (LUFile.GetTempDir(), CDefaultFileLogCONFIG)
+
         LUDict.SaveDictSTR (CONFIG, LFileNameCONFIG)
         #-------------------------------------------------------------------
         # читаем конфигурацию из словаря
@@ -1770,8 +1778,7 @@ def CreateLoggerYAML (AFileNameYAML: str, ALogerName: str, ADirectoryLOG: str, A
                 CONFIG_YAML = yaml.load(FileCONFIG_YAML, Loader=yaml.FullLoader)
             #endwith
         except FileNotFoundError as ERROR:
-            print ('Невозможно открыть файл', ERROR)
-            GLULogger.error ('Невозможно открыть файл')
+            print ('ERROR: Невозможно открыть файл', ERROR)
         #endtry
     else:
         CONFIG_YAML = copy.deepcopy (LOGGING_CONFIG)
@@ -1782,21 +1789,21 @@ def CreateLoggerYAML (AFileNameYAML: str, ALogerName: str, ADirectoryLOG: str, A
 
     if AFileNameLOG == '':
         LOptionValue_01 = CONFIG_YAML ['handlers'] ['FILE_01'] ['filename']
-        print ('LOptionValue_01:', LOptionValue_01)
+        # print ('LOptionValue_01:', LOptionValue_01)
         LFileNameLOG = LUFile.ExtractFileName (LOptionValue_01)
     else:
         LFileNameLOG = LUFile.ExtractFileName (AFileNameLOG)
     #endif
-    print ('LFileNameLOG:', LFileNameLOG)
+    # print ('LFileNameLOG:', LFileNameLOG)
 
     if AFileNameLOGjson == '':
         LOptionValue_02 = CONFIG_YAML ['handlers'] ['FILE_02'] ['filename']
-        print ('LOptionValue_02:', LOptionValue_02)
+        # print ('LOptionValue_02:', LOptionValue_02)
         LFileNameLOGjson = LUFile.ExtractFileName (LOptionValue_02)
     else:
         LFileNameLOGjson = LUFile.ExtractFileName (AFileNameLOGjson)
     #endif
-    print ('LFileNameLOGjson:', LFileNameLOGjson)
+    # print ('LFileNameLOGjson:', LFileNameLOGjson)
 
     if ADirectoryLOG == '':
         # log будет создан в текущем каталоге (по умолчанию)
@@ -1812,11 +1819,10 @@ def CreateLoggerYAML (AFileNameYAML: str, ALogerName: str, ADirectoryLOG: str, A
 
     # установить имена log файлов в CONFIG
     LOptionValue_01 = os.path.join (LDirectoryLOG, LFileNameLOG)
-    print('LOptionValue_01:', LOptionValue_01)
+    # print('LOptionValue_01:', LOptionValue_01)
     CONFIG_YAML ['handlers'] ['FILE_01'] ['filename'] = LOptionValue_01
-
     LOptionValue_02 = os.path.join (LDirectoryLOG, LFileNameLOGjson)
-    print('LOptionValue_02:', LOptionValue_02)
+    # print('LOptionValue_02:', LOptionValue_02)
     CONFIG_YAML ['handlers'] ['FILE_02'] ['filename'] = LOptionValue_02
 
     if len (CONFIG_YAML) > 0:
@@ -1848,52 +1854,68 @@ def CreateLoggerFILEINI (AFileNameINI: str, ALogerName: str,
 
     # читаем конфигурацию из файла INI
     LFileNameINI = LUFile.ExpandFileName (AFileNameINI)
+
     if LUFile.FileExists (LFileNameINI):
         # существует файл, который можно редактировать
         SetEditINI = True
         LPathINI = LUFile.ExtractFileDir (LFileNameINI)
         LFileNameINI = os.path.join (LPathINI, LUFile.ExtractFileName (AFileNameINI))
     else:
-        LPathINI = LUos.GetCurrentDir ()
-        LFileNameINI = os.path.join (LPathINI, LUFile.ExtractFileName (AFileNameINI))
-        # print ('LFileNameINI: ', LFileNameINI)
-        if LUFile.FileExists (LFileNameINI):
-            # существует файл в текущем каталоге, который можно редактировать
-            SetEditINI = True
+        SetEditINI = False
+        if not ALogerName == 'console':
+            LPathINI = LUos.GetCurrentDir ()
+            LFileNameINI = os.path.join (LPathINI, LUFile.ExtractFileName (AFileNameINI))
+            if LUFile.FileExists (LFileNameINI):
+                # существует файл в текущем каталоге, который можно редактировать
+                SetEditINI = True
+            else:
+                # берем имя файла из проекта, если оно есть
+                SetEditINI = True
+                LPathINI = LUFile.ExtractFileDir (__file__)
+                LFileNameINIorig = os.path.join (LPathINI, CDefaultFileLogINI)
+                # Копирование файла
+                shutil.copy (LFileNameINIorig, LFileNameINI)
+            #endif
         else:
-            # берем имя файла из проекта, если оно есть
             LPathINI = LUFile.ExtractFileDir (__file__)
             LFileNameINI = os.path.join (LPathINI, LUFile.ExtractFileName (AFileNameINI))
-            SetEditINI = False
         #endif
     #endif
-    # print ('LPathINI:',LPathINI)
-    # print ('LFileNameINI:',LFileNameINI)
+
+    # print ('LFileNameINI:', LFileNameINI)
 
     if not SetEditINI:
+        # print ('ALogerName:',ALogerName)
         pass
     else:
+        # print ('AFileNameLOG:', AFileNameLOG)
         LINIFile = LUParserINI.TINIFile ()
         LINIFile.FileNameINI = LFileNameINI
         LOptionName = 'args'
         if AFileNameLOG == '':
             LSectionName_01 = 'handler_FILE_01'
-            LOptionValue_01 = LINIFile.GetOption(LSectionName_01, LOptionName)
-            print ('LOptionValue_01:',LOptionValue_01)
-            LFileNameLOG = LUFile.ExtractFileName (LOptionValue_01.split([',', '('])[0])
+            LOptionValue_01 = LINIFile.GetOption(LSectionName_01, LOptionName, '')
+            # print ('LOptionValue_01:',LOptionValue_01)
+            LFileNameLOG = LOptionValue_01.split("'")[1]
+            # print('LFileNameLOG:',LFileNameLOG)
+            LFileNameLOG = LUFile.ExtractFileName (LFileNameLOG)
         else:
             LFileNameLOG = LUFile.ExtractFileName (AFileNameLOG)
         #endif
         # print('LFileNameLOG:',LFileNameLOG)
+
         if AFileNameLOGjson == '':
             LSectionName_02 = 'handler_FILE_02'
-            LOptionValue_02 = LINIFile.GetOption(LSectionName_02, LOptionName)
-            print ('LOptionValue_02:',LOptionValue_02)
-            LFileNameLOGjson = LUFile.ExtractFileName (LOptionValue_02.split([',', '('])[0])
+            LOptionValue_02 = LINIFile.GetOption(LSectionName_02, LOptionName, '')
+            # print ('LOptionValue_02:',LOptionValue_02)
+            LFileNameLOGjson = LOptionValue_02.split("'")[1]
+            # print('LFileNameLOGjson:',LFileNameLOGjson)
+            LFileNameLOGjson = LUFile.ExtractFileName (LFileNameLOGjson)
         else:
             LFileNameLOGjson = LUFile.ExtractFileName (AFileNameLOGjson)
         #endif
-        # print('LFileNameLOGjson:',LFileNameLOGjson)
+        print('AFileNameLOGjson:',AFileNameLOGjson)
+        print('LFileNameLOGjson:',LFileNameLOGjson)
 
         # установить имена log файлов в ini
         LOptionValue_01 = "('" + os.path.join (LDirectoryLOG, LFileNameLOG) + "',)"
@@ -1901,25 +1923,24 @@ def CreateLoggerFILEINI (AFileNameINI: str, ALogerName: str,
             LOptionValue_01 = LOptionValue_01.replace ('\\', "\\\\")
         #endif
         if LUos.GOSInfo.system == 'Linux':
-            raise 'Linux не поддерживается'
+            raise 'ERROR: Linux не поддерживается'
         #endif
-        # print(LOptionValue_01)
-
+        # print('LOptionValue_01:',LOptionValue_01)
         LINIFile.SetOption ('handler_FILE_01', LOptionName, LOptionValue_01)
         LOptionValue_02 = "('" + os.path.join (LDirectoryLOG, LFileNameLOGjson) + "',)"
-
         if LUos.GOSInfo.system == 'Windows':
             LOptionValue_02 = LOptionValue_02.replace ("\\", "\\\\")
         #endif
         if LUos.GOSInfo.system == 'Linux':
-            raise 'Linux не поддерживается'
+            raise 'ERROR: Linux не поддерживается'
         #endif
-        # print(LOptionValue_02)
+        # print('LOptionValue_02:',LOptionValue_02)
 
         LINIFile.SetOption ('handler_FILE_02', LOptionName, LOptionValue_02)
         LINIFile.UpdateFileINI ()
     #endif
 
+    # print ('INI:ADirectoryLOG:',ADirectoryLOG)
     if ADirectoryLOG == '':
         # log будет создан в текущем каталоге (по умолчанию)
         LDirectoryLOG = LUos.GetCurrentDir ()
@@ -1927,17 +1948,24 @@ def CreateLoggerFILEINI (AFileNameINI: str, ALogerName: str,
         # log будет создан в ADirectoryLOG
         LDirectoryLOG = LUFile.ExpandFileName (ADirectoryLOG)
     #endif
-    # print('LDirectoryLOG:',LDirectoryLOG)
+    # print('...LDirectoryLOG:',LDirectoryLOG)
+
     if not LUFile.DirectoryExists (LDirectoryLOG):
-        lyr.LUFile.ForceDirectories(LDirectoryLOG)
+        LUFile.ForceDirectories(LDirectoryLOG)
     #endif
 
-    print(LFileNameINI)
-    logging.config.fileConfig (LFileNameINI, disable_existing_loggers=True, encoding=LUFile.cDefaultEncoding)
+    # os.chdir (LDirectoryLOG)
+
+    # print(LFileNameINI)
+
+    logging.config.fileConfig (LFileNameINI, disable_existing_loggers=True,
+                               encoding=LUFile.cDefaultEncoding)
     # logging.config.fileConfig (LFileNameINI, disable_existing_loggers=True, encoding='cp1251')
 
     # создаем регистратор
     LResult = logging.getLogger (ALogerName)
+    # print(f'{LResult.name=}')
+    # print(f'{LResult.handlers=}')
     # установить форматер
     SetFormatterForLogger (LResult)
 
@@ -1990,46 +2018,72 @@ def CreateTFileMemoLog () -> TFileMemoLog:
 #-------------------------------------------------
 # Инициализация системы logging
 #-------------------------------------------------
-GLoggerFILEINI = None
-GLoggerCONFIG = None
-LoggerTOOLS = None
-LoggerAPPS = None
-LoggerTLogger = None
-FileMemoLog = None
-
-def STARTLogging (T: TTypeSETUPLOG, ADirectoryLOG: str, AFileNameLOG: str, AFileNameLOGjson: str) -> None:
+STATLogging = True
+
+GLoggerFILEINI = logging.Logger
+GLoggerCONFIG = logging.Logger
+LoggerTOOLS = logging.Logger
+LoggerAPPS = logging.Logger
+LoggerTLogger = TLogger
+FileMemoLog = TFileMemoLog
+
+def STARTLogging (T: TTypeSETUPLOG, ALogerName, ADirectoryLOG: str, AFileNameLOG: str, AFileNameLOGjson: str) -> None:
     """STARTLogging"""
 #beginfunction
+    global GLoggerFILEINI
+    global GLoggerCONFIG
+    global LoggerTOOLS
+    global LoggerAPPS
+    global LoggerTLogger
+    global FileMemoLog
     global STATLogging
+
     STATLogging = False
-    # print (sys._getframe (0).f_code.co_name, '...')
 
+    # print (sys._getframe (0).f_code.co_name, '...')
     # print (inspect.currentframe().f_code.co_name, '...')
     # print (inspect.stack () [0] [3], '...')
     # print (traceback.extract_stack () [-1].name, '...')
 
-    global GLoggerFILEINI
-    global GLoggerCONFIG
-    global LoggerTOOLS
-    global LoggerAPPS
-    global LoggerTLogger
-    global FileMemoLog
+    LLogerNames = ['root','log01','log01', 'console']
 
     AddLevelName ()
 
-    match T:
-        case TTypeSETUPLOG.tslCONFIG:
-            GLoggerCONFIG = CreateLoggerCONFIG (CDefaultFileLogCONFIG, 'root', ADirectoryLOG, AFileNameLOG,
-                                                AFileNameLOGjson)
-        case TTypeSETUPLOG.tslYAML:
-            GLoggerYAML = CreateLoggerYAML (CDefaultFileLogYAML, 'root', ADirectoryLOG, AFileNameLOG,
+    LT = T
+    if LUos.GOSInfo.system == 'Windows':
+        LT = T
+    #endif
+    if LUos.GOSInfo.system == 'Linux':
+        LT = TTypeSETUPLOG.tslCONFIG
+    #endif
+
+    if ALogerName in LLogerNames:
+        match LT:
+            case TTypeSETUPLOG.tslCONFIG:
+                GLoggerCONFIG = CreateLoggerCONFIG (CDefaultFileLogCONFIG, ALogerName,
+                                                    ADirectoryLOG, AFileNameLOG,
+                                                    AFileNameLOGjson)
+            case TTypeSETUPLOG.tslYAML:
+                GLoggerYAML = CreateLoggerYAML (CDefaultFileLogYAML, ALogerName,
+                                                ADirectoryLOG, AFileNameLOG,
                                                 AFileNameLOGjson)
-        case TTypeSETUPLOG.tslINI:
-            GLoggerFILEINI = CreateLoggerFILEINI (CDefaultFileLogINI, 'root', ADirectoryLOG, AFileNameLOG,
-                                                  AFileNameLOGjson)
-        case _:
-            ...
-    #endmatch
+            case TTypeSETUPLOG.tslINI:
+                if ALogerName == 'console' or LUConst.GAPPName is None:
+                    # 'logging_CONSOLE.INI'
+                    LFileLogINI = CDefaultFileLogINI
+                    LFileLogINI = CDefaultFileLogINI_CONSOLE
+                else:
+                    LFileLogINI = LUConst.GAPPName+'.ini'
+                #endif
+                GLoggerFILEINI = CreateLoggerFILEINI (LFileLogINI, ALogerName,
+                                                      ADirectoryLOG, AFileNameLOG,
+                                                      AFileNameLOGjson)
+            case _:
+                pass
+        #endmatch
+    else:
+        exit()
+    #endif
 
     #-------------------------------------------------
     # GLoggerBASIC = CreateLoggerBASIC (logging.DEBUG, 'LOG\\' + CDefaultFileLogFILEBASIC, 'root')
@@ -2041,7 +2095,8 @@ def STARTLogging (T: TTypeSETUPLOG, ADirectoryLOG: str, AFileNameLOG: str, AFile
     #-------------------------------------------------
     CLoggerTOOLS = 'TOOLS__'
     LoggerTOOLS = logging.getLogger (CLoggerTOOLS)
-    LoggerTOOLS.disabled = False
+    # LoggerTOOLS.disabled = False
+    # LoggerTOOLS.info ('info')
     # print('LoggerTOOLS' in vars () or 'LoggerTOOLS' in globals ())
     # print('LoggerTOOLS' in vars ())
     # print('LoggerTOOLS' in globals ())
@@ -2053,7 +2108,7 @@ def STARTLogging (T: TTypeSETUPLOG, ADirectoryLOG: str, AFileNameLOG: str, AFile
     #-------------------------------------------------
     # LoggerAPPS
     #-------------------------------------------------
-    CLoggerAPPS = 'APPS___'
+    CLoggerAPPS = 'APPS__'
     LoggerAPPS = logging.getLogger(CLoggerAPPS)
 
     #-------------------------------------------------
@@ -2074,21 +2129,25 @@ def STARTLogging (T: TTypeSETUPLOG, ADirectoryLOG: str, AFileNameLOG: str, AFile
     logger.setLevel(logging.INFO)
     logger = logging.getLogger('chardet.universaldetector')
     logger.setLevel(logging.INFO)
+
     #-------------------------------------------------
     # Отключить журнал 'pytube.extract'
     #-------------------------------------------------
     logger = logging.getLogger('pytube.extract')
     logger.setLevel(logging.INFO)
+    
     #-------------------------------------------------
     # Отключить журнал 'pytube.streams'
     #-------------------------------------------------
     logger = logging.getLogger('pytube.streams')
     logger.setLevel(logging.INFO)
+    
     #-------------------------------------------------
     # Отключить журнал 'pytube.cipher'
     #-------------------------------------------------
     logger = logging.getLogger('pytube.cipher')
     logger.setLevel(logging.INFO)
+    
     #-------------------------------------------------
     # Отключить журнал 'pytube.helpers'
     #-------------------------------------------------
@@ -2105,36 +2164,21 @@ def STOPLogging () -> None:
     """STOPLogging"""
 #beginfunction
     global STATLogging
-    global LoggerTOOLS
+    # global LoggerTOOLS
     STATLogging = False
     # LoggerTOOLS.disabled = True# Выключить систему logging для логгирования
 #endfunction
 
 #-------------------------------------------------
-# LoggerTOOLS_AddLevel
-#-------------------------------------------------
-def LoggerTOOLS_AddLevel (ALevel, Astr):
-#beginfunction
-    if STATLogging:
-        try:
-            LoggerTOOLS.log(ALevel, Astr)
-        except:
-            ...
-        #endtry
-    else:
-        print("INFO: система не включена для записи логов")
-    #endif
-#endfunction
-
-#-------------------------------------------------
-# LoggerTOOLS_AddDebug
+# LoggerAdd
 #-------------------------------------------------
-def LoggerTOOLS_AddDebug (Astr):
+def LoggerAdd (ALogger, ALevel, Astr):
 #beginfunction
     if STATLogging:
         try:
-            LoggerTOOLS.debug(Astr)
+            ALogger.log(ALevel, Astr)
         except:
+            print("ERROR:")
             ...
         #endtry
     else:
@@ -2142,89 +2186,121 @@ def LoggerTOOLS_AddDebug (Astr):
     #endif
 #endfunction
 
-#-------------------------------------------------
-# LoggerTOOLS_AddError
-#-------------------------------------------------
-def LoggerTOOLS_AddError (Astr):
-#beginfunction
-    if STATLogging:
-        try:
-            LoggerTOOLS.error(Astr)
-        except:
-            ...
-        #endtry
-    else:
-        print("INFO: система не включена для записи логов")
-    #endif
-#endfunction
-
-#-------------------------------------------------
-# LoggerAPPS_AddLevel
-#-------------------------------------------------
-#LULog.LoggerAPPS.log
-def LoggerAPPS_AddLevel (ALevel, Astr):
-#beginfunction
-    if STATLogging:
-        try:
-            LoggerAPPS.log(ALevel, Astr)
-        except:
-            ...
-        #endtry
-    else:
-        print("INFO: система не включена для записи логов")
-    #endif
-#endfunction
-
-#-------------------------------------------------
-# LoggerAPPS_AddInfo
-#-------------------------------------------------
-#LULog.LoggerAPPS.info
-def LoggerAPPS_AddInfo (Astr):
-#beginfunction
-    if STATLogging:
-        try:
-            LoggerAPPS.info(Astr)
-        except:
-            ...
-        #endtry
-    else:
-        print("INFO: система не включена для записи логов")
-    #endif
-#endfunction
-
-#-------------------------------------------------
-# LoggerAPPS_AddError
-#-------------------------------------------------
-#LULog.LoggerAPPS.error
-def LoggerAPPS_AddError (Astr):
-#beginfunction
-    if STATLogging:
-        try:
-            LoggerAPPS.error(Astr)
-        except:
-            ...
-        #endtry
-    else:
-        print("INFO: система не включена для записи логов")
-    #endif
-#endfunction
-
-#-------------------------------------------------
-# LoggerAPPS_AddDebug
-#-------------------------------------------------
-#LULog.LoggerAPPS.debug
-def LoggerAPPS_AddDebug (Astr):
-#beginfunction
-    if STATLogging:
-        try:
-            LoggerAPPS.debug(Astr)
-        except:
-            ...
-        #endtry
-    else:
-        print("INFO: система не включена для записи логов")
-    #endif
-#endfunction
+# #-------------------------------------------------
+# # LoggerTOOLS_AddLevel
+# #-------------------------------------------------
+# def LoggerTOOLS_AddLevel (ALevel, Astr):
+# #beginfunction
+#     if STATLogging:
+#         try:
+#             LoggerTOOLS.log(ALevel, Astr)
+#         except:
+#             ...
+#         #endtry
+#     else:
+#         print("INFO: система не включена для записи логов")
+#     #endif
+# #endfunction
+#
+# #-------------------------------------------------
+# # LoggerTOOLS_AddDebug
+# #-------------------------------------------------
+# def LoggerTOOLS_AddDebug (Astr):
+# #beginfunction
+#     if STATLogging:
+#         try:
+#             LoggerTOOLS.debug(Astr)
+#         except:
+#             ...
+#         #endtry
+#     else:
+#         print("INFO: система не включена для записи логов")
+#     #endif
+# #endfunction
+#
+# #-------------------------------------------------
+# # LoggerTOOLS_AddError
+# #-------------------------------------------------
+# def LoggerTOOLS_AddError (Astr):
+# #beginfunction
+#     if STATLogging:
+#         try:
+#             LoggerTOOLS.error(Astr)
+#         except:
+#             ...
+#         #endtry
+#     else:
+#         print("INFO: система не включена для записи логов")
+#     #endif
+# #endfunction
+#
+# #-------------------------------------------------
+# # LoggerAPPS_AddLevel
+# #-------------------------------------------------
+# #LULog.LoggerAPPS.log
+# def LoggerAPPS_AddLevel (ALevel, Astr):
+# #beginfunction
+#     if STATLogging:
+#         try:
+#             LoggerAPPS.log(ALevel, Astr)
+#         except:
+#             ...
+#         #endtry
+#     else:
+#         print("INFO: система не включена для записи логов")
+#     #endif
+# #endfunction
+#
+# #-------------------------------------------------
+# # LoggerAPPS_AddInfo
+# #-------------------------------------------------
+# #LULog.LoggerAPPS.info
+# def LoggerAPPS_AddInfo (Astr):
+# #beginfunction
+#     if STATLogging:
+#         try:
+#             LoggerAPPS.info(Astr)
+#         except:
+#             ...
+#         #endtry
+#     else:
+#         print("INFO: система не включена для записи логов")
+#     #endif
+# #endfunction
+#
+# #-------------------------------------------------
+# # LoggerAPPS_AddError
+# #-------------------------------------------------
+# #LULog.LoggerAPPS.error
+# def LoggerAPPS_AddError (Astr):
+# #beginfunction
+#     if STATLogging:
+#         try:
+#             LoggerAPPS.error(Astr)
+#         except:
+#             ...
+#         #endtry
+#     else:
+#         print("INFO: система не включена для записи логов")
+#     #endif
+# #endfunction
+#
+# #-------------------------------------------------
+# # LoggerAPPS_AddDebug
+# #-------------------------------------------------
+# #LULog.LoggerAPPS.debug
+# def LoggerAPPS_AddDebug (Astr):
+# #beginfunction
+#     if STATLogging:
+#         try:
+#             LoggerAPPS.debug(Astr)
+#         except:
+#             ...
+#         #endtry
+#     else:
+#         print("INFO: система не включена для записи логов")
+#     #endif
+# #endfunction
 
 #-------------------------------------------------
 # main