talklib 3.2.2__tar.gz → 3.3.0__tar.gz

{talklib-3.2.2/src/talklib.egg-info → talklib-3.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: talklib
-Version: 3.2.2
+Version: 3.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>
@@ -600,5 +600,6 @@ nyt.run()
     ````
     - The tests can take a while to run. Watch the terminal output for progress.
     - If the tests fail, you may have installed something incorrectly. 
-    - You must be connected to the internet to run the tests
+    - You must be connected to the internet to run the tests.
+    - To update the version on PyPI, you must increment the version number in `pyproject.toml`
 

{talklib-3.2.2 → talklib-3.3.0}/README.md

@@ -499,5 +499,6 @@ nyt.run()
     ````
     - The tests can take a while to run. Watch the terminal output for progress.
     - If the tests fail, you may have installed something incorrectly. 
-    - You must be connected to the internet to run the tests
+    - You must be connected to the internet to run the tests.
+    - To update the version on PyPI, you must increment the version number in `pyproject.toml`
 

{talklib-3.2.2 → talklib-3.3.0}/pyproject.toml

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

{talklib-3.2.2 → talklib-3.3.0}/src/talklib/ev.py

@@ -41,21 +41,27 @@ 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.syslog_host = get_EV(ev="syslog_server") # ip of syslog server (PC with syslog software)
+        self.fromEmail = get_EV(ev="fromEmail") # from where should emails appear to come?
+        self.toEmail = sort_to_email() # to where should emails be sent?
+        self.mail_server = get_EV(ev="mail_server_external")  # IP of mail server (ITS set this up for us)
+        self.twilio_sid = get_EV(ev="twilio_sid") # locate by logging in to Twilio website
+        self.twilio_token = get_EV(ev="twilio_token") # locate by logging in to Twilio website
+        self.twilio_from = get_EV(ev="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
-        self.pod_server_uname = os.environ['pod_server_uname']
+        self.icecast_user = get_EV(ev="icecast_user") # our icecast username
+        self.icecast_pass = get_EV(ev="icecast_pass") # our icecast password
+        self.pod_server_uname = get_EV(ev="pod_server_uname")
 
+def get_EV(ev: str):
+    try:
+        ev = os.environ[ev]
+        return ev
+    except KeyError:
+        raise RuntimeError(f"Missing required environment variable: {ev}")
 
 def sort_destinations():
-    destinations = os.environ['destinations']
+    destinations = get_EV(ev="destinations")
     destinations = destinations.split(",")
     destination_list = []
     for destination in destinations:
@@ -66,7 +72,7 @@ def sort_destinations():
     return destination_list
 
 def sort_to_email():
-    to_emails = os.environ['toEmail']
+    to_emails = get_EV(ev="toEmail")
     to_emails = to_emails.split(",")
     to_email_list = []
     for email in to_emails:
@@ -76,7 +82,7 @@ def sort_to_email():
     return to_email_list
 
 def sort_twilio_to():
-    twilio_to_numbers = os.environ['twilio_to']
+    twilio_to_numbers = get_EV(ev="twilio_to")
     twilio_to_numbers = twilio_to_numbers.split(",")
     twilio_to_list = []
     for number in twilio_to_numbers:

{talklib-3.2.2 → talklib-3.3.0}/src/talklib/pod.py

@@ -52,6 +52,7 @@ class SSH(BaseModel):
     user: str = EV().pod_server_uname
     connection: Type[Connection] = Connection(host=server, user=user)
     notifications: Notifications = Notifications()
+    folder_exists: ClassVar[str] = False
 
     def upload_file(self, file: str, folder: str) -> None:
         self.check_folder_exists(folder=folder)
@@ -139,10 +140,13 @@ The error from the SSH library is: {e}"
         self.upload_file(file="feed.xml", folder=folder)
 
     def check_folder_exists(self, folder: str) -> bool:
+        if SSH.folder_exists:
+            return True
         self.notifications.prep_syslog(message=f"checking if {folder}/ exists on server...")
         folders = self.get_folders()
         if folder.lower() in folders:
             self.notifications.prep_syslog(message=f"{folder}/ exists on server!")
+            SSH.folder_exists = True
             return True
         
         to_send = f"cannot find folder titled: {folder}/ on server"
@@ -175,6 +179,12 @@ class Episode(BaseModel):
         self.notifications.prep_syslog(message=f"pubDate will be: {pub_date}")
         return pub_date
     
+    def copyright(self) -> str:
+        year: int = datetime.now().year
+        copyright: str = f"© 1975-{year} Nashville Talking Library - Do not copy or redistribute"
+        self.notifications.prep_syslog(message=f"copyright will be: {copyright}")
+        return copyright
+    
     def size_in_bytes(self, filename) -> str:
         size_in_bytes = os.path.getsize(filename)
         size_in_bytes = str(size_in_bytes)
@@ -182,7 +192,7 @@ class Episode(BaseModel):
         return size_in_bytes
     
     def enclosure(self) -> str:
-        enclosure = f"https://assets.library.nashville.org/talkinglibrary/shows/{self.bucket_folder}/{self.audio_filename}"
+        enclosure = f"https://dts.podtrac.com/redirect.mp3/assets.library.nashville.org/talkinglibrary/shows/{self.bucket_folder}/{self.audio_filename}"
         self.notifications.prep_syslog(message=f"enclosure will be {enclosure}")
         return enclosure
     
@@ -298,6 +308,9 @@ class Episode(BaseModel):
         last_build_date = root.find('lastBuildDate')
         last_build_date.text = self.pub_date() # fine to use this same pub date, as the format for both is the same
 
+        copyright = root.find("copyright")
+        copyright.text = self.copyright()
+
         ET.indent(feed) # makes the XML pretty looking
         self.notifications.prep_syslog(message=f"writing feed file...")
         feed.write(self.feed_file, encoding="utf-8", xml_declaration=True)

{talklib-3.2.2 → talklib-3.3.0/src/talklib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: talklib
-Version: 3.2.2
+Version: 3.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>
@@ -600,5 +600,6 @@ nyt.run()
     ````
     - The tests can take a while to run. Watch the terminal output for progress.
     - If the tests fail, you may have installed something incorrectly. 
-    - You must be connected to the internet to run the tests
+    - You must be connected to the internet to run the tests.
+    - To update the version on PyPI, you must increment the version number in `pyproject.toml`