From a731f75c08706e9f21383dfc2c2d8e4a46a03c29 Mon Sep 17 00:00:00 2001
From: Edwin Hermans <edwin@madtech.cx>
Date: Fri, 10 May 2024 09:53:15 -0400
Subject: [PATCH 1/2] Fix cookies export

---
 moocfi_cses.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/moocfi_cses.py b/moocfi_cses.py
index f81dfd9..eaba81b 100644
--- a/moocfi_cses.py
+++ b/moocfi_cses.py
@@ -62,7 +62,9 @@ def login(self) -> None:
         if login_link:
             login_url = urllib.parse.urljoin(res.url, login_link.get("href"))
         else:
-            logging.debug(f"url: {res.url}, status: {res.status_code}\nhtml:\n{res.text}")
+            logging.debug(
+                f"url: {res.url}, status: {res.status_code}\nhtml:\n{res.text}"
+            )
             raise ValueError("Failed to find login url")
 
         res = self.http_session.get(login_url, headers={"referer": res.url})
@@ -71,7 +73,9 @@ def login(self) -> None:
             action = login_form.get("_action")
             login_form.pop("_action")
         else:
-            logging.debug(f"url: {res.url}, status: {res.status_code}\nhtml:\n{res.text}")
+            logging.debug(
+                f"url: {res.url}, status: {res.status_code}\nhtml:\n{res.text}"
+            )
             raise ValueError("Failed to find login form")
 
         login_form["session[login]"] = self.username
@@ -84,7 +88,9 @@ def login(self) -> None:
         )
 
         if not self.is_logged_in:
-            logging.debug(f"url: {res.url}, status: {res.status_code}\nhtml:\n{res.text}")
+            logging.debug(
+                f"url: {res.url}, status: {res.status_code}\nhtml:\n{res.text}"
+            )
             raise ValueError("Login failed")
 
     def http_request(
@@ -323,7 +329,7 @@ def main() -> None:
     session.login()
 
     if not args.no_state and cookiefile:
-        cookies = requests.utils.dict_from_cookiejar(session.cookiejar)  # type: ignore[no-untyped-call]
+        cookies = requests.utils.dict_from_cookiejar(session.http_session.cookies)
         write_cookie_file(str(cookiefile), cookies)
 
     if args.cmd == "list":

From c79ad946100610a352ebac9968b6e52acc290beb Mon Sep 17 00:00:00 2001
From: Edwin Hermans <edwin@madtech.cx>
Date: Fri, 10 May 2024 17:51:52 -0400
Subject: [PATCH 2/2] Move configuration of logger into main func

---
 moocfi_cses.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/moocfi_cses.py b/moocfi_cses.py
index eaba81b..c2ba272 100644
--- a/moocfi_cses.py
+++ b/moocfi_cses.py
@@ -18,11 +18,7 @@
 import requests
 
 
-logging.basicConfig(
-    level=logging.WARNING,
-    format="%(asctime)s %(levelname)s %(message)s",
-    datefmt="%Y-%m-%d %H:%M:%S",
-)
+logger = logging.getLogger(name="moocfi_cses")
 
 
 @dataclass
@@ -298,6 +294,12 @@ def parse_task(html: str | bytes, task: Task) -> Task:
 def main() -> None:
     args = parse_args()
 
+    logging.basicConfig(
+        level=logging.WARNING,
+        format="%(asctime)s %(levelname)s %(message)s",
+        datefmt="%Y-%m-%d %H:%M:%S",
+    )
+
     if args.cmd == "configure":
         config = create_config()
         write_config(args.config, config)