Update news.py

news.py

@@ -3,7 +3,7 @@ import time
 import json
 import requests
 import hashlib
-from datetime import datetime, timezone
+from datetime import datetime
 from bs4 import BeautifulSoup
 import xml.etree.ElementTree as ET
 
@@ -28,8 +28,10 @@ HEADERS_POST = {
 RSS_URL = "https://www.nippon.com/ja/rss-all/"
 
 # ===== 設定 =====
-INTERVAL_SECONDS = 60 * 60 * 12  # 12時間
 SENT_LOG_FILE = "sent_nippon_news.json"
+LAST_RUN_FILE = "last_run.json"
+
+TARGET_TIMES = {"06:30", "18:30"}  # 朝・夕方
 
 
 # ===== Utils =====
@@ -45,8 +47,19 @@ def save_sent_log(sent_set):
         json.dump(list(sent_set), f, ensure_ascii=False, indent=2)
 
 
+def load_last_run():
+    if not os.path.exists(LAST_RUN_FILE):
+        return ""
+    with open(LAST_RUN_FILE, "r", encoding="utf-8") as f:
+        return json.load(f).get("last_run", "")
+
+
+def save_last_run(value):
+    with open(LAST_RUN_FILE, "w", encoding="utf-8") as f:
+        json.dump({"last_run": value}, f)
+
+
 def hash_link(link: str) -> str:
-    """リンクをハッシュ化（重複防止用）"""
     return hashlib.sha256(link.encode("utf-8")).hexdigest()
 
 
@@ -82,7 +95,6 @@ def fetch_rss_items():
         link = item.findtext("link", "").strip()
         description_raw = item.findtext("description", "").strip()
 
-        # CDATA 内のHTMLをテキスト化
         soup = BeautifulSoup(description_raw, "lxml")
         description = soup.get_text(strip=True)
 
@@ -97,42 +109,52 @@ def fetch_rss_items():
 
 
 # ===== Main =====
-def main():
+def run_job():
     sent_log = load_sent_log()
+    items = fetch_rss_items()
+    new_count = 0
+
+    for item in items:
+        link_hash = hash_link(item["link"])
+        if link_hash in sent_log:
+            continue
+
+        message = (
+            f"<link type=\"url\" value=\"{item['link']}\">"
+            f"{item['title']}"
+            f"</link>\n\n"
+            f"{item['description']}"
+        )
+
+        send_to_channel(message)
+        sent_log.add(link_hash)
+        new_count += 1
+        time.sleep(1)
+
+    if new_count > 0:
+        save_sent_log(sent_log)
+        print(f"{new_count} 件のニュースを送信しました")
+    else:
+        print("新しいニュースはありません")
+
+
+def main():
+    last_run = load_last_run()
 
     while True:
-        try:
-            items = fetch_rss_items()
-            new_count = 0
-
-            for item in items:
-                link_hash = hash_link(item["link"])
-                if link_hash in sent_log:
-                    continue
-
-                message = (
-                    f"<link type=\"url\" value=\"{item['link']}\">"
-                    f"{item['title']}"
-                    f"</link>\n\n"
-                    f"{item['description']}"
-                )
-
-                send_to_channel(message)
-                sent_log.add(link_hash)
-                new_count += 1
-
-                time.sleep(1)  # 連投防止
-
-            if new_count > 0:
-                save_sent_log(sent_log)
-                print(f"{new_count} 件のニュースを送信しました")
-            else:
-                print("新しいニュースはありません")
-
-        except Exception as e:
-            print("エラー:", e)
-
-        time.sleep(INTERVAL_SECONDS)
+        now = datetime.now()
+        now_key = now.strftime("%Y-%m-%d %H:%M")
+        now_time = now.strftime("%H:%M")
+
+        if now_time in TARGET_TIMES and last_run != now_key:
+            print(f"{now_time} 実行開始")
+            try:
+                run_job()
+                save_last_run(now_key)
+            except Exception as e:
+                print("エラー:", e)
+
+        time.sleep(60)  # 1分ごとにチェック
 
 
 if __name__ == "__main__":