talklib 2.1.2__tar.gz → 2.1.4__tar.gz

{talklib-2.1.2/src/talklib.egg-info → talklib-2.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: talklib
-Version: 2.1.2
+Version: 2.1.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>
@@ -102,7 +102,7 @@ Requires-Dist: zipp==3.17.0
 
 ![tests](https://github.com/Nashville-Public-Library/talklib/actions/workflows/talklib.yml/badge.svg)
 [![GitHub issues](https://img.shields.io/github/issues/Nashville-Public-Library/talklib.png)](https://github.com/Nashville-Public-Library/talklib/issues)
-[![last-commit](https://img.shields.io/github/last-commit/Nashville-Public-Library/talklib)](https://github.com/Nashville-Public-Library/talklib/commits/master)
+[![last-commit](https://img.shields.io/github/last-commit/Nashville-Public-Library/talklib)](https://github.com/Nashville-Public-Library/talklib/commits/main)
 
 ## A package to automate processing TL shows/segments and podcasts
 
@@ -468,9 +468,17 @@ SD.run()
 
 ## TL Podcasts Usage
 
-`TLPod` is the main class to use.
+### Prerequisites
 
-Import the class to your script like this:
+Before starting to podcast a new show, you must log in to the server and create a directory. The directory should be named the same as the base name of the audio files for that show. For example, The Nashville Scene audio files are labelled as SceneMMDDYY. The directory name on the server should be `scene` in all lower-case.
+
+You must also add two files to this directory: an RSS Feed and and an image.
+
+The RSS feed should be named `feed.xml`. The image (the logo for the show) should be named `image.jpg`. You should update the template RSS feed file for each program. There are several default values such as Title that need to be changed. They are marked as such in the template.
+
+### Scripts
+
+`TLPod` is the main class to use. Import the class to your script like this:
 
 ````python
 from talklib import TLPod
@@ -490,23 +498,11 @@ from talklib import TLPod
 nyt = TLPod(
     display_name = "New York Times",
     filename_to_match = "nyt",
-    categories = ["News and Politics"]
 )
 nyt.run()
 ````
 
-To add multiple category tags, do this:
 
-````python
-from talklib import TLPod
-
-nyt = TLPod(
-    display_name = "New York Times",
-    filename_to_match = "nyt",
-    categories = ["News and Politics", "National News", "International News"]
-)
-nyt.run()
-````
 
 The default number of episodes allowed in a podcast feed at any given time is 5. To change that:
 
@@ -516,7 +512,6 @@ from talklib import TLPod
 nyt = TLPod(
     display_name = "New York Times",
     filename_to_match = "nyt",
-    categories = ["News and Politics"],
     max_episodes_in_feed = 7
 )
 nyt.run()

{talklib-2.1.2 → talklib-2.1.4}/README.md

@@ -2,7 +2,7 @@
 
 ![tests](https://github.com/Nashville-Public-Library/talklib/actions/workflows/talklib.yml/badge.svg)
 [![GitHub issues](https://img.shields.io/github/issues/Nashville-Public-Library/talklib.png)](https://github.com/Nashville-Public-Library/talklib/issues)
-[![last-commit](https://img.shields.io/github/last-commit/Nashville-Public-Library/talklib)](https://github.com/Nashville-Public-Library/talklib/commits/master)
+[![last-commit](https://img.shields.io/github/last-commit/Nashville-Public-Library/talklib)](https://github.com/Nashville-Public-Library/talklib/commits/main)
 
 ## A package to automate processing TL shows/segments and podcasts
 
@@ -368,9 +368,17 @@ SD.run()
 
 ## TL Podcasts Usage
 
-`TLPod` is the main class to use.
+### Prerequisites
 
-Import the class to your script like this:
+Before starting to podcast a new show, you must log in to the server and create a directory. The directory should be named the same as the base name of the audio files for that show. For example, The Nashville Scene audio files are labelled as SceneMMDDYY. The directory name on the server should be `scene` in all lower-case.
+
+You must also add two files to this directory: an RSS Feed and and an image.
+
+The RSS feed should be named `feed.xml`. The image (the logo for the show) should be named `image.jpg`. You should update the template RSS feed file for each program. There are several default values such as Title that need to be changed. They are marked as such in the template.
+
+### Scripts
+
+`TLPod` is the main class to use. Import the class to your script like this:
 
 ````python
 from talklib import TLPod
@@ -390,23 +398,11 @@ from talklib import TLPod
 nyt = TLPod(
     display_name = "New York Times",
     filename_to_match = "nyt",
-    categories = ["News and Politics"]
 )
 nyt.run()
 ````
 
-To add multiple category tags, do this:
 
-````python
-from talklib import TLPod
-
-nyt = TLPod(
-    display_name = "New York Times",
-    filename_to_match = "nyt",
-    categories = ["News and Politics", "National News", "International News"]
-)
-nyt.run()
-````
 
 The default number of episodes allowed in a podcast feed at any given time is 5. To change that:
 
@@ -416,7 +412,6 @@ from talklib import TLPod
 nyt = TLPod(
     display_name = "New York Times",
     filename_to_match = "nyt",
-    categories = ["News and Politics"],
     max_episodes_in_feed = 7
 )
 nyt.run()

{talklib-2.1.2 → talklib-2.1.4}/pyproject.toml

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

{talklib-2.1.2 → talklib-2.1.4}/src/talklib/pod.py

@@ -170,24 +170,47 @@ class Episode(BaseModel):
         self.notifications.prep_syslog(message=f"itunes:duration will be {result}")
         return result
     
-    def check_for_duplicate_episode(self, title: str):
+    def get_root_feed_file(self):
+        ET.register_namespace(prefix="atom", uri="http://www.w3.org/2005/Atom")
+        ET.register_namespace(prefix="itunes", uri="http://www.itunes.com/dtds/podcast-1.0.dtd")
+        feed = ET.parse(self.feed_file)
+        root = feed.getroot()
+        return root
+
+    
+    def check_for_duplicate_episode(self):
         self.notifications.prep_syslog(message="checking for duplicate episode...")
-        if title == self.episode_title:
-            self.cleanup_files_on_abort()
-            to_send = "Found episode with identical title already in feed. Aborting..."
-            self.notifications.send_notifications(message=to_send, subject="Error")
-            raise Exception (to_send)
+        root = self.get_root_feed_file()
+        channel = root.find("channel")
+        items = channel.findall("item")
+        for item in items:
+            item = item.find("title").text
+            if item == self.episode_title:
+                to_send = "Found episode with identical title already in feed. Aborting..."
+                self.notifications.send_notifications(message=to_send, subject="Error")
+                self.cleanup_files_on_abort()
+                raise Exception (to_send)
         self.notifications.prep_syslog(message="no duplicate episode found")
         return
     
     def cleanup_files_on_abort(self):
+        self.notifications.prep_syslog(message=f"Aborting automation, deleting local temp files...")
         files = glob.glob("*.mp3")
         for file in files:
-            self.notifications.prep_syslog(message=f"Aborting automation, deleting local temp files: {file}")
-            os.remove(file)
-        self.notifications.prep_syslog(message=f"Aborting automation, deleting local temp files: feed.xml")   
-        os.remove("feed.xml")
-        
+            self.notifications.prep_syslog(message=f"Attempting to delete: {file}")
+            try:
+                os.remove(file)
+                self.notifications.prep_syslog(message=f"Successfully deleted: {file}")
+            except:
+                self.notifications.prep_syslog(message=f"Unable to delete {file}")
+
+        self.notifications.prep_syslog(message=f"Attempting to delete: feed.xml")
+        try:          
+            os.remove("feed.xml")
+            self.notifications.prep_syslog(message=f"Successfully deleted: feed.xml")
+        except:
+            self.notifications.prep_syslog(message=f"Unable to delete:: feed.xml")
+
     def add_new_episode(self):
         '''Create an 'item' element. Then create all of the necessary sub elements and append them to the item element'''
         ET.register_namespace(prefix="atom", uri="http://www.w3.org/2005/Atom")
@@ -197,10 +220,7 @@ class Episode(BaseModel):
         root = root.find('channel')
 
         # if we have a new feed, or a feed with no episodes
-        try:
-            self.check_for_duplicate_episode(title=root.find("item").find("title").text)
-        except:
-            pass
+        self.check_for_duplicate_episode()
 
         self.notifications.prep_syslog(message="Building the new <item> element")
         item = ET.Element('item')
@@ -323,9 +343,10 @@ class TLPod(BaseModel):
     def get_filename_to_match(self) -> str:
         if self.override_filename:
             self.notifications.prep_syslog(message="filename override is turned ON")
-            return self.filename_to_match.lower()
+            file = (self.filename_to_match + ".wav").lower()
+            return file
         today_date: str = datetime.now().strftime("%m%d%y") # this is how we date our programs: MMDDYY
-        return (self.filename_to_match + today_date).lower()
+        return (self.filename_to_match + today_date + ".wav").lower()
 
     def match_file(self):
         '''match the name of the program that has today's date in the filename'''
@@ -335,8 +356,9 @@ class TLPod(BaseModel):
             self.notifications.prep_syslog(message=f"searching for {to_match} in {dest}...")
             files = glob.glob(f"{dest}/*.wav")
             for file in files:
-                if to_match in file.lower():
-                    self.notifications.prep_syslog(message="found matching file!")
+                basename = os.path.basename(file)
+                if to_match == basename.lower():
+                    self.notifications.prep_syslog(message=f"found matching file: {file}")
                     return file
         to_send = f"There was a problem podcasting {self.display_name}. Cannot find matched file {to_match} in {self.audio_folders}"
         self.notifications.send_notifications(message=to_send, subject='Error')

{talklib-2.1.2 → talklib-2.1.4/src/talklib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: talklib
-Version: 2.1.2
+Version: 2.1.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>
@@ -102,7 +102,7 @@ Requires-Dist: zipp==3.17.0
 
 ![tests](https://github.com/Nashville-Public-Library/talklib/actions/workflows/talklib.yml/badge.svg)
 [![GitHub issues](https://img.shields.io/github/issues/Nashville-Public-Library/talklib.png)](https://github.com/Nashville-Public-Library/talklib/issues)
-[![last-commit](https://img.shields.io/github/last-commit/Nashville-Public-Library/talklib)](https://github.com/Nashville-Public-Library/talklib/commits/master)
+[![last-commit](https://img.shields.io/github/last-commit/Nashville-Public-Library/talklib)](https://github.com/Nashville-Public-Library/talklib/commits/main)
 
 ## A package to automate processing TL shows/segments and podcasts
 
@@ -468,9 +468,17 @@ SD.run()
 
 ## TL Podcasts Usage
 
-`TLPod` is the main class to use.
+### Prerequisites
 
-Import the class to your script like this:
+Before starting to podcast a new show, you must log in to the server and create a directory. The directory should be named the same as the base name of the audio files for that show. For example, The Nashville Scene audio files are labelled as SceneMMDDYY. The directory name on the server should be `scene` in all lower-case.
+
+You must also add two files to this directory: an RSS Feed and and an image.
+
+The RSS feed should be named `feed.xml`. The image (the logo for the show) should be named `image.jpg`. You should update the template RSS feed file for each program. There are several default values such as Title that need to be changed. They are marked as such in the template.
+
+### Scripts
+
+`TLPod` is the main class to use. Import the class to your script like this:
 
 ````python
 from talklib import TLPod
@@ -490,23 +498,11 @@ from talklib import TLPod
 nyt = TLPod(
     display_name = "New York Times",
     filename_to_match = "nyt",
-    categories = ["News and Politics"]
 )
 nyt.run()
 ````
 
-To add multiple category tags, do this:
 
-````python
-from talklib import TLPod
-
-nyt = TLPod(
-    display_name = "New York Times",
-    filename_to_match = "nyt",
-    categories = ["News and Politics", "National News", "International News"]
-)
-nyt.run()
-````
 
 The default number of episodes allowed in a podcast feed at any given time is 5. To change that:
 
@@ -516,7 +512,6 @@ from talklib import TLPod
 nyt = TLPod(
     display_name = "New York Times",
     filename_to_match = "nyt",
-    categories = ["News and Politics"],
     max_episodes_in_feed = 7
 )
 nyt.run()