Add wikipedia, wikiquote, and calvin and hobbes links

4 files changed, 55 insertions, 17 deletions

diff --git a/.gitignore b/.gitignore
index e84687f..2380aaa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 __pycache__/
 config.ini
-
+*.swp
diff --git a/config.py b/config.py
index 645288f..c54162f 100644
--- a/config.py
+++ b/config.py
@@ -1,7 +1,7 @@
 import os
 from configparser import ConfigParser
 
-config_path = "/home/mark/email-scripts/config.ini"
+config_path = "/home/mark/projects/email-scripts/config.ini"
 
 config = ConfigParser()
 if os.path.isfile(config_path):
diff --git a/daily-update.py b/daily-update.py
index f9c402d..165372a 100755
--- a/daily-update.py
+++ b/daily-update.py
@@ -10,6 +10,7 @@ from bs4 import BeautifulSoup
 from email.mime.text import MIMEText 
 from email.utils import formatdate
 
+import on_this_day
 import email_helper
 from config import config
 
@@ -19,20 +20,6 @@ def get_weather():
     soup = BeautifulSoup(requests.get(weather_url).text, features="lxml")
     return str(soup.select("#detailed-forecast")[0])
 
-def get_old_news():
-    print("getting old news")
-    year = int(date.today().strftime("%Y")) - 100
-    century_ago = str(year) + date.today().strftime("-%m-%d")
-    news_text = ""
-    urls = config["news"]["urls"].split(",")
-    names = config["news"]["names"].split(",")
-    for i in range(len(urls)):
-        full_url = urls[i] % century_ago
-        name = names[i]
-        if requests.get(full_url).status_code != 404:
-            news_text += '<a href="%s">%s %s</a>\n' % (full_url, name, century_ago)
-    return news_text
-
 def get_unread_reminders():
     print("getting unread reminders")
     subjects = email_helper.filter_unread("subject", "REMINDER:", "subject")
@@ -47,7 +34,7 @@ def get_unread_reminders():
 
 def format_email():
     print("forming email")
-    return '%s%s%s' % (get_unread_reminders(), get_old_news(), get_weather())
+    return '%s%s%s' % (get_unread_reminders(), on_this_day.get_on_this_day(), get_weather())
 
 def send_update_email():
     frm = config["email"]["user"]
diff --git a/on_this_day.py b/on_this_day.py
new file mode 100644
index 0000000..f8abb8e
--- /dev/null
+++ b/on_this_day.py
@@ -0,0 +1,51 @@
+import requests
+
+from datetime import date
+from bs4 import BeautifulSoup
+
+from config import config
+
+def get_on_this_day():
+    return "<h1>On this day</h1>%s%s%s%s" % (get_old_news(), get_calvin_and_hobbes(), get_today_wikipedia(), get_today_wikiquote())
+
+def get_old_news():
+    print("getting old news")
+    year = int(date.today().strftime("%Y")) - 100
+    century_ago = str(year) + date.today().strftime("-%m-%d")
+    news_text = ""
+    urls = config["news"]["urls"].split(",")
+    names = config["news"]["names"].split(",")
+    for i in range(len(urls)):
+        full_url = urls[i] % century_ago
+        name = names[i]
+        if requests.get(full_url).status_code != 404:
+            news_text += '<div><a href="%s">%s %s</a></div>\n' % (full_url, name, century_ago)
+    return news_text
+
+def get_today_wikipedia():
+    print("getting today's wikipedia")
+    full_url = "https://en.wikipedia.org/wiki/%s" % date.today().strftime("%B_%d")
+    return '<div><a href="%s">Today\'s Wikipedia</a></div>' % (full_url)
+
+def get_today_wikiquote():
+    print("getting today's wikiquote")
+    full_url = "https://en.wikiquote.org/wiki/%s" % date.today().strftime("%B_%d")
+    r = requests.get(full_url)
+    soup = BeautifulSoup(r.text, features="lxml")
+    table = str(soup.find(text="2020").parent.parent.next_sibling.next_sibling)
+    table = table.replace('href="/', 'href="https://en.wikiquote.org/')
+    return '<div style="border: 1px solid black">%s</div>' % table
+
+def get_calvin_and_hobbes():
+    print("getting calvin and hobbes")
+    year = int(date.today().strftime("%Y")) % 9 + 1986
+    comic_date = str(year) + date.today().strftime("/%m/%d")
+    full_url = "https://www.gocomics.com/calvinandhobbes/%s" % comic_date
+    r = requests.get(full_url)
+    soup = BeautifulSoup(r.text, features="lxml")
+    if not "Today on" in str(soup.title): # gocomics gives you today if 404
+        comic_src = soup.select(".item-comic-image")[0].img["src"]
+        return '<div><a href="%s">Calvin and Hobbes</a></div>' % (comic_src)
+    else:
+        return ""
+