Bug fixes, makefile for launch

news_fetch/utils_mail/runner.py

@@ -7,16 +7,20 @@ import logging
 import configuration
 
 logger = logging.getLogger(__name__)
-config = configuration.main_config["MAIL"]
+mail_config = configuration.config["mail"]
 
 def send(article_model):
     mail = MIMEMultipart()
     mail['Subject'] = "{} -- {}".format(article_model.source_name, article_model.title)
-    mail['From'] = config["sender"]
-    mail['To'] = config["recipient"]
-
-    msg, files = article_model.mail_info() # this is html
+    mail['From'] = mail_config["sender"]
+    mail['To'] = mail_config["recipient"]
 
+    try:
+        msg, files = article_model.mail_info() # this is html
+    except: # Raised by model if article has no associated file
+        logger.info("Skipping mail sending")
+        return
+        
     content = MIMEText(msg, "html")
     mail.attach(content)
 
@@ -29,14 +33,14 @@ def send(article_model):
 
     try:
         try:
-            smtp = smtplib.SMTP(config["smtp_server"], config["port"])
+            smtp = smtplib.SMTP(mail_config["smtp_server"], mail_config["port"])
         except ConnectionRefusedError:
             logger.error("Server refused connection. Is this an error on your side?")
             return False
 
         smtp.starttls()
-        smtp.login(config["uname"], config["password"])
-        smtp.sendmail(config["sender"], config["recipient"], mail.as_string())
+        smtp.login(mail_config["uname"], mail_config["password"])
+        smtp.sendmail(mail_config["sender"], mail_config["recipient"], mail.as_string())
         smtp.quit()
         logger.info("Mail successfully sent.")
     except smtplib.SMTPException as e: