talklib 2.1.5__tar.gz → 2.2.0__tar.gz

{talklib-2.1.5/src/talklib.egg-info → talklib-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: talklib
-Version: 2.1.5
+Version: 2.2.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>
@@ -106,6 +106,8 @@ Requires-Dist: zipp==3.17.0
 
 ## A package to automate processing TL shows/segments and podcasts
 
+[talklib on PyPI](https://pypi.org/project/talklib/)
+
 [Skip to Examples](#examples)
 
 *THIS README IS INTENDED TO ASSIST TL STAFF IN INSTALLING AND USING THIS PACKAGE*
@@ -130,7 +132,7 @@ Use Python 3.10 or higher.
 Make sure to select "add to PATH" during installation.
 
 ### -[FFmpeg](https://www.ffmpeg.org/download.html#build-windows)
-You need Windows binaries for both FFmpeg & FFprobe installed on the PC and added to the PATH:
+You need both FFmpeg & FFprobe installed on the PC and added to the PATH:
 
 To repeat, **this package will not work without FFmpeg and FFprobe**. 
 
@@ -139,6 +141,8 @@ FFmpeg and FFprobe should be two separate binaries.
 ### -[Twilio](https://www.twilio.com/)
 Twilio is used for SMS and phone call notifications.
 
+THIS IS NOT SOMETHING YOU NEED TO DOWNLOAD/INSTALL.
+
 Access our TL Twilio info (token, etc.) by [logging in](https://www.twilio.com/login) to Twilio.
 
 See [below](#disable-twilio) for how to disable Twilio.
@@ -171,7 +175,7 @@ Before we begin, a general note:
 - The "Run" command in WR defaults to running from a different directory AND a different drive letter. This causes confusion.
 - WR also does not run `.py` files by default. 
 - These are some of the reasons why we do not run `.py` files directly from WR.
-- Instead, we tell WR to run a Batch script (`.bat` file) which in turn will run the Python script (`.py` file).
+- Instead, we tell WR to run a Batch script (`.bat` file) which in turn will automatically run the Python script (`.py` file).
 - Ensure the Batch & Python scripts are in the same directory.
 - A sample `.bat` file (`Example.bat`) is included in the [misc](https://github.com/Nashville-Public-Library/misc/tree/main/talklib_examples) repo. 
     - Download this file and place it in the same folder as your Python file.
@@ -186,7 +190,7 @@ D:\wireready
         -WP.bat
         -WP.py
 ````
-You would schedule WR to run the `WP.bat` file, which would run the `WP.py` file.
+You would schedule WR to run the `WP.bat` file, which would automatically run the `WP.py` file.
 
 ----
 
@@ -527,7 +531,6 @@ from talklib import TLPod
 nyt = TLPod(
     display_name = "New York Times",
     filename_to_match = "nyt",
-    categories = ["News and Politics"],
 )
 nyt.notifications.notify.enable_all = False
 nyt.run()

{talklib-2.1.5 → talklib-2.2.0}/README.md

@@ -6,6 +6,8 @@
 
 ## A package to automate processing TL shows/segments and podcasts
 
+[talklib on PyPI](https://pypi.org/project/talklib/)
+
 [Skip to Examples](#examples)
 
 *THIS README IS INTENDED TO ASSIST TL STAFF IN INSTALLING AND USING THIS PACKAGE*
@@ -30,7 +32,7 @@ Use Python 3.10 or higher.
 Make sure to select "add to PATH" during installation.
 
 ### -[FFmpeg](https://www.ffmpeg.org/download.html#build-windows)
-You need Windows binaries for both FFmpeg & FFprobe installed on the PC and added to the PATH:
+You need both FFmpeg & FFprobe installed on the PC and added to the PATH:
 
 To repeat, **this package will not work without FFmpeg and FFprobe**. 
 
@@ -39,6 +41,8 @@ FFmpeg and FFprobe should be two separate binaries.
 ### -[Twilio](https://www.twilio.com/)
 Twilio is used for SMS and phone call notifications.
 
+THIS IS NOT SOMETHING YOU NEED TO DOWNLOAD/INSTALL.
+
 Access our TL Twilio info (token, etc.) by [logging in](https://www.twilio.com/login) to Twilio.
 
 See [below](#disable-twilio) for how to disable Twilio.
@@ -71,7 +75,7 @@ Before we begin, a general note:
 - The "Run" command in WR defaults to running from a different directory AND a different drive letter. This causes confusion.
 - WR also does not run `.py` files by default. 
 - These are some of the reasons why we do not run `.py` files directly from WR.
-- Instead, we tell WR to run a Batch script (`.bat` file) which in turn will run the Python script (`.py` file).
+- Instead, we tell WR to run a Batch script (`.bat` file) which in turn will automatically run the Python script (`.py` file).
 - Ensure the Batch & Python scripts are in the same directory.
 - A sample `.bat` file (`Example.bat`) is included in the [misc](https://github.com/Nashville-Public-Library/misc/tree/main/talklib_examples) repo. 
     - Download this file and place it in the same folder as your Python file.
@@ -86,7 +90,7 @@ D:\wireready
         -WP.bat
         -WP.py
 ````
-You would schedule WR to run the `WP.bat` file, which would run the `WP.py` file.
+You would schedule WR to run the `WP.bat` file, which would automatically run the `WP.py` file.
 
 ----
 
@@ -427,7 +431,6 @@ from talklib import TLPod
 nyt = TLPod(
     display_name = "New York Times",
     filename_to_match = "nyt",
-    categories = ["News and Politics"],
 )
 nyt.notifications.notify.enable_all = False
 nyt.run()

{talklib-2.1.5 → talklib-2.2.0}/pyproject.toml

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

{talklib-2.1.5 → talklib-2.2.0}/src/talklib/pod.py

@@ -8,6 +8,7 @@ import time
 from typing import ClassVar, Type
 
 from fabric import Connection, Result
+from paramiko.ssh_exception import SSHException as paramiko_SSH_exception
 from pydantic import BaseModel, Field, model_validator
 
 from talklib.ev import EV
@@ -69,8 +70,13 @@ class SSH(BaseModel):
             self.connection.get(remote=f"shows/{folder}/{file}")
             self.notifications.prep_syslog(message=f"Successfully downloaded '{file}' to {os.getcwd()}")
             return file
-        except Exception as e:
-            to_send = f"unable to download '{file}': {e}"
+        except paramiko_SSH_exception as e:
+            to_send = f"unable to download '{file}' due to an authentication error. Are your SSH keys correctly configured?\n\
+The error from the SSH library is: {e}"
+            self.notifications.send_notifications(message=to_send, subject='Error')
+            raise e
+        except FileNotFoundError as e:
+            to_send = f"Unable to download {file} from /{folder}. It seems the file does not exist: {e}"
             self.notifications.send_notifications(message=to_send, subject='Error')
             raise e
 
@@ -115,6 +121,9 @@ class SSH(BaseModel):
                 ret_val.append(file.lower())
         return ret_val
 
+    def get_feed_from_folder(self, folder: str):
+        self.download_file(file="feed.xml", folder=folder)
+
     def check_folder_exists(self, folder: str) -> bool:
         self.notifications.prep_syslog(message=f"checking if {folder}/ exists on server...")
         folders = self.get_folders()
@@ -338,15 +347,35 @@ class TLPod(BaseModel):
         prefix = f"{self.display_name} (podcast)"
         Notifications.prefix = prefix
 
+        self.display_name = f"{self.display_name} ({datetime.now().strftime('%a, %d %b')})"
+
         return self
     
     def get_filename_to_match(self) -> str:
         if self.override_filename:
             self.notifications.prep_syslog(message="filename override is turned ON")
-            file = (self.filename_to_match + ".wav").lower()
+            file = (self.filename_to_match).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 + ".wav").lower()
+        return (self.filename_to_match + today_date).lower()
+
+    def check_alt_endings(self,file: str):
+        file_lower_case: str = file.lower()
+        
+        if file_lower_case.endswith("-sub.wav"):
+            self.notifications.prep_syslog(message=f"'-sub' found in filename: {file}. Amending 'display_name' for episode...")
+            self.display_name = f"{self.display_name} (Substitute)"
+            self.notifications.prep_syslog(message=f"New display_name: {self.display_name}")
+
+        if file_lower_case.endswith("-rep.wav"):
+            self.notifications.prep_syslog(message=f"'-rep' found in filename: {file}. Amending 'display_name' for episode...")
+            self.display_name = f"{self.display_name} (Encore)"
+            self.notifications.prep_syslog(message=f"New display_name: {self.display_name}")
+        
+        if file_lower_case.endswith("-dnp.wav"):
+            to_send = f"'-dnp' found in filename ({file}), will NOT podcast this episode. Exiting automation!"
+            self.notifications.send_notifications(message=to_send, subject="Info", syslog_level="info")
+            raise Exception (to_send)
 
     def match_file(self):
         '''match the name of the program that has today's date in the filename'''
@@ -356,10 +385,17 @@ 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:
-                basename = os.path.basename(file)
-                if to_match == basename.lower():
+                if to_match in file.lower():
                     self.notifications.prep_syslog(message=f"found matching file: {file}")
+
+                    if "Copy (" in file:
+                        self.notifications.prep_syslog(message=f"skipping file with 'copy' in filename: {file}")
+                        continue
+
+                    self.check_alt_endings(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')
         raise FileNotFoundError
@@ -414,7 +450,7 @@ class TLPod(BaseModel):
         self.episode.feed_file = feed_file
         self.episode.audio_filename = converted_file
         self.episode.bucket_folder = self.bucket_folder
-        self.episode.episode_title = f"{self.display_name} ({datetime.now().strftime('%a, %d %B')})"
+        self.episode.episode_title = self.display_name
         self.episode.max_episodes = self.max_episodes_in_feed
        
         self.episode.add_new_episode()

{talklib-2.1.5 → talklib-2.2.0/src/talklib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: talklib
-Version: 2.1.5
+Version: 2.2.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>
@@ -106,6 +106,8 @@ Requires-Dist: zipp==3.17.0
 
 ## A package to automate processing TL shows/segments and podcasts
 
+[talklib on PyPI](https://pypi.org/project/talklib/)
+
 [Skip to Examples](#examples)
 
 *THIS README IS INTENDED TO ASSIST TL STAFF IN INSTALLING AND USING THIS PACKAGE*
@@ -130,7 +132,7 @@ Use Python 3.10 or higher.
 Make sure to select "add to PATH" during installation.
 
 ### -[FFmpeg](https://www.ffmpeg.org/download.html#build-windows)
-You need Windows binaries for both FFmpeg & FFprobe installed on the PC and added to the PATH:
+You need both FFmpeg & FFprobe installed on the PC and added to the PATH:
 
 To repeat, **this package will not work without FFmpeg and FFprobe**. 
 
@@ -139,6 +141,8 @@ FFmpeg and FFprobe should be two separate binaries.
 ### -[Twilio](https://www.twilio.com/)
 Twilio is used for SMS and phone call notifications.
 
+THIS IS NOT SOMETHING YOU NEED TO DOWNLOAD/INSTALL.
+
 Access our TL Twilio info (token, etc.) by [logging in](https://www.twilio.com/login) to Twilio.
 
 See [below](#disable-twilio) for how to disable Twilio.
@@ -171,7 +175,7 @@ Before we begin, a general note:
 - The "Run" command in WR defaults to running from a different directory AND a different drive letter. This causes confusion.
 - WR also does not run `.py` files by default. 
 - These are some of the reasons why we do not run `.py` files directly from WR.
-- Instead, we tell WR to run a Batch script (`.bat` file) which in turn will run the Python script (`.py` file).
+- Instead, we tell WR to run a Batch script (`.bat` file) which in turn will automatically run the Python script (`.py` file).
 - Ensure the Batch & Python scripts are in the same directory.
 - A sample `.bat` file (`Example.bat`) is included in the [misc](https://github.com/Nashville-Public-Library/misc/tree/main/talklib_examples) repo. 
     - Download this file and place it in the same folder as your Python file.
@@ -186,7 +190,7 @@ D:\wireready
         -WP.bat
         -WP.py
 ````
-You would schedule WR to run the `WP.bat` file, which would run the `WP.py` file.
+You would schedule WR to run the `WP.bat` file, which would automatically run the `WP.py` file.
 
 ----
 
@@ -527,7 +531,6 @@ from talklib import TLPod
 nyt = TLPod(
     display_name = "New York Times",
     filename_to_match = "nyt",
-    categories = ["News and Politics"],
 )
 nyt.notifications.notify.enable_all = False
 nyt.run()