talklib 1.2.4__tar.gz → 1.3.0__tar.gz

{talklib-1.2.4/src/talklib.egg-info → talklib-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: talklib
-Version: 1.2.4
+Version: 1.3.0
 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.4 → talklib-1.3.0}/pyproject.toml

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

talklib-1.3.0/src/talklib/ev.py

@@ -0,0 +1,85 @@
+'''
+These are all of the environment variables we're calling from the PC.
+They'll be imported into the other files in this package.
+
+We're using the file so we have one central place from which
+to reference them.
+
+If you're installing the talklib module on a PC for the first time, 
+make sure all of these are declared in the PC's environment variables.
+
+If you need to change them, you probably want to change them at the PC level, not here.
+
+AUDIO DESTINATIONS:
+variable name: destinations
+variable value: a comma-separated list of destinations (network or local folders, etc),
+for wherever you want the final, processed audio files to end up. You can put a space
+after each comma, or not; either way will work.
+
+EMAIL:
+variable name: toEmail
+variable value: a comma-separated list of email addresses where you want
+notifications sent to. You can put a space after each comma, 
+or not; either way will work. You need at least one address; there is no
+maximum number of addresses. You can ONLY send emails to nashville.gov 
+addresses. However, if you send an email to nashvilletalkinglibrary@nashville.gov,
+that email will be forwarded to the TL Gmail account, which can then be 
+forwarded to any address. Metro ITS set up this relay server for us.
+
+TWILIO
+variable name: twilio_to
+variable value: a comma-separated list of phone numbers you want alerts/notifications
+sent to. This includes both SMS and phone calls. You can put a space after each comma, 
+or not; either way will work. You need at least one number; there is no maximum.
+The numbers should be formatted like this: +1xxxxxxxxxx with no spaces. That is, 
++1 followed by a ten-digit US phone number. An example variable value: 
++16158625804, +16158625800, +16158501020
+'''
+
+import os
+
+class EV:
+    def __init__(self):
+        self.destinations = sort_destinations() # where should output files go? MUST BE A LIST EVEN WITH ONLY ONE
+        self.syslog_host = os.environ["syslog_server"] # ip of syslog server (PC with syslog software)
+        self.fromEmail = os.environ['fromEmail']  # from where should emails appear to come?
+        self.toEmail = sort_to_email()  # to where should emails be sent?
+        self.mail_server = os.environ["mail_server_external"]  # IP of mail server (ITS set this up for us)
+        self.twilio_sid = os.environ['twilio_sid'] # locate by logging in to Twilio website
+        self.twilio_token = os.environ['twilio_token']# locate by logging in to Twilio website
+        self.twilio_from = os.environ['twilio_from'] # locate by logging in to Twilio website
+        self.twilio_to = sort_twilio_to() # to where should texts/calls be sent
+        self.icecast_user = os.environ['icecast_user'] # our icecast username
+        self.icecast_pass = os.environ['icecast_pass'] # our icecast password
+
+
+def sort_destinations():
+    destinations = os.environ['destinations']
+    destinations = destinations.split(",")
+    destination_list = []
+    for destination in destinations:
+        destination = destination.split() #remove whitespace
+        # the split() above returns a list, so we need to interate through it, even though it's only one string
+        for dest in destination:
+            destination_list.append(dest)
+    return destination_list
+
+def sort_to_email():
+    to_emails = os.environ['toEmail']
+    to_emails = to_emails.split(",")
+    to_email_list = []
+    for email in to_emails:
+        email = email.split()
+        for i in email:
+            to_email_list.append(i)
+    return to_email_list
+
+def sort_twilio_to():
+    twilio_to_numbers = os.environ['twilio_to']
+    twilio_to_numbers = twilio_to_numbers.split(",")
+    twilio_to_list = []
+    for number in twilio_to_numbers:
+        number = number.split()
+        for num in number:
+            twilio_to_list.append(num)
+    return twilio_to_list

{talklib-1.2.4 → talklib-1.3.0}/src/talklib/notify.py

@@ -61,37 +61,40 @@ class Notify:
         '''send voice call via twilio'''
         if not (self.twilio_enable and self.enable_all):
             return
-        client = Client(self.EV.twilio_sid, self.EV.twilio_token)
+        for number in self.EV.twilio_to:
+            client = Client(self.EV.twilio_sid, self.EV.twilio_token)
 
-        call = client.calls.create(
-                                twiml=f'<Response><Say>{message}</Say></Response>',
-                                to=self.EV.twilio_to,
-                                from_=self.EV.twilio_from
-                            )
-        call.sid
+            call = client.calls.create(
+                                    twiml=f'<Response><Say>{message}</Say></Response>',
+                                    to=number,
+                                    from_=self.EV.twilio_from
+                                )
+            call.sid
 
     def send_sms(self, message: str) -> None:
         '''send sms via twilio. '''
         if not (self.twilio_enable and self.enable_all):
             return
-        client = Client(self.EV.twilio_sid, self.EV.twilio_token)
-        SMS = client.messages.create(
-            body=message,
-            from_=self.EV.twilio_from,
-            to=self.EV.twilio_to
-        )
-        SMS.sid
+        for number in self.EV.twilio_to:
+            client = Client(self.EV.twilio_sid, self.EV.twilio_token)
+            SMS = client.messages.create(
+                body=message,
+                from_=self.EV.twilio_from,
+                to=number
+            )
+            SMS.sid
 
     def send_mail(self, message: str, subject: str) -> None:
         '''send email to TL gmail account via relay address'''
         if not (self.email_enable and self.enable_all):
             return
-        format = EmailMessage()
-        format.set_content(message)
-        format['Subject'] = subject
-        format['From'] = self.EV.fromEmail
-        format['To'] = self.EV.toEmail
+        for email in self.EV.toEmail:
+            format = EmailMessage()
+            format.set_content(message)
+            format['Subject'] = subject
+            format['From'] = self.EV.fromEmail
+            format['To'] = email
 
-        mail = smtplib.SMTP(host=self.EV.mail_server)
-        mail.send_message(format)
-        mail.quit()
+            mail = smtplib.SMTP(host=self.EV.mail_server)
+            mail.send_message(format)
+            mail.quit()

{talklib-1.2.4 → talklib-1.3.0/src/talklib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: talklib
-Version: 1.2.4
+Version: 1.3.0
 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.4/src/talklib/ev.py

@@ -1,28 +0,0 @@
-'''
-These are all of the environment variables we're calling from the PC.
-They'll be imported into the other files in this package.
-
-We're using the file so we have one central place from which
-to reference them.
-
-If you're installing the talklib module on a PC for the first time, 
-make sure all of these are declared in the PC's environment variables.
-
-If you need to change them, you probably want to change them at the PC level, not here.
-'''
-
-import os
-
-class EV:
-    def __init__(self):
-        self.destinations = [os.environ['OnAirPC'], os.environ['ProductionPC']]# where should output files go? MUST BE A LIST EVEN WITH ONLY ONE
-        self.syslog_host = os.environ["syslog_server"] # ip of syslog server (PC with syslog software)
-        self.fromEmail = os.environ['fromEmail']  # from where should emails appear to come?
-        self.toEmail = os.environ['toEmail']  # to where should emails be sent?
-        self.mail_server = os.environ["mail_server_external"]  # IP of mail server (ITS set this up for us)
-        self.twilio_sid = os.environ['twilio_sid'] # locate by logging in to Twilio website
-        self.twilio_token = os.environ['twilio_token']# locate by logging in to Twilio website
-        self.twilio_from = os.environ['twilio_from'] # locate by logging in to Twilio website
-        self.twilio_to = os.environ['twilio_to'] # to where should texts/calls be sent
-        self.icecast_user = os.environ['icecast_user'] # our icecast username
-        self.icecast_pass = os.environ['icecast_pass'] # our icecast password