talklib 3.7.2__tar.gz → 3.7.4__tar.gz

{talklib-3.7.2/src/talklib.egg-info → talklib-3.7.4}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: talklib
-Version: 3.7.2
+Version: 3.7.4
 Summary: A package to automate processing of shows/segments airing on the TL
 Author-email: Ben Weddle <ben.weddle@gmail.com>
 Maintainer-email: Ben Weddle <ben.weddle@gmail.com>
 License-Expression: MIT-open-group
 Project-URL: Repository, https://github.com/talkinglibrary/talklib
 Project-URL: Issues, https://github.com/talkinglibrary/talklib/issues
-Requires-Python: >=3.10
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: aiohappyeyeballs==2.6.1

{talklib-3.7.2 → talklib-3.7.4}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "talklib"
-version = "3.7.2"
+version = "3.7.4"
 description = "A package to automate processing of shows/segments airing on the TL"
 readme = "README.md"
 license = "MIT-open-group"
 license-files = ["LICENSE.txt"]
 authors = [{name = "Ben Weddle", email = "ben.weddle@gmail.com"}]
 maintainers = [{name = "Ben Weddle", email = "ben.weddle@gmail.com"}]
-requires-python = ">=3.10"
+requires-python = ">=3.12"
 dynamic = ["dependencies"]
 [tool.setuptools.dynamic]
 dependencies = {file = ["requirements.txt"]}

{talklib-3.7.2 → talklib-3.7.4}/src/talklib/show.py

@@ -75,7 +75,7 @@ class TLShow(BaseModel):
         self.__prep_syslog(message=f'FFmpeg commands: {ffmpeg_commands}')
         try:
             file = ffmpeg.convert()
-            self.__prep_syslog(message='file converted successfully')
+            self.__prep_syslog(message=f"file converted successfully, named: {file}")
             return file
         except ffmpeg_error as e:
             error: str = e.stderr.decode('utf-8')
@@ -158,7 +158,7 @@ class TLShow(BaseModel):
                 downloaded_file.write(a.content)
                 downloaded_file.close()
             
-            self.__prep_syslog(message=f'File downloaded successfully in {os.getcwd()}.')
+            self.__prep_syslog(message=f'File downloaded: {os.getcwd()}/{input_file}')
             return downloaded_file.name
         except Exception as e:
             to_send: str = f"Unable to download the file from: {download_URL}: {e}. Exiting automation!"
@@ -224,22 +224,17 @@ It looks like the downloaded file is empty. Please check manually! Yesterday's f
     def __check_file_transferred(self, fileToCheck):
         '''check if file transferred to destination(s)'''
         numberOfDestinations = len(self.destinations) - 1
-        success = False
         while numberOfDestinations >= 0:
             if os.path.isfile(f'{self.destinations[numberOfDestinations]}/{fileToCheck}'):
                 numberOfDestinations = numberOfDestinations-1
                 self.__prep_syslog(message=f'{fileToCheck} arrived at {self.destinations[numberOfDestinations]}')
-                success = True
             else:
                 toSend = (f"There was a problem with {self.show}.\n\n\
-It looks like the file either wasn't converted or didn't transfer correctly. \
+It looks like the file either wasn't converted or didn't transfer correctly to {self.destinations[numberOfDestinations]}. \
 Please check manually!\n\n\
 {get_timestamp()}")
                 self.__send_notifications(message=toSend, subject='Error')
                 raise FileNotFoundError (toSend)
-            
-        if success:
-            self.__countdown()
 
     def __check_length(self, fileToCheck):
         '''
@@ -343,26 +338,12 @@ There is no 'enclosure' tag for the item. Here's the error: {AE}\n\n{get_timesta
                 count = count+1
         return feed_updated
 
-    def __countdown(self):
-        '''
-        the reason for this is to give a visual cue to the user
-        that the script has finished and is about to exit.
-        Otherwise, the user does not know what happened; they
-        just see the screen disappear.
-        '''
-        clear_screen()
-        to_send = 'All Done.'
-        self.__prep_syslog(message=to_send)
-        print(f'{to_send}\n')
-        number = 5
-        i = 0
-        while i < number:
-            print(f'This window will close in {number} seconds...', end='\r')
-            number = number-1
-            time.sleep(1)
+    def __all_done_syslog(self):
+        self.__prep_syslog(message="Automation finished successfully! Exiting...")
 
     def check_ffmpeg_installed(self):
         ffmpeg = shutil.which("ffmpeg")
+        self.__prep_syslog(message=f"FFmpeg is installed: {ffmpeg}")
         if not ffmpeg:
             to_send: str = f"It looks like FFmpeg is either not installed on this computer ({socket.gethostname()}), \
 or it isn't added to the PATH. You cannot use the talklib package without FFmpeg."
@@ -406,6 +387,7 @@ or it isn't added to the PATH. You cannot use the talklib package without FFmpeg
             self.__remove(fileToDelete=downloaded_file)
             self.__copy_then_remove(fileToCopy=output_file)
             self.__check_file_transferred(fileToCheck=output_file)
+            self.__all_done_syslog()
 
     def __run_URL_RSS(self):
         if self.__check_feed_loop():
@@ -417,6 +399,7 @@ or it isn't added to the PATH. You cannot use the talklib package without FFmpeg
             self.__remove(fileToDelete=downloaded_file)
             self.__copy_then_remove(fileToCopy=output_file)
             self.__check_file_transferred(fileToCheck=output_file)
+            self.__all_done_syslog()
         else:
             toSend = (
 f"There was a problem with {self.show}.\n\n\
@@ -434,6 +417,7 @@ It looks like today's file hasn't yet been posted. Please check and download man
             self.__remove(fileToDelete=self.local_file)
             self.__copy_then_remove(fileToCopy=output_file)
             self.__check_file_transferred(fileToCheck=output_file)
+            self.__all_done_syslog()
         else:
             to_send = (
 f"There was a problem with {self.show}.\n\n\

{talklib-3.7.2 → talklib-3.7.4/src/talklib.egg-info}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: talklib
-Version: 3.7.2
+Version: 3.7.4
 Summary: A package to automate processing of shows/segments airing on the TL
 Author-email: Ben Weddle <ben.weddle@gmail.com>
 Maintainer-email: Ben Weddle <ben.weddle@gmail.com>
 License-Expression: MIT-open-group
 Project-URL: Repository, https://github.com/talkinglibrary/talklib
 Project-URL: Issues, https://github.com/talkinglibrary/talklib/issues
-Requires-Python: >=3.10
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: aiohappyeyeballs==2.6.1