talklib 3.0.0__tar.gz → 3.2.0__tar.gz

{talklib-3.0.0/src/talklib.egg-info → talklib-3.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: talklib
-Version: 3.0.0
+Version: 3.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>
@@ -523,7 +523,7 @@ nyt.run()
 
 To disable ALL notifications, add a line like this:
 
-> This will disable all notifications **including** syslog messages
+> This will disable all notifications **including** syslog messages (shell print statements will not be disabled)
 
 ````python
 from talklib import TLPod

{talklib-3.0.0 → talklib-3.2.0}/README.md

@@ -423,7 +423,7 @@ nyt.run()
 
 To disable ALL notifications, add a line like this:
 
-> This will disable all notifications **including** syslog messages
+> This will disable all notifications **including** syslog messages (shell print statements will not be disabled)
 
 ````python
 from talklib import TLPod

{talklib-3.0.0 → talklib-3.2.0}/pyproject.toml

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

{talklib-3.0.0 → talklib-3.2.0}/src/talklib/cli.py

@@ -3,7 +3,7 @@ import os
 import sys
 import xml.etree.ElementTree as ET
 
-from talklib.pod import SSH
+from talklib.pod import SSH, Notifications
 
 def parse_args():
     parser = argparse.ArgumentParser(description="use talklib in the terminal")
@@ -15,10 +15,32 @@ def parse_args():
         You MUST have an RSS feed (feed.xml) and logo (image.jpg) in the current directory."
     parser.add_argument('--new-pod-dir', type=str, help=new_podcast_directory_help, required=False)
 
-    args = parser.parse_args()
+    download_feed_help:str = "Download the RSS feed from the folder on the server you specify."
+    parser.add_argument('--download-feed', type=str, help=download_feed_help, required=False)
+
+    upload_feed_help:str = "Upload the RSS feed to the folder on the server you specify."
+    parser.add_argument('--upload-feed', type=str, help=upload_feed_help, required=False)
 
+    args = parser.parse_args()
     return args
 
+def get_SSH():
+    Notifications.prefix = "talklib CLI"
+    notifications = Notifications()
+    notifications.notify.email_enable = False
+    ssh = SSH(notifications=notifications)
+    return ssh
+
+def download_feed(name: str):
+    ssh = get_SSH()
+    ssh.get_feed_from_folder(folder=name)
+
+def upload_feed(name:str):
+    if not os.path.isfile("feed.xml"):
+        return print(f"cannot find 'feed.xml' in {os.getcwd()}. You must have this file in the current directory.")
+    ssh = get_SSH()
+    ssh.upload_feed_to_folder(folder=name)
+
 def generate_feed_template():
     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")
@@ -52,9 +74,13 @@ def main():
     args = parse_args()
 
     if args.feed_template:
-        generate_feed_template()
+        return generate_feed_template()
     if args.new_pod_dir:
-        new_podcast_dir(name=args.new_pod_dir)
+        return new_podcast_dir(name=args.new_pod_dir)
+    if args.download_feed:
+        return download_feed(name=args.download_feed)
+    if args.upload_feed:
+        return upload_feed(name=args.upload_feed)
 
 feed_template: str = """
 <rss xmlns:atom="http://www.w3.org/2005/Atom" xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd" version="2.0">

{talklib-3.0.0 → talklib-3.2.0}/src/talklib/pod.py

@@ -4,12 +4,14 @@ import glob
 import math
 import os
 import re
+import subprocess
 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
+import requests
 
 from talklib.ev import EV
 from talklib.notify import Notify
@@ -18,7 +20,7 @@ from talklib.utils import today_is_weekday
 
 class Notifications(BaseModel):
     prefix: ClassVar[str] = None  # prefix all messages with identifier for the show/podcast
-    notify: Type[Notify] = Notify()
+    notify: ClassVar[Type[Notify]] = Notify()
 
     def prep_syslog(self, message: str, level: str = 'info'):
         '''send message to syslog server'''
@@ -65,6 +67,7 @@ class SSH(BaseModel):
             raise e
 
     def download_file(self, file: str, folder: str) -> None:
+        folder = folder.lower()
         try:
             self.notifications.prep_syslog(message=f"Attempting to download '{file}' from {folder}/ on server")
             self.connection.get(remote=f"shows/{folder}/{file}")
@@ -92,6 +95,7 @@ The error from the SSH library is: {e}"
                 subject="Error")
             
     def make_new_folder(self, folder: str) -> None:
+        folder = folder.lower()
         if self.check_folder_exists_no_exception(folder=folder):
             raise Exception (f"{folder}/ already exists on server! Exiting...")
         self.connection.run(f"cd shows && mkdir {folder}", hide=True)
@@ -128,8 +132,12 @@ The error from the SSH library is: {e}"
         return ret_val
 
     def get_feed_from_folder(self, folder: str):
+        self.check_folder_exists(folder=folder)
         self.download_file(file="feed.xml", folder=folder)
 
+    def upload_feed_to_folder(self, folder:str):
+        self.upload_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()
@@ -341,9 +349,9 @@ class TLPod(BaseModel):
     override_filename: bool = False
     audio_folders:list = EV().destinations
     notifications: Type[Notifications] = Notifications()
-    episode: Type[Episode] = Episode(notifications=notifications)
+    episode: Type[Episode] = Episode()
     ffmpeg: Type[FFMPEG] = FFMPEG()
-    ssh: Type[SSH] = SSH(notifications=notifications)
+    ssh: Type[SSH] = SSH()
 
     @model_validator(mode='after')
     def post_update(self):
@@ -362,6 +370,14 @@ class TLPod(BaseModel):
 
         self.display_name = f"{self.display_name} ({datetime.now().strftime('%a, %d %b')})"
 
+        # before we carry on, make sure we can successfully connect to the server
+        # try:
+        #     self.ssh.connection.run("ls")
+        # except Exception as e:
+        #     to_send:str = f"Cannot connect to server. Are you sure the SSH keys are set up correctly? Here is the error: {e}"
+        #     self.notifications.send_notifications(message=to_send, subject="Error")
+        #     raise e
+
         return self
     
     def get_filename_to_match(self) -> str:
@@ -418,15 +434,13 @@ class TLPod(BaseModel):
         output_filename = output_filename[0]
         output_filename = os.path.basename(output_filename).lower()
         output_filename = output_filename + '.mp3'
-        self.notifications.prep_syslog(message=f"Converted audio file will be {output_filename}")
+        self.notifications.prep_syslog(message=f"final audio file will be {output_filename}")
         return output_filename
 
     def convert(self, file:str):
-        output_filename = self.create_converted_filename(file=file)
-
         self.ffmpeg.input_file = file
-        self.ffmpeg.output_file = output_filename
-        self.ffmpeg.compression = False # this is for podcasts. these files should already be edited
+        self.ffmpeg.output_file = "out.mp3"
+        self.ffmpeg.compression = False # this is for podcasts. these files should already be edited  
         
         ffmpeg_commands = self.ffmpeg.get_commands()
         self.notifications.prep_syslog(message=f"FFmppeg commands: {ffmpeg_commands}")
@@ -439,6 +453,32 @@ class TLPod(BaseModel):
         except Exception as ffmpeg_exception:
             self.notifications.send_notifications(message=f'FFmpeg error: {ffmpeg_exception}', subject='Error')
             raise ffmpeg_exception
+        
+    def concat(self, preroll:str, program_audio: str, output_filename: str):
+        self.notifications.prep_syslog(message="concatenating preroll and program audio together...")
+        subprocess.run(f'ffmpeg -hide_banner -loglevel quiet -i "concat:{preroll}|{program_audio}" -c copy {output_filename}')
+        self.notifications.prep_syslog(message=f"files successfully concatenated as: {output_filename}")
+        return output_filename
+
+    def download_preroll(self):
+        download_URL = "https://assets.library.nashville.org/talkinglibrary/pod_preroll.mp3"
+        input_file = 'preroll.mp3'
+        with open (input_file, mode='wb') as downloaded_file:
+            self.notifications.prep_syslog(message=f"downloading preroll audio from {download_URL}...")
+            a = requests.get(download_URL)
+            downloaded_file.write(a.content)
+            downloaded_file.close()
+        self.notifications.prep_syslog(message="preroll audio successfully downloaded")
+        return downloaded_file.name
+    
+    def post_cleaup(self):
+        self.notifications.prep_syslog(message="looking for local files to delete...")
+        XML_files = glob.glob("*.xml")
+        for file in XML_files:
+            self.delete_local_file(file=file)
+        MP3_files = glob.glob("*.mp3")
+        for file in MP3_files:
+            self.delete_local_file(file=file)
     
     def delete_local_file(self, file: str):
         try:
@@ -457,11 +497,14 @@ class TLPod(BaseModel):
 
         audio_file = self.match_file()
         converted_file = self.convert(file=audio_file)
+        output_filename = self.create_converted_filename(file=audio_file)
+        preroll = self.download_preroll()
+        concat_file = self.concat(preroll=preroll, program_audio=converted_file, output_filename=output_filename)
 
         feed_file = self.ssh.download_file(folder=self.bucket_folder, file='feed.xml') # all XML files on server should have the same name
 
         self.episode.feed_file = feed_file
-        self.episode.audio_filename = converted_file
+        self.episode.audio_filename = concat_file
         self.episode.bucket_folder = self.bucket_folder
         self.episode.episode_title = self.display_name
         self.episode.max_episodes = self.max_episodes_in_feed
@@ -469,10 +512,9 @@ class TLPod(BaseModel):
         self.episode.add_new_episode()
         self.episode.remove_old_episodes()
     
-        self.ssh.upload_file(folder=self.bucket_folder, file=converted_file)
+        self.ssh.upload_file(folder=self.bucket_folder, file=concat_file)
         self.ssh.upload_file(folder=self.bucket_folder, file=feed_file)
 
-        self.delete_local_file(file=feed_file)
-        self.delete_local_file(file=converted_file)
+        self.post_cleaup()
 
         self.notifications.prep_syslog(message="All done.")

{talklib-3.0.0 → talklib-3.2.0/src/talklib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: talklib
-Version: 3.0.0
+Version: 3.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>
@@ -523,7 +523,7 @@ nyt.run()
 
 To disable ALL notifications, add a line like this:
 
-> This will disable all notifications **including** syslog messages
+> This will disable all notifications **including** syslog messages (shell print statements will not be disabled)
 
 ````python
 from talklib import TLPod