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

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

@@ -27,7 +27,7 @@ import enum
 #------------------------------------------
 # БИБЛИОТЕКИ LU
 #------------------------------------------
-import lyr.LULog as LULog
+import lyrpy.LULog as LULog
 
 # ===========================================================================
 # type
@@ -67,7 +67,7 @@ class TObjects (object):
         """ destructor """
     #beginfunction
         LClassName = self.__class__.__name__  
-        s = '{} уничтожен'.format (LClassName)
+        # s = '{} уничтожен'.format (LClassName)
         # LULog.LoggerTOOLS_AddLevel (LULog.DEBUGTEXT, s)
         #print (s)
     #endfunction
@@ -131,7 +131,7 @@ class TObjectsItem (object):
         # удалить объект
         del self.__FObjects
         LClassName = self.__class__.__name__
-        s = '{} уничтожен'.format (LClassName)
+        # s = '{} уничтожен'.format (LClassName)
         # LULog.LoggerTOOLS_AddLevel (LULog.DEBUGTEXT, s)
 
     #--------------------------------------------------
@@ -171,7 +171,7 @@ class TObjectsCollection (list):
         """ destructor """
         self.clear()            # удалить все items
         LClassName = self.__class__.__name__
-        s = '{} уничтожен'.format (LClassName)
+        # s = '{} уничтожен'.format (LClassName)
         # LULog.LoggerTOOLS_AddLevel (LULog.DEBUGTEXT, s)
 
     def AddItem(self) -> TObjectsItem:

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

@@ -30,20 +30,19 @@ from typing import BinaryIO
 #------------------------------------------
 from urllib.parse import urlparse
 
-from pytube import YouTube, request
-from pytube import Playlist
+from pytube import YouTube, request, Playlist, Stream
 import pytube
 import pytube.exceptions
 
 #------------------------------------------
 # БИБЛИОТЕКИ LU
 #------------------------------------------
-import lyr.LULog as LULog
-import lyr.LUObjects as LUObjects
-import lyr.LUFile as LUFile
-import lyr.LUStrUtils as LUStrUtils
-import lyr.LUThread as LUThread
-import lyr.LUDateTime as LUDateTime
+import lyrpy.LULog as LULog
+import lyrpy.LUObjects as LUObjects
+import lyrpy.LUFile as LUFile
+import lyrpy.LUStrUtils as LUStrUtils
+import lyrpy.LUThread as LUThread
+import lyrpy.LUDateTime as LUDateTime
 
 CYOUTUBE_COM = 'WWW.YOUTUBE.COM'
 CYOUTUBE_BE = 'YOUTU.BE'
@@ -107,7 +106,7 @@ class TYouTubeObject (LUObjects.TObjects):
         """Constructor"""
     #beginfunction
         super ().__init__ ()
-        self.__FObjectType: TObjectTypeClass = TObjectTypeClass.otYouTubeObject
+        self.__FObjectType: LUObjects.TObjectTypeClass = LUObjects.TObjectTypeClass.otYouTubeObject
         #----------------------------------------------
         self.__FYouTube: YouTube = None
         self.__FStream: pytube.Stream = None
@@ -198,7 +197,8 @@ class TYouTubeObject (LUObjects.TObjects):
     #     prog.update (task, completed = stream.filesize - bytes_remaining)
     #     #this show the bytes_remaining, use rich to display a progress bar
     #--------------------------------------------------
-    def ONprogressObject (self, AStream: pytube.Stream, AChunk: bytes, Abytes_remaining: int):
+    # def ONprogressObject (self, AStream: pytube.Stream, AChunk: bytes, Abytes_remaining: int):
+    def ONprogressObject (self, AStream: Stream, AChunk: bytes, Abytes_remaining: int):
     #beginfunction
         s = 'TYouTubeObject.ONprogressObject...'
         LULog.LoggerTOOLS_AddDebug (s)
@@ -222,7 +222,8 @@ class TYouTubeObject (LUObjects.TObjects):
     #     prog.stop ()
     #     print ('[green] Downloaded ', file_path.split ('/') [-1], '\n')
     #--------------------------------------------------
-    def ONcompleteObject (self, AStream: pytube.Stream, AFilePath: str):
+    # def ONcompleteObject (self, AStream: pytube.Stream, AFilePath: str):
+    def ONcompleteObject (self, AStream: Stream, AFilePath: str):
     #beginfunction
         s = 'TYouTubeObject.ONcompleteObject...'
         LULog.LoggerTOOLS_AddDebug (s)
@@ -242,21 +243,25 @@ class TYouTubeObject (LUObjects.TObjects):
     #endfunction
 
     @staticmethod
-    def GetURLInfo (AYouTube: YouTube) -> {}:
-        """__GetURLInfo"""
+    def GetURLInfo (AYouTube) -> {}:
+        """GetURLInfo"""
     #beginfunction
+        print (f'{AYouTube=}')
+
         LURLInfo = dict ()
+
         #Get the video author.
-        LURLInfo['author'] = AYouTube.author
+        LURLInfo['author'] = 'AYouTube.author'
         #Get the video description.
-        LURLInfo['description'] = AYouTube.description
+        LURLInfo['description'] = 'AYouTube.description'
         #Get the thumbnail url image.
-        LURLInfo['thumbnail_url'] = AYouTube.thumbnail_url
+        LURLInfo['thumbnail_url'] = 'AYouTube.thumbnail_url'
         # Заголовок [Get the video title]
-        s = AYouTube.title
-        LURLInfo['title'] = LUStrUtils.PrintableStr(s)
+        # s = AYouTube.title
+        LURLInfo['title'] = 'LUStrUtils.PrintableStr(s)'
         # продолжительность видео [Get the video length in seconds]
-        LURLInfo['length'] = AYouTube.length
+        LURLInfo['length'] = 'AYouTube.length'
+        LURLInfo['length'] = 0
 
         # #Get a list of Caption.
         # LURLInfo['caption_tracks'] = AYouTube.caption_tracks
@@ -290,11 +295,13 @@ class TYouTubeObject (LUObjects.TObjects):
     def __SetURLInfo (self):
         """__SetURLInfo"""
     #beginfunction
+        print ("""__SetURLInfo""")
         self.__FURLInfo = self.GetURLInfo (self.__FYouTube)
     #endfunction
 
     @staticmethod
-    def GetStreamInfo (AStream: pytube.Stream) -> {}:
+    # def GetStreamInfo (AStream: pytube.Stream) -> {}:
+    def GetStreamInfo (AStream: Stream) -> {}:
         """GetStreamInfo"""
     #beginfunction
         LStreamInfo = dict ()
@@ -339,7 +346,8 @@ class TYouTubeObject (LUObjects.TObjects):
         return LStreamInfo
     #endfunction
 
-    def __SetStreamInfo (self, AStream: pytube.Stream):
+    # def __SetStreamInfo (self, AStream: pytube.Stream):
+    def __SetStreamInfo (self, AStream: Stream):
         """SetStreamInfo"""
     #beginfunction
         self.__FStreamInfo = self.GetStreamInfo(AStream)
@@ -394,9 +402,18 @@ class TYouTubeObject (LUObjects.TObjects):
     def SetURL(self, AURL: str, AMaxRes: (), APlayList: str, ANumber: int, ACount: int):
     #beginfunction
         self.__FURL = AURL
+
+        print(f'{AURL=}')
+        print(f'{APlayList=}')
+        print(f'{ANumber=}')
+        print(f'{ACount=}')
+
         self.__FYouTube: YouTube = YouTube(AURL)
+        # self.__FYouTube = Playlist(AURL)
         # self.SetStream(AMaxRes)
+        
         self.__SetURLInfo()
+        
         self.PlayList = APlayList
         self.Number = ANumber
         self.Count = ACount
@@ -609,7 +626,7 @@ class TYouTubeObject (LUObjects.TObjects):
     #endfunction
 
     def __DownloadURL_chunk (self, APATH: str, AFileName:str, AFileSize: int):
-        """DownloadURL_chunk"""
+        """__DownloadURL_chunk"""
     #beginfunction
         self.FFileNamechunk = AFileName
         LFileSize = AFileSize

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

@@ -19,7 +19,6 @@ __annotations__ = """
 #------------------------------------------
 import sys
 import argparse
-import logging
 
 # re - Regular expression operations
 import re
@@ -31,7 +30,7 @@ import re
 #------------------------------------------
 # БИБЛИОТЕКА LU
 #------------------------------------------
-import lyr.LULog as LULog
+import lyrpy.LULog as LULog
 
 #------------------------------------------
 # Разбор аргументов
@@ -340,7 +339,7 @@ def CreateTArgParser (AProg: str, ADescrption: str) -> TArgParser:
     LResult = TArgParser (prog = AProg, description=ADescrption, prefix_chars='-/',
                           usage = None, epilog = None, parents = [], formatter_class = argparse.HelpFormatter,
                           fromfile_prefix_chars = None, argument_default = None,
-                          conflict_handler = 'error', add_help = True, allow_abbrev = True, exit_on_error = True)
+                          conflict_handler = 'error', add_help = True)
     return LResult
 #endfunction
 

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

@@ -60,6 +60,7 @@ class TINIFile (configparser.ConfigParser):
     def __GetINIFileName (AFileName: str) -> str:
         """__GetINIFileName"""
     #beginfunction
+        LResult = ''
         P = LUFile.ExtractFileDir (AFileName)
         F = LUFile.ExtractFileName (AFileName)
         E = LUFile.ExtractFileExt (AFileName)
@@ -68,8 +69,12 @@ class TINIFile (configparser.ConfigParser):
         #endif
         if P == '':
             LWinDir = LUos.GetEnvVar (LUos.cWINDIR)
-            APath = LUos.GetCurrentDir () + ';' + LWinDir
-            LResult = LUFile.FileSearch (F, APath)
+            LPath = [LUos.GetCurrentDir (), LWinDir]
+
+            LList = LUFile.SearchFileDirs (LPath, F, '', '', False)
+            if len(LList) > 0:
+                LResult = LList[0]
+            #endif
             if LResult == '':
                 LResult = LUFile.IncludeTrailingBackslash (LWinDir) + F
             #endif
@@ -97,7 +102,7 @@ class TINIFile (configparser.ConfigParser):
         """destructor"""
     #beginfunction
         LClassName = self.__class__.__name__
-        s = '{} уничтожен'.format (LClassName)
+        # s = '{} уничтожен'.format (LClassName)
         # LULog.LoggerTOOLS_AddLevel (LULog.DEBUGTEXT, s)
         #print (s)
     #endfunction

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

@@ -17,8 +17,12 @@ __annotations__ = """
 #------------------------------------------
 # БИБЛИОТЕКИ python
 #------------------------------------------
-import winreg
 import enum
+import platform
+
+if platform.system() == 'Windows':
+    import winreg
+#endif
 
 #------------------------------------------
 # БИБЛИОТЕКИ сторонние

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

@@ -14,6 +14,8 @@ __annotations__ = """
  =======================================================
 """
 
+import logging
+
 #------------------------------------------
 # БИБЛИОТЕКИ python
 #------------------------------------------
@@ -28,7 +30,7 @@ from PySide6.QtCore import QObject, QThread, Signal, Slot
 #------------------------------------------
 # БИБЛИОТЕКА LU
 #------------------------------------------
-import lyr.LULog as LULog
+import lyrpy.LULog as LULog
 
 # Signals must inherit QObject
 class MySignals(QObject):
@@ -67,7 +69,7 @@ class TQThread (QThread):
         """destructor"""
     #beginfunction
         LClassName = self.__class__.__name__
-        s = '{} уничтожен'.format (LClassName)
+        # s = '{} уничтожен'.format (LClassName)
         # LULog.LoggerTOOLS_AddLevel (LULog.DEBUGTEXT, s)
         #print (s)
     #endfunction
@@ -90,7 +92,7 @@ class TQThread (QThread):
     #beginfunction
         super ().run()
         s = 'run - Запуск потока...'
-        LULog.LoggerTOOLS_AddDebug (s)
+        LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
 
         # Do something on the worker thread
         a = 1 + 1
@@ -99,7 +101,7 @@ class TQThread (QThread):
         self.signals.signal_str.emit ("This text comes to Main thread from our Worker thread.")
 
         while not self.__FStopThread:
-            s = 'Выполнение потока...'
+            # s = 'Выполнение потока...'
             # LULog.LoggerTOOLS_AddDebug (s)
             Lval = psutil.cpu_percent ()
             self.emit(QtCore.SIGNAL('CPU_VALUE'), Lval)

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

@@ -35,7 +35,7 @@ from PySide6.QtWidgets import (
 #------------------------------------------
 # БИБЛИОТЕКА LU
 #------------------------------------------
-import lyr.LULog as LULog
+import lyrpy.LULog as LULog
 
 # blocking.py
 def wait(milliseconds, /):
@@ -88,7 +88,7 @@ class TQTimer (QTimer):
         """destructor"""
     #beginfunction
         LClassName = self.__class__.__name__
-        s = '{} уничтожен'.format (LClassName)
+        # s = '{} уничтожен'.format (LClassName)
         # LULog.LoggerTOOLS_AddLevel (LULog.DEBUGTEXT, s)
         #print (s)
     #endfunction
@@ -110,7 +110,7 @@ class TQTimer (QTimer):
         """start - Запуск таймера..."""
     #beginfunction
         s = 'Запуск таймера '+self.FQTimerName+'...'
-        LULog.LoggerTOOLS_AddLevel (LULog.DEBUGTEXT, s)
+        LULog.LoggerAdd (LULog.LoggerTOOLS, LULog.DEBUGTEXT, s)
         super ().start ()
         self.__Fidle = True
     #endfunction
@@ -122,7 +122,7 @@ class TQTimer (QTimer):
         """stop - Остановить таймер..."""
     #beginfunction
         s = 'Остановка таймера '+self.FQTimerName+'...'
-        LULog.LoggerTOOLS_AddLevel (LULog.DEBUGTEXT, s)
+        LULog.LoggerAdd (LULog.LoggerTOOLS, LULog.DEBUGTEXT, s)
         super ().stop ()
     #endfunction
 
@@ -133,7 +133,7 @@ class TQTimer (QTimer):
     def __run_TEST(self):
         """__run_TEST..."""
     #beginfunction
-        s = '__run_TEST...'
+        # s = '__run_TEST...'
         # LULog.LoggerTOOLS_AddDebug (s)
 
         # Do something on the worker thread

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

@@ -20,6 +20,7 @@ __annotations__ = """
 import datetime
 from calendar import monthrange
 import threading
+import logging
 
 #------------------------------------------
 # БИБЛИОТЕКИ сторонние
@@ -28,9 +29,9 @@ import threading
 #------------------------------------------
 # БИБЛИОТЕКИ LU
 #------------------------------------------
-import lyr.LULog as LULog
-import lyr.LUStrUtils as LUStrUtils
-import lyr.LUDateTime as LUDateTime
+import lyrpy.LULog as LULog
+import lyrpy.LUStrUtils as LUStrUtils
+import lyrpy.LUDateTime as LUDateTime
 
 minNN = 0
 maxNN = 59
@@ -115,7 +116,7 @@ class TShedulerEventItem (object):
         # удалить объект
         del self.__FList
         LClassName = self.__class__.__name__
-        s = '{} уничтожен'.format (LClassName)
+        # s = '{} уничтожен'.format (LClassName)
         # LUConst.LULogger.log (LULog.DEBUGTEXT, s)
         #print (s)
     #endfunction
@@ -452,7 +453,7 @@ class TSheduler (object):
         del self.__FShedulerEvents
         del self.__FNameEvents
         LClassName = self.__class__.__name__
-        s = '{} уничтожен'.format(LClassName)
+        # s = '{} уничтожен'.format(LClassName)
         # LUConst.LULogger.log (LULog.DEBUGTEXT, s)
     #endfunction
 
@@ -560,7 +561,7 @@ class TSheduler (object):
     def run_Function(self):
         """__run_Function"""
     #beginfunction
-        s = '__run_Function...'
+        # s = '__run_Function...'
         # LULog.LoggerTOOLS_AddDebug (s)
         if self.__FEnable:
             LPresentNow = LUDateTime.Now ()
@@ -652,14 +653,14 @@ class TSheduler (object):
         #endif
         s = 'Следующий сеанс: ' + str (self.__FDTEvents)
         if APrint:
-            LULog.LoggerTOOLS_AddDebug (s)
+            LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
         #endif
     #endfunction
     
     def __Second (self):
         """Second"""
     #beginfunction
-        s = 'Second...'
+        # s = 'Second...'
         # LULog.LoggerTOOLS_AddDebug (s)
         if self.__FEnable:
             LPresent: datetime = LUDateTime.Now()
@@ -729,17 +730,17 @@ class TSheduler (object):
     def PrintEvent (AEvent: TShedulerEventItem):
         """PrintEvent"""
     #beginfunction
-        LULog.LoggerTOOLS_AddDebug (AEvent.NameEvent)
+        LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, AEvent.NameEvent)
         s = f'NN={AEvent.GetXXString ("NN")}'
-        LULog.LoggerTOOLS_AddDebug (s)
+        LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
         s = f'HH={AEvent.GetXXString ("HH")}'
-        LULog.LoggerTOOLS_AddDebug (s)
+        LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
         s = f'DD={AEvent.GetXXString ("DD")}'
-        LULog.LoggerTOOLS_AddDebug (s)
+        LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
         s = f'MM={AEvent.GetXXString ("MM")}'
-        LULog.LoggerTOOLS_AddDebug (s)
+        LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
         s = f'DW={AEvent.GetXXString ("DW")}'
-        LULog.LoggerTOOLS_AddDebug (s)
+        LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
     #endfunction
 #endclass
 
@@ -771,7 +772,7 @@ class TShedulerThread (threading.Thread):
         """destructor"""
     #beginfunction
         LClassName = self.__class__.__name__
-        s = '{} уничтожен'.format(LClassName)
+        # s = '{} уничтожен'.format(LClassName)
         # LUConst.LULogger.log (LULog.DEBUGTEXT, s)
     #endfunction
 
@@ -793,11 +794,11 @@ class TShedulerThread (threading.Thread):
         """run - Запуск потока TSheduler"""
     #beginfunction
         s = 'run - Запуск потока TSheduler...'
-        LULog.LoggerTOOLS_AddDebug (s)
+        LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
         super ().run()
 
         if self.__FSheduler.DTEvents == 0:
-            self.__FSheduler.CreateNextEvent ()
+            self.__FSheduler.CreateNextEvent (False)
         #endif
         while not self.__FStopThread:
             self.__FSheduler.run_Function ()
@@ -812,7 +813,7 @@ class TShedulerThread (threading.Thread):
         """StartSheduler"""
     #beginfunction
         s = 'StartSheduler...'
-        LULog.LoggerTOOLS_AddDebug (s)
+        LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
         self.__FStopThread = False
         self.__FSheduler.Enable = True
         # self.__CreateNextEvent ()
@@ -825,7 +826,7 @@ class TShedulerThread (threading.Thread):
         """StopSheduler"""
     #beginfunction
         s = 'StopSheduler...'
-        LULog.LoggerTOOLS_AddDebug (s)
+        LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
         self.__FStopThread = True
         self.__FSheduler.Enable = False
     #endfunction
@@ -862,7 +863,7 @@ class TShedulerTimer (threading.Timer):
         """destructor"""
     #beginfunction
         LClassName = self.__class__.__name__
-        s = '{} уничтожен'.format (LClassName)
+        # s = '{} уничтожен'.format (LClassName)
         # LUConst.LULogger.log (LULog.DEBUGTEXT, s)
     #endfunction
 
@@ -883,7 +884,7 @@ class TShedulerTimer (threading.Timer):
         """run - Запуск таймера TShedulerTimer"""
         #beginfunction
         s = 'run - Запуск таймера TShedulerTimer...'
-        LULog.LoggerTOOLS_AddDebug (s)
+        LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
 
         if self.__FSheduler.DTEvents == 0:
             self.__FSheduler.CreateNextEvent (True)
@@ -901,7 +902,7 @@ class TShedulerTimer (threading.Timer):
         """StartSheduler"""
     #beginfunction
         s = 'StartSheduler...'
-        LULog.LoggerTOOLS_AddDebug (s)
+        LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
         self.__FStopThread = False
         self.__FSheduler.Enable = True
         # self.__CreateNextEvent (True)
@@ -914,7 +915,7 @@ class TShedulerTimer (threading.Timer):
         """StopSheduler"""
     #beginfunction
         s = 'StopSheduler...'
-        LULog.LoggerTOOLS_AddDebug (s)
+        LULog.LoggerAdd (LULog.LoggerTOOLS, logging.DEBUG, s)
         self.__FStopThread = True
         self.__FSheduler.Enable = False
     #endfunction