lyrpy 2024.0.3__py3-none-any.whl → 2024.0.4__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of lyrpy might be problematic. Click here for more details.
- lyrpy/LUConsole.py +1 -1
- lyrpy/LUDateTime.py +1 -1
- lyrpy/LUDoc.py +1 -1
- lyrpy/LUFile.py +5 -5
- lyrpy/LULog.py +22 -22
- lyrpy/LUParserINI.py +6 -6
- lyrpy/LUos.py +2 -2
- {lyrpy-2024.0.3.dist-info → lyrpy-2024.0.4.dist-info}/METADATA +1 -1
- {lyrpy-2024.0.3.dist-info → lyrpy-2024.0.4.dist-info}/RECORD +13 -13
- {lyrpy-2024.0.3.data → lyrpy-2024.0.4.data}/data/data/text.txt +0 -0
- {lyrpy-2024.0.3.dist-info → lyrpy-2024.0.4.dist-info}/LICENSE +0 -0
- {lyrpy-2024.0.3.dist-info → lyrpy-2024.0.4.dist-info}/WHEEL +0 -0
- {lyrpy-2024.0.3.dist-info → lyrpy-2024.0.4.dist-info}/top_level.txt +0 -0
lyrpy/LUConsole.py
CHANGED
|
@@ -28,7 +28,7 @@ from colorama import Fore, Back, Style
|
|
|
28
28
|
#------------------------------------------
|
|
29
29
|
# БИБЛИОТЕКИ LU
|
|
30
30
|
#------------------------------------------
|
|
31
|
-
import
|
|
31
|
+
import lyrpy.LUSupport as LUSupport
|
|
32
32
|
|
|
33
33
|
#------------------------------------------
|
|
34
34
|
# CONST
|
lyrpy/LUDateTime.py
CHANGED
|
@@ -30,7 +30,7 @@ import platform
|
|
|
30
30
|
#------------------------------------------
|
|
31
31
|
# БИБЛИОТЕКИ LU
|
|
32
32
|
#------------------------------------------
|
|
33
|
-
import
|
|
33
|
+
import lyrpy.LUSupport as LUSupport
|
|
34
34
|
|
|
35
35
|
#------------------------------------------
|
|
36
36
|
# CONST
|
lyrpy/LUDoc.py
CHANGED
|
@@ -26,7 +26,7 @@ import sys
|
|
|
26
26
|
#------------------------------------------
|
|
27
27
|
# БИБЛИОТЕКИ LU
|
|
28
28
|
#------------------------------------------
|
|
29
|
-
import
|
|
29
|
+
import lyrpy.LULog as LULog
|
|
30
30
|
|
|
31
31
|
#---------------------------------------------------------------
|
|
32
32
|
# PrintInfoObject
|
lyrpy/LUFile.py
CHANGED
|
@@ -46,11 +46,11 @@ import chardet
|
|
|
46
46
|
#------------------------------------------
|
|
47
47
|
# БИБЛИОТЕКА LU
|
|
48
48
|
#------------------------------------------
|
|
49
|
-
import
|
|
50
|
-
import
|
|
51
|
-
import
|
|
52
|
-
import
|
|
53
|
-
import
|
|
49
|
+
import lyrpy.LUErrors as LUErrors
|
|
50
|
+
import lyrpy.LUStrDecode as LUStrDecode
|
|
51
|
+
import lyrpy.LUDateTime as LUDateTime
|
|
52
|
+
import lyrpy.LUos as LUos
|
|
53
|
+
import lyrpy.LULog as LULog
|
|
54
54
|
|
|
55
55
|
"""
|
|
56
56
|
#--------------------------------------------------------------------------------
|
lyrpy/LULog.py
CHANGED
|
@@ -41,14 +41,14 @@ import PySide6.QtWidgets
|
|
|
41
41
|
#------------------------------------------
|
|
42
42
|
# БИБЛИОТЕКА LU
|
|
43
43
|
#------------------------------------------
|
|
44
|
-
import
|
|
45
|
-
import
|
|
46
|
-
import
|
|
47
|
-
import
|
|
48
|
-
import
|
|
49
|
-
import
|
|
50
|
-
import
|
|
51
|
-
import
|
|
44
|
+
import lyrpy.LUConst as LUConst
|
|
45
|
+
import lyrpy.LUFile as LUFile
|
|
46
|
+
import lyrpy.LUConsole as LUConsole
|
|
47
|
+
import lyrpy.LUDateTime as LUDateTime
|
|
48
|
+
import lyrpy.LUos as LUos
|
|
49
|
+
import lyrpy.LUParserINI as LUParserINI
|
|
50
|
+
import lyrpy.LUDict as LUDict
|
|
51
|
+
import lyrpy.LUSupport as LUSupport
|
|
52
52
|
|
|
53
53
|
# ===========================================================================
|
|
54
54
|
# CONST
|
|
@@ -267,7 +267,7 @@ class TFileMemoLog (object):
|
|
|
267
267
|
self.__FMemoLog = None #TMemo
|
|
268
268
|
self.__FLogStrings: list = list() #TStringList;
|
|
269
269
|
self.__FLogSave: list = list() #TStringList;
|
|
270
|
-
self.__FLogCODE =
|
|
270
|
+
self.__FLogCODE = LUFile.cDefaultEncoding
|
|
271
271
|
self.__FConsoleRich = rich.console.Console()
|
|
272
272
|
|
|
273
273
|
# self.__FLogger: logging.Logger = CreateLoggerFILEINI (CDefaultFileLogINI, 'root')
|
|
@@ -752,7 +752,7 @@ class TStreamHandler(logging.StreamHandler):
|
|
|
752
752
|
msg = self.format(record)
|
|
753
753
|
stream = self.stream
|
|
754
754
|
# issue 35046: merged two stream.writes into one.
|
|
755
|
-
if not
|
|
755
|
+
if not LUSupport.IsTerminal ():
|
|
756
756
|
stream.write(msg + self.terminator)
|
|
757
757
|
self.flush()
|
|
758
758
|
else:
|
|
@@ -893,9 +893,9 @@ class TFormatter(logging.Formatter):
|
|
|
893
893
|
"""_SetColor"""
|
|
894
894
|
#beginfunction
|
|
895
895
|
if self.FUseColor:
|
|
896
|
-
if not
|
|
896
|
+
if not LUSupport.IsTerminal ():
|
|
897
897
|
LCOLOR = COLORS.get (ALevelNo)
|
|
898
|
-
LFmt =
|
|
898
|
+
LFmt = LUConsole.sBEGIN_oct + LCOLOR + AFmt + LUConsole.sRESET
|
|
899
899
|
return LFmt
|
|
900
900
|
else:
|
|
901
901
|
LCOLOR = COLORS_rich.get (ALevelNo)
|
|
@@ -1847,23 +1847,23 @@ def CreateLoggerFILEINI (AFileNameINI: str, ALogerName: str,
|
|
|
1847
1847
|
LDirectoryLOG = ADirectoryLOG
|
|
1848
1848
|
|
|
1849
1849
|
# читаем конфигурацию из файла INI
|
|
1850
|
-
LFileNameINI =
|
|
1851
|
-
if
|
|
1850
|
+
LFileNameINI = LUFile.ExpandFileName (AFileNameINI)
|
|
1851
|
+
if LUFile.FileExists (LFileNameINI):
|
|
1852
1852
|
# существует файл, который можно редактировать
|
|
1853
1853
|
SetEditINI = True
|
|
1854
1854
|
LPathINI = LUFile.ExtractFileDir (LFileNameINI)
|
|
1855
1855
|
LFileNameINI = os.path.join (LPathINI, LUFile.ExtractFileName (AFileNameINI))
|
|
1856
1856
|
else:
|
|
1857
|
-
LPathINI =
|
|
1858
|
-
LFileNameINI = os.path.join (LPathINI,
|
|
1857
|
+
LPathINI = LUos.GetCurrentDir ()
|
|
1858
|
+
LFileNameINI = os.path.join (LPathINI, LUFile.ExtractFileName (AFileNameINI))
|
|
1859
1859
|
# print ('LFileNameINI: ', LFileNameINI)
|
|
1860
|
-
if
|
|
1860
|
+
if LUFile.FileExists (LFileNameINI):
|
|
1861
1861
|
# существует файл в текущем каталоге, который можно редактировать
|
|
1862
1862
|
SetEditINI = True
|
|
1863
1863
|
else:
|
|
1864
1864
|
# берем имя файла из проекта, если оно есть
|
|
1865
|
-
LPathINI =
|
|
1866
|
-
LFileNameINI = os.path.join (LPathINI,
|
|
1865
|
+
LPathINI = LUFile.ExtractFileDir (__file__)
|
|
1866
|
+
LFileNameINI = os.path.join (LPathINI, LUFile.ExtractFileName (AFileNameINI))
|
|
1867
1867
|
SetEditINI = False
|
|
1868
1868
|
#endif
|
|
1869
1869
|
#endif
|
|
@@ -1925,15 +1925,15 @@ def CreateLoggerFILEINI (AFileNameINI: str, ALogerName: str,
|
|
|
1925
1925
|
LDirectoryLOG = LUos.GetCurrentDir ()
|
|
1926
1926
|
else:
|
|
1927
1927
|
# log будет создан в ADirectoryLOG
|
|
1928
|
-
LDirectoryLOG =
|
|
1928
|
+
LDirectoryLOG = LUFile.ExpandFileName (ADirectoryLOG)
|
|
1929
1929
|
#endif
|
|
1930
1930
|
# print('LDirectoryLOG:',LDirectoryLOG)
|
|
1931
|
-
if not
|
|
1931
|
+
if not LUFile.DirectoryExists (LDirectoryLOG):
|
|
1932
1932
|
lyr.LUFile.ForceDirectories(LDirectoryLOG)
|
|
1933
1933
|
#endif
|
|
1934
1934
|
|
|
1935
1935
|
print(LFileNameINI)
|
|
1936
|
-
logging.config.fileConfig (LFileNameINI, disable_existing_loggers=True, encoding=
|
|
1936
|
+
logging.config.fileConfig (LFileNameINI, disable_existing_loggers=True, encoding=LUFile.cDefaultEncoding)
|
|
1937
1937
|
# logging.config.fileConfig (LFileNameINI, disable_existing_loggers=True, encoding='cp1251')
|
|
1938
1938
|
|
|
1939
1939
|
# создаем регистратор
|
lyrpy/LUParserINI.py
CHANGED
|
@@ -27,12 +27,12 @@ import logging
|
|
|
27
27
|
#------------------------------------------
|
|
28
28
|
# БИБЛИОТЕКА LU
|
|
29
29
|
#------------------------------------------
|
|
30
|
-
import
|
|
31
|
-
import
|
|
32
|
-
import
|
|
33
|
-
import
|
|
34
|
-
import
|
|
35
|
-
import
|
|
30
|
+
import lyrpy.LULog as LULog
|
|
31
|
+
import lyrpy.LUConst as LUConst
|
|
32
|
+
import lyrpy.LUFile as LUFile
|
|
33
|
+
import lyrpy.LUos as LUos
|
|
34
|
+
import lyrpy.LUStrDecode as LUStrDecode
|
|
35
|
+
import lyrpy.LUStrUtils as LUStrUtils
|
|
36
36
|
|
|
37
37
|
class TINIFile (configparser.ConfigParser):
|
|
38
38
|
"""TINIFile"""
|
lyrpy/LUos.py
CHANGED
|
@@ -70,10 +70,10 @@ import psutil
|
|
|
70
70
|
# БИБЛИОТЕКИ LU
|
|
71
71
|
#------------------------------------------
|
|
72
72
|
if platform.system() == 'Windows':
|
|
73
|
-
import
|
|
73
|
+
import lyrpy.LUParserREG as LUParserREG
|
|
74
74
|
#endif
|
|
75
75
|
|
|
76
|
-
import
|
|
76
|
+
import lyrpy.LUDateTime as LUDateTime
|
|
77
77
|
|
|
78
78
|
#Correspondence to tools in the os module
|
|
79
79
|
#-----------------------------------------------------------------------------
|
|
@@ -1,19 +1,19 @@
|
|
|
1
|
-
lyrpy/LUConsole.py,sha256=
|
|
1
|
+
lyrpy/LUConsole.py,sha256=B7fFYJy5EdR_141gyFHdDeeyzxEM8rRlrc7XluX1ZcY,13854
|
|
2
2
|
lyrpy/LUConst.py,sha256=o1Mu1QmLOnW92zM_eix2iD0VR0LfiafXlflCrM9IWjI,1108
|
|
3
|
-
lyrpy/LUDateTime.py,sha256=
|
|
3
|
+
lyrpy/LUDateTime.py,sha256=E48Uedal6NLi_ijrpfQwSPg_tYlQlTWBOJ5PX34EEmE,6526
|
|
4
4
|
lyrpy/LUDecotators.py,sha256=HEqSchB1zPsdafQkS2MJYR-lsmOLnEN5q0bcsHK8qos,18997
|
|
5
5
|
lyrpy/LUDict.py,sha256=Cp330md6RFCxW-RmsotnDnLnkVLwCvHf28pZzvbTQco,3102
|
|
6
|
-
lyrpy/LUDoc.py,sha256=
|
|
6
|
+
lyrpy/LUDoc.py,sha256=HalQJBljH9a9PkHE36-pQApBlbh95gbIojCRW8irWqY,1669
|
|
7
7
|
lyrpy/LUErrors.py,sha256=Fdpxts1ADhhQYlS1hqm6JmfH4RDjxQU8uDiOC2ynADo,2117
|
|
8
|
-
lyrpy/LUFile.py,sha256=
|
|
8
|
+
lyrpy/LUFile.py,sha256=ZES2bbRu4NZMv94vPzGmdQmEcK34kyeLQ0vJDbj6zaw,48491
|
|
9
9
|
lyrpy/LUFileUtils.py,sha256=Ofl7jsMraAPn5h42R6t0IpulBwa5Oy8-hgY05ufsIbc,18915
|
|
10
|
-
lyrpy/LULog.py,sha256
|
|
10
|
+
lyrpy/LULog.py,sha256=-Xl4tW7KSTXc5zHSb17TpfYGa3NMUXjSi8uoxKarKoE,81453
|
|
11
11
|
lyrpy/LUNetwork.py,sha256=jNimFwK1fCZPY1rQOZaIeDdvDNyzv224yYBz40gtqGA,7641
|
|
12
12
|
lyrpy/LUNumUtils.py,sha256=BBEWny-h0N9Wji6zXhrnrhN99nBMQetq2xiqtbHgjSQ,6248
|
|
13
13
|
lyrpy/LUObjects.py,sha256=U5R6eZTocJcOfk0NoTuJVsTlQJcM2GtvF32Q55122Hg,5940
|
|
14
14
|
lyrpy/LUObjectsYT.py,sha256=pisRSbZoaHdFs6ocffL_hnfPSAkmRURaTdcvPTSX2IY,29161
|
|
15
15
|
lyrpy/LUParserARG.py,sha256=dbHRprV_A3YrpipcoWqlPnXr3oL85wEe7HaKpcn5XGE,14655
|
|
16
|
-
lyrpy/LUParserINI.py,sha256=
|
|
16
|
+
lyrpy/LUParserINI.py,sha256=VGT2yO1Omilx55i_XZegCvcqOYc7Mo79Yvek_N6c8Go,11018
|
|
17
17
|
lyrpy/LUParserREG.py,sha256=ItndOLblKxmsM08FnEo5lu3Mwx8dSJTI2e8_B_kzBQA,19443
|
|
18
18
|
lyrpy/LUProc.py,sha256=nhERQhm5a6aazZfttxXYHiyhiTRfMgS4JGSDy_jKzo4,3248
|
|
19
19
|
lyrpy/LUQThread.py,sha256=PDVXnsjxEopxz24DdiyjDEJfAzt0EiMUBt-E49n5GE0,4068
|
|
@@ -26,13 +26,13 @@ lyrpy/LUThread.py,sha256=jNxhDvZyMegnpHBUlRgZPIl_6Rvcyfw0TxI-MkWdssc,6072
|
|
|
26
26
|
lyrpy/LUTimer.py,sha256=HmZAmFT1tSEIl2D1yP-fNd1OsxF8OWX7-hCKWsE9bdc,4020
|
|
27
27
|
lyrpy/LUVersion.py,sha256=jxPJRWD7SnOcGfzFOkorcrKuRpvBnLrMFis9XznsCZ4,12254
|
|
28
28
|
lyrpy/LUYouTube.py,sha256=q3KzdnYxoWO1zlvntm9H6qRAgrkv0xDqLQNvMUgnq-o,6300
|
|
29
|
-
lyrpy/LUos.py,sha256
|
|
29
|
+
lyrpy/LUos.py,sha256=-Ern7YajLj5zsoGbhFp2yHJmD7XNppaCn79g0lODRPs,27522
|
|
30
30
|
lyrpy/LUsys.py,sha256=MVGkpR7O7Uj6zk10b5ZYfSnWWnBMVAXSgQb4EE61ObI,1103
|
|
31
31
|
lyrpy/__init__.py,sha256=i43cQTRz46fNZn1T1ZYpZDfxGLK8OYFzQNB7uaexn94,498
|
|
32
32
|
lyrpy/__main__.py,sha256=uHIH_TTuZ6PH1w4i5zHqVvWkGZHfll3zY9-TBlu-RJU,410
|
|
33
|
-
lyrpy-2024.0.
|
|
34
|
-
lyrpy-2024.0.
|
|
35
|
-
lyrpy-2024.0.
|
|
36
|
-
lyrpy-2024.0.
|
|
37
|
-
lyrpy-2024.0.
|
|
38
|
-
lyrpy-2024.0.
|
|
33
|
+
lyrpy-2024.0.4.data/data/data/text.txt,sha256=z85OKVJZHnmg3qFlSpLbpPCZ00irfBdrzQUtabiSl3A,14
|
|
34
|
+
lyrpy-2024.0.4.dist-info/LICENSE,sha256=hM4FdoGLL-HQV5eP3W5n52Gkben0U-a50qcOXR9_M60,1096
|
|
35
|
+
lyrpy-2024.0.4.dist-info/METADATA,sha256=l5APbJOraylawKPEr3GiYwEN01KziH1eYmZjGlOsxoc,2084
|
|
36
|
+
lyrpy-2024.0.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
|
|
37
|
+
lyrpy-2024.0.4.dist-info/top_level.txt,sha256=pkbK2q__sz9prekGgY89Mjm4AC7qJV5T_B4BPunv6d8,6
|
|
38
|
+
lyrpy-2024.0.4.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|