talklib 3.1.0__tar.gz → 3.2.1__tar.gz

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

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

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

{talklib-3.1.0 → talklib-3.2.1}/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")
@@ -38,7 +60,7 @@ def new_podcast_dir(name: str):
 
     print("generating new podcast directory called " + name)
 
-    ssh = SSH()
+    ssh = get_SSH()
     ssh.make_new_folder(folder=name)
     ssh.upload_file(file="feed.xml", folder=name)
     ssh.upload_file(file="image.jpg", folder=name)
@@ -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.1.0 → talklib-3.2.1}/src/talklib/pod.py

@@ -20,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'''
@@ -67,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}")
@@ -94,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)
@@ -130,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()
@@ -343,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):
@@ -366,6 +372,18 @@ class TLPod(BaseModel):
 
         return self
     
+    # @model_validator(mode='after')
+    # def confirm_SSH_connection(self):
+    #     # before we carry on, make sure we can successfully connect to the server
+    #     try:
+    #         connection = 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:
         if self.override_filename:
             self.notifications.prep_syslog(message="filename override is turned ON")

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

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