talklib 2.1.2__tar.gz → 2.1.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: talklib
-Version: 2.1.2
+Version: 2.1.3
 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-2.1.2 → talklib-2.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "talklib"
-version = "2.1.2"
+version = "2.1.3"
 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.3}/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.3/src/talklib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: talklib
-Version: 2.1.2
+Version: 2.1.3
 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>