talklib 2.2.1__tar.gz → 3.1.0__tar.gz

{talklib-2.2.1/src/talklib.egg-info → talklib-3.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: talklib
-Version: 2.2.1
+Version: 3.1.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>

{talklib-2.2.1 → talklib-3.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "talklib"
-version = "2.2.1"
+version = "3.1.0"
 description = "A package to automate processing of shows/segments airing on the TL"
 readme = "README.md"
 license = {file = "LICENSE.txt"}
@@ -23,3 +23,7 @@ build-backend = "setuptools.build_meta"
 where = ["src"]
 include = ["talklib*"]
 exclude = [".tests*"]
+
+
+[project.scripts]
+talklib = "talklib.cli:main"

talklib-3.1.0/src/talklib/cli.py

@@ -0,0 +1,88 @@
+import argparse
+import os
+import sys
+import xml.etree.ElementTree as ET
+
+from talklib.pod import SSH
+
+def parse_args():
+    parser = argparse.ArgumentParser(description="use talklib in the terminal")
+
+    feed_template_help = "Generate an RSS feed template in the current directory"
+    parser.add_argument('--feed-template', action='store_true', help=feed_template_help, required=False)
+
+    new_podcast_directory_help = "Creates a new podcast directory on the server with the value you pass in. \
+        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()
+
+    return args
+
+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")
+    feed = ET.fromstring(feed_template)
+    tree = ET.ElementTree(feed)
+    tree.write("feed.xml", encoding="utf-8", xml_declaration=True)
+    # feed.write("feed.xml", encoding="utf-8", xml_declaration=True)
+    print("'feed.xml' file created in " + os.getcwd())
+    return
+
+def new_podcast_dir(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.")
+
+    if not os.path.isfile("image.jpg"):
+        return print(f"cannot find 'image.jpg' in {os.getcwd()}. You must have this file in the current directory.")
+
+    print("generating new podcast directory called " + name)
+
+    ssh = SSH()
+    ssh.make_new_folder(folder=name)
+    ssh.upload_file(file="feed.xml", folder=name)
+    ssh.upload_file(file="image.jpg", folder=name)
+
+    print("done! you can now delete the local copies of the files")
+    return
+
+def main():
+    if len(sys.argv) == 1: # if no arguments are passed
+        return print("talklib -h for help")
+    args = parse_args()
+
+    if args.feed_template:
+        generate_feed_template()
+    if args.new_pod_dir:
+        new_podcast_dir(name=args.new_pod_dir)
+
+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">
+  <channel>
+    <title>!!CHANGEME!!</title>
+    <link>http://nashvilletalkinglibrary.org/</link>
+    <atom:link href="https://assets.library.nashville.org/talkinglibrary/shows/!!CHANGEME!!/feed.xml" rel="self" type="application/rss+xml" />
+    <description>
+    !!CHANGEME!!
+    </description>
+    <copyright>© 1975-2022 Nashville Talking Library - Do not copy or redistribute</copyright>
+    <docs>https://cyber.harvard.edu/rss/rss.html</docs>
+    <generator>NTL Python Magic</generator>
+    <webMaster>nashvilletalkinglibrary@gmail.com (Darth Vader)</webMaster>
+    <itunes:owner>
+      <itunes:name>Nashville Talking Library</itunes:name>
+      <itunes:email>ntl@nashville.gov</itunes:email>
+    </itunes:owner>
+    <itunes:category text="Education" />
+    <itunes:explicit>true</itunes:explicit>
+    <itunes:image href="https://assets.library.nashville.org/talkinglibrary/shows/!!CHANGEME!!/image.jpg" />
+    <image>
+      <url>https://assets.library.nashville.org/talkinglibrary/shows/!!CHANGEME!!/image.jpg</url>
+      <title>!!CHANGEME!!</title>
+      <link>http://nashvilletalkinglibrary.org/</link>
+    </image>
+    <language>en</language>
+    <lastBuildDate>leave me alone</lastBuildDate>
+  </channel>
+</rss>
+"""

{talklib-2.2.1 → talklib-3.1.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
@@ -90,6 +92,12 @@ The error from the SSH library is: {e}"
             self.notifications.send_notifications(
                 message=f"Unable to delete '{file}' from {folder}: {e}. Continuing automation...",
                 subject="Error")
+            
+    def make_new_folder(self, folder: str) -> None:
+        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)
+        self.notifications.prep_syslog(message=f"{folder}/ created on server")
 
     def get_folders(self) -> list:
         ret_val: list = []
@@ -135,6 +143,13 @@ The error from the SSH library is: {e}"
         self.notifications.send_notifications(message=to_send, subject='Error')
         raise Exception (to_send)
     
+    def check_folder_exists_no_exception(self, folder: str):
+        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!")
+            return True
+    
 
 class Episode(BaseModel):
     feed_file: str = Field(min_length=1, default=None)
@@ -405,15 +420,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}")
@@ -426,6 +439,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:
@@ -444,11 +483,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
@@ -456,10 +498,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-2.2.1 → talklib-3.1.0/src/talklib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: talklib
-Version: 2.2.1
+Version: 3.1.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>

{talklib-2.2.1 → talklib-3.1.0}/src/talklib.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ README.md
 pyproject.toml
 requirements.txt
 src/talklib/__init__.py
+src/talklib/cli.py
 src/talklib/ev.py
 src/talklib/ffmpeg.py
 src/talklib/notify.py
@@ -12,5 +13,6 @@ src/talklib/utils.py
 src/talklib.egg-info/PKG-INFO
 src/talklib.egg-info/SOURCES.txt
 src/talklib.egg-info/dependency_links.txt
+src/talklib.egg-info/entry_points.txt
 src/talklib.egg-info/requires.txt
 src/talklib.egg-info/top_level.txt

talklib-3.1.0/src/talklib.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+talklib = talklib.cli:main