talklib 1.2.0__tar.gz → 1.2.2__tar.gz

{talklib-1.2.0/src/talklib.egg-info → talklib-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: talklib
-Version: 1.2.0
+Version: 1.2.2
 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>

{talklib-1.2.0 → talklib-1.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "talklib"
-version = "1.2.0"
+version = "1.2.2"
 description = "A package to automate processing of shows/segments airing on the TL"
 readme = "README.md"
 license = {file = "LICENSE.txt"}

{talklib-1.2.0 → talklib-1.2.2}/src/talklib/show.py

@@ -9,7 +9,7 @@ import requests
 
 from talklib.ev import EV
 from talklib.notify import Notify
-from talklib.utils import get_timestamp, clear_screen, print_to_screen_and_wait, today_is_weekday
+from talklib.utils import get_timestamp, clear_screen, raise_exception_and_wait, today_is_weekday
 from talklib.ffmpeg import FFMPEG
 
 
@@ -211,7 +211,7 @@ It looks like the file either wasn't converted or didn't transfer correctly. \
 Please check manually!\n\n\
 {get_timestamp()}")
                 self.__send_notifications(message=toSend, subject='Error')
-                print_to_screen_and_wait(message=toSend)
+                raise_exception_and_wait(message=toSend)
                 break
         if success:
             self.__countdown()
@@ -339,14 +339,18 @@ Is this a permalink show? Did you forget to set the is_permalink attribute?\n\n\
         (I can't figure out how else to get the name of the attribute)
         '''
         if  type(attrib_to_check) != type_to_check:
-            raise Exception (f"Sorry, '{attrib_return}' attribute must be type: {type_to_check}, but you used {type(attrib_to_check)}.")
+            message = f"Sorry, '{attrib_return}' attribute must be type: {type_to_check}, but you used {type(attrib_to_check)}."
+            self.__send_notifications(message=message, subject="Error")
+            raise_exception_and_wait(message=message)
 
     def __check_int_and_float_type(self, attrib_to_check, attrib_return: str):
         '''
         Attributes passed here can be either int or float.
         '''
         if not (type(attrib_to_check) == int or type(attrib_to_check) == float):
-            raise Exception (f'Sorry, the {attrib_return} attribute must be a valid number (without quotes).')
+            message = f'Sorry, the {attrib_return} attribute must be a valid number (without quotes).'
+            self.__send_notifications(message=message, subject="Error")
+            raise_exception_and_wait(message=message)
 
     def __check_attributes_are_valid(self):
         '''
@@ -356,24 +360,34 @@ Is this a permalink show? Did you forget to set the is_permalink attribute?\n\n\
         self.__prep_syslog(message='checking user defined attributes')
 
         if not self.show:
-            raise Exception ('Sorry, you need to specify a name for the show.')
+            message = 'Sorry, you need to specify a name for the show.'
+            self.__send_notifications(message=message, subject="Error")
+            raise_exception_and_wait(message=message)
         else:
             self.__check_str_and_bool_type(attrib_to_check=self.show, type_to_check=str, attrib_return='show')
 
         if not self.show_filename:
-            raise Exception ('Sorry, you need to specify a filename for the show.')
+            message = 'Sorry, you need to specify a filename for the show.'
+            self.__send_notifications(message=message, subject="Error")
+            raise_exception_and_wait(message=message)
         else:
             self.__check_str_and_bool_type(attrib_to_check=self.show_filename, type_to_check=str, attrib_return='show_filename')
 
         if not self.url:
             if not self.is_local:
-                raise Exception('Sorry, you need to specify either a URL or a local file')
+                message = 'Sorry, you need to specify either a URL or a local file'
+                self.__send_notifications(message=message, subject="Error")
+                raise_exception_and_wait('Sorry, you need to specify either a URL or a local file')
 
         if self.url and self.is_local:
-            raise Exception ('Sorry, you cannot specify both a URL and a local audio file. You must choose only one.')
+            message = 'Sorry, you cannot specify both a URL and a local audio file. You must choose only one.'
+            self.__send_notifications(message=message, subject="Error")
+            raise_exception_and_wait(message=message)
         
         if self.url and self.local_file:
-            raise Exception ('Sorry, you cannot specify both a URL and a local audio file. You must choose only one.')
+            message = 'Sorry, you cannot specify both a URL and a local audio file. You must choose only one.'
+            self.__send_notifications(message=message, subject="Error")
+            raise_exception_and_wait(message=message)
 
         if self.url:
             self.__check_str_and_bool_type(attrib_to_check=self.url, type_to_check=str, attrib_return='url')
@@ -433,7 +447,9 @@ Is this a permalink show? Did you forget to set the is_permalink attribute?\n\n\
             self.__run_local()
                    
         else:
-            raise Exception ('Sorry, something bad happened')
+            message = "Sorry, something bad happened..."
+            self.__send_notifications(message=message, subject="Error")
+            raise_exception_and_wait(message=message)
 
     def __run_URL_permalink(self):
         # if url is declared, it's either an RSS or permalink show
@@ -464,8 +480,7 @@ It looks like today's file hasn't yet been posted. Please check and download man
 {get_timestamp()}"
                 )
             self.__send_notifications(message=toSend, subject='Error')
-            print_to_screen_and_wait(message=toSend)
-            raise Exception
+            raise_exception_and_wait(message=toSend)
     
     def __run_local(self):
         if self.local_file:
@@ -482,5 +497,4 @@ It looks like the source file doesn't exist. Please check manually! Yesterday's
 {get_timestamp()}"
                 )
             self.__send_notifications(message=to_send, subject='Error')
-            print_to_screen_and_wait(message=to_send)
-            raise FileNotFoundError
+            raise_exception_and_wait(message=to_send, error=FileNotFoundError)

{talklib-1.2.0 → talklib-1.2.2}/src/talklib/utils.py

@@ -16,11 +16,12 @@ def clear_screen() -> None:
     else:
         os.system('clear')
 
-def print_to_screen_and_wait(message: str) -> None:
+def raise_exception_and_wait(message: str, error = Exception) -> None:
     '''clear terminal and print message to screen.'''
     clear_screen()
     print(f'{message}\n')  # get user's attention!
     input('(press enter to close this window)') # force user to acknowledge by closing window
+    raise error (message)
 
 def today_is_weekday() -> bool:
     '''crude mechanism for determining if today is a weekday.'''

{talklib-1.2.0 → talklib-1.2.2/src/talklib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: talklib
-Version: 1.2.0
+Version: 1.2.2
 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>