against changing display

Author: 1st-vil

.gitignore

@@ -1,4 +1,4 @@
-# local env files
-.env
-.env.local
+# local env files
+.env
+.env.local
 .env.*.local

README.md

@@ -1,2 +1,2 @@
-# OnlineMathContestNotificationBot
-OnlineMathContestのコンテスト開始を通知します。
+# OnlineMathContestNotificationBot
+OnlineMathContestのコンテスト開始を通知します。

post.py

@@ -1,52 +1,53 @@
-import tweepy
-import pymysql
-from dotenv import load_dotenv
-import os
-from os.path import join,dirname
-from datetime import datetime, timezone, timedelta
-
-dotenv_path=join(dirname(__file__),'.env')
-load_dotenv(dotenv_path)
-MYSQL_HOST=os.environ.get("MYSQL_HOST")
-MYSQL_USER=os.environ.get("MYSQL_USER")
-MYSQL_PASSWORD=os.environ.get("MYSQL_PASSWORD")
-MYSQL_DATABASE=os.environ.get("MYSQL_DATABASE")
-API_Key=os.environ.get("API_Key")
-API_Key_Secret=os.environ.get("API_Key_Secret")
-Access_Token=os.environ.get("Access_Token")
-Access_Token_Secret=os.environ.get("Access_Token_Secret")
-
-def make_connection():
-    return pymysql.connect(host=MYSQL_HOST,
-        user=MYSQL_USER,
-        password=MYSQL_PASSWORD,
-        db=MYSQL_DATABASE,
-        charset='utf8mb4',
-        cursorclass=pymysql.cursors.DictCursor)
-
-auth = tweepy.OAuthHandler(API_Key, API_Key_Secret)
-auth.set_access_token(Access_Token, Access_Token_Secret)
-api = tweepy.API(auth)
-
-conn = make_connection()
-with conn.cursor() as cursor:
-    sql = "SELECT * FROM contest_info"
-    cursor.execute(sql)
-    for tmp in cursor:
-        day, time, _, _ = tmp["schedule"].split()
-        start_time = datetime.strptime(day + " " + time, "%Y-%m-%d %H:%M:%S")
-        cur_jp = datetime.now() + timedelta(hours=9)
-        if cur_jp < start_time and cur_jp + timedelta(minutes=90) > start_time:
-            res = []
-            res.append(tmp["title"])
-            res.append(tmp["schedule"])
-            res.append(tmp["rated"])
-            res.append("tester: " + tmp["tester"])
-            res.append(tmp["url"])
-            api.update_status("\n".join(res))
-            sql = "DELETE FROM contest_info WHERE title = %s"
-            cursor.execute(sql, (tmp["title"]))
-        elif cur_jp > start_time:
-            sql = "DELETE FROM contest_info WHERE title = %s"
-            cursor.execute(sql, (tmp["title"]))
+import tweepy
+import pymysql
+from dotenv import load_dotenv
+import os
+from os.path import join,dirname
+from datetime import datetime, timezone, timedelta
+
+dotenv_path=join(dirname(__file__),'.env')
+load_dotenv(dotenv_path)
+MYSQL_HOST=os.environ.get("MYSQL_HOST")
+MYSQL_USER=os.environ.get("MYSQL_USER")
+MYSQL_PASSWORD=os.environ.get("MYSQL_PASSWORD")
+MYSQL_DATABASE=os.environ.get("MYSQL_DATABASE")
+API_Key=os.environ.get("API_Key")
+API_Key_Secret=os.environ.get("API_Key_Secret")
+Access_Token=os.environ.get("Access_Token")
+Access_Token_Secret=os.environ.get("Access_Token_Secret")
+
+def make_connection():
+    return pymysql.connect(host=MYSQL_HOST,
+        user=MYSQL_USER,
+        password=MYSQL_PASSWORD,
+        db=MYSQL_DATABASE,
+        charset='utf8mb4',
+        cursorclass=pymysql.cursors.DictCursor)
+
+auth = tweepy.OAuthHandler(API_Key, API_Key_Secret)
+auth.set_access_token(Access_Token, Access_Token_Secret)
+api = tweepy.API(auth)
+
+conn = make_connection()
+with conn.cursor() as cursor:
+    sql = "SELECT * FROM contest_info"
+    cursor.execute(sql)
+    for tmp in cursor:
+        day, _, time, _, _ = tmp["schedule"].split()
+        start_time = datetime.strptime(day + " " + time, "%Y-%m-%d %H:%M")
+        cur_jp = datetime.now() + timedelta(hours=9)
+        if cur_jp < start_time and cur_jp + timedelta(minutes=90) > start_time:
+            res = []
+            res.append(tmp["title"])
+            res.append(tmp["schedule"])
+            res.append(tmp["rated"])
+            res.append("writer: " + tmp["writer"])
+            res.append("tester: " + tmp["tester"])
+            res.append(tmp["url"])
+            api.update_status("\n".join(res))
+            sql = "DELETE FROM contest_info WHERE title = %s"
+            cursor.execute(sql, (tmp["title"]))
+        elif cur_jp > start_time:
+            sql = "DELETE FROM contest_info WHERE title = %s"
+            cursor.execute(sql, (tmp["title"]))
 conn.commit()

requirements.txt

@@ -1,6 +1,6 @@
-beautifulsoup4==4.10.0
-PyMySQL==1.0.2
-requests==2.27
-requests-oauthlib==1.3.0
-python-dotenv==0.17.1
+beautifulsoup4==4.10.0
+PyMySQL==1.0.2
+requests==2.27
+requests-oauthlib==1.3.0
+python-dotenv==0.17.1
 tweepy==4.8.0

scrape.py

@@ -1,49 +1,52 @@
-import requests
-from bs4 import BeautifulSoup
-import pymysql
-from dotenv import load_dotenv
-import os
-from os.path import join,dirname
-
-dotenv_path=join(dirname(__file__),'.env')
-load_dotenv(dotenv_path)
-MYSQL_HOST=os.environ.get("MYSQL_HOST")
-MYSQL_USER=os.environ.get("MYSQL_USER")
-MYSQL_PASSWORD=os.environ.get("MYSQL_PASSWORD")
-MYSQL_DATABASE=os.environ.get("MYSQL_DATABASE")
-def make_connection():
-    return pymysql.connect(host=MYSQL_HOST,
-        user=MYSQL_USER,
-        password=MYSQL_PASSWORD,
-        db=MYSQL_DATABASE,
-        charset='utf8mb4',
-        cursorclass=pymysql.cursors.DictCursor)
-
-base_sp = BeautifulSoup(requests.get("https://onlinemathcontest.com/contests/all").content)
-conn = make_connection()
-with conn.cursor() as cursor:
-    sql = "SELECT url FROM contest_info"
-    cursor.execute(sql)
-    contest_urls = [tmp["url"] for tmp in cursor]
-
-    for tmp in base_sp.find_all("paper-card"):
-        if tmp.find("h2") and tmp.find("h2").contents[0] == " Past Contests ":
-            break
-        li = tmp.find_all("li")
-        schedule = li[0].contents[0].strip()
-        rated = li[1].contents[0].strip()
-        url = tmp.find("a")["href"]
-        sp = BeautifulSoup(requests.get(url).content)
-        title = sp.find("h1").contents[0]
-        tester = []
-        for tmp in filter(lambda x: x.contents and "tester" in x.contents[0], sp.find_all("p")):
-            tester = [a.contents[0].strip() for a in tmp.find_all("a")]
-        #元々存在するかどうかで場合分け
-        if url in contest_urls:
-            print("UPDATE", title)
-            sql = "UPDATE contest_info SET title = %s, schedule = %s, rated = %s, tester = %s WHERE url = %s"
-        else:
-            print("INSERT", title)
-            sql = "INSERT INTO contest_info (title, schedule, rated, tester, url) VALUES (%s, %s, %s, %s, %s)"
-        cursor.execute(sql, (title, schedule, rated, ",".join(tester), url))
+import requests
+from bs4 import BeautifulSoup
+import pymysql
+from dotenv import load_dotenv
+import os
+from os.path import join,dirname
+
+dotenv_path=join(dirname(__file__),'.env')
+load_dotenv(dotenv_path)
+MYSQL_HOST=os.environ.get("MYSQL_HOST")
+MYSQL_USER=os.environ.get("MYSQL_USER")
+MYSQL_PASSWORD=os.environ.get("MYSQL_PASSWORD")
+MYSQL_DATABASE=os.environ.get("MYSQL_DATABASE")
+def make_connection():
+    return pymysql.connect(host=MYSQL_HOST,
+        user=MYSQL_USER,
+        password=MYSQL_PASSWORD,
+        db=MYSQL_DATABASE,
+        charset='utf8mb4',
+        cursorclass=pymysql.cursors.DictCursor)
+
+base_sp = BeautifulSoup(requests.get("https://onlinemathcontest.com/contests/all").content)
+conn = make_connection()
+with conn.cursor() as cursor:
+    sql = "SELECT url FROM contest_info"
+    cursor.execute(sql)
+    contest_urls = [tmp["url"] for tmp in cursor]
+
+    for tmp in base_sp.find_all("paper-card"):
+        if tmp.find("h2") and tmp.find("h2").contents[0] == " Past Contests ":
+            break
+        li = tmp.find_all("li")
+        schedule = li[0].contents[0].strip()
+        rated = li[1].contents[0].strip()
+        url = tmp.find("a")["href"]
+        sp = BeautifulSoup(requests.get(url).content)
+        title = sp.find("h1").contents[0]
+        writer = []
+        for tmp in filter(lambda x: x.contents and "Writer" in x.contents[0], sp.find_all("div")):
+            writer = [a.contents[0].strip() for a in tmp.find_all("a")]
+        tester = []
+        for tmp in filter(lambda x: x.contents and "Tester" in x.contents[0], sp.find_all("p")):
+            tester = [a.contents[0].strip() for a in tmp.find_all("a")]
+        #元々存在するかどうかで場合分け
+        if url in contest_urls:
+            print("UPDATE", title)
+            sql = "UPDATE contest_info SET title = %s, schedule = %s, rated = %s, writer = %s, tester = %s WHERE url = %s"
+        else:
+            print("INSERT", title)
+            sql = "INSERT INTO contest_info (title, schedule, rated, writer, tester, url) VALUES (%s, %s, %s, %s, %s, %s)"
+        cursor.execute(sql, (title, schedule, rated, ",".join(writer), ",".join(tester), url))
 conn.commit()