improvements

Author: TheCommCraft

scratchattach/site/browser_cookie3_stub.py

@@ -0,0 +1,17 @@
+# browser_cookie3.pyi
+
+import http.cookiejar
+from typing import Optional
+
+def chrome(cookie_file: Optional[str] = None, key_file: Optional[str] = None) -> http.cookiejar.CookieJar: return NotImplemented
+def chromium(cookie_file: Optional[str] = None, key_file: Optional[str] = None) -> http.cookiejar.CookieJar: return NotImplemented
+def firefox(cookie_file: Optional[str] = None, key_file: Optional[str] = None) -> http.cookiejar.CookieJar: return NotImplemented
+def opera(cookie_file: Optional[str] = None, key_file: Optional[str] = None) -> http.cookiejar.CookieJar: return NotImplemented
+def edge(cookie_file: Optional[str] = None, key_file: Optional[str] = None) -> http.cookiejar.CookieJar: return NotImplemented
+def brave(cookie_file: Optional[str] = None, key_file: Optional[str] = None) -> http.cookiejar.CookieJar: return NotImplemented
+def vivaldi(cookie_file: Optional[str] = None, key_file: Optional[str] = None) -> http.cookiejar.CookieJar: return NotImplemented
+def safari(cookie_file: Optional[str] = None, key_file: Optional[str] = None) -> http.cookiejar.CookieJar: return NotImplemented
+def lynx(cookie_file: Optional[str] = None, key_file: Optional[str] = None) -> http.cookiejar.CookieJar: return NotImplemented
+def w3m(cookie_file: Optional[str] = None, key_file: Optional[str] = None) -> http.cookiejar.CookieJar: return NotImplemented
+
+def load() -> http.cookiejar.CookieJar: return NotImplemented

scratchattach/site/browser_cookies.py

@@ -1,9 +1,12 @@
-from typing import Optional
+from typing import Optional, assert_never, TYPE_CHECKING
 from http.cookiejar import CookieJar
 from enum import Enum, auto
 browsercookie_err = None
 try:
-    import browsercookie
+    if TYPE_CHECKING:
+        from . import browser_cookie3_stub as browser_cookie3
+    else:
+        import browser_cookie3
 except Exception as e:
     browsercookie = None
     browsercookie_err = e
@@ -15,41 +18,44 @@ class Browser(Enum):
     EDGE = auto()
     SAFARI = auto()
     CHROMIUM = auto()
-    EDGE_DEV = auto()
     VIVALDI = auto()
+    EDGE_DEV = auto()
 
 
 FIREFOX = Browser.FIREFOX
 CHROME = Browser.CHROME
 EDGE = Browser.EDGE
 SAFARI = Browser.SAFARI
 CHROMIUM = Browser.CHROMIUM
-EDGE_DEV = Browser.EDGE_DEV
 VIVALDI = Browser.VIVALDI
 ANY = Browser.ANY
+EDGE_DEV = Browser.EDGE_DEV
 
 def cookies_from_browser(browser : Browser = ANY) -> dict[str, str]:
     """
     Import cookies from browser to login
     """
-    if not browsercookie:
+    if not browser_cookie3:
         raise browsercookie_err or ModuleNotFoundError()
     cookies : Optional[CookieJar] = None
-    if browser == ANY:
-        cookies = browsercookie.load()
-    elif browser == FIREFOX:
-        cookies = browsercookie.firefox()
-    elif browser == CHROME:
-        cookies = browsercookie.chrome()
-    elif browser == EDGE:
-        cookies = browsercookie.edge()
-    elif browser == SAFARI:
-        cookies = browsercookie.safari()
-    elif browser == CHROMIUM:
-        cookies = browsercookie.chromium()
-    elif browser == EDGE_DEV:
-        cookies = browsercookie.edge_dev()
-    elif browser == VIVALDI:
-        cookies = browsercookie.vivaldi()
+    match browser:
+        case Browser.ANY:
+            cookies = browser_cookie3.load()
+        case Browser.FIREFOX:
+            cookies = browser_cookie3.firefox()
+        case Browser.CHROME:
+            cookies = browser_cookie3.chrome()
+        case Browser.EDGE:
+            cookies = browser_cookie3.edge()
+        case Browser.SAFARI:
+            cookies = browser_cookie3.safari()
+        case Browser.CHROMIUM:
+            cookies = browser_cookie3.chromium()
+        case Browser.VIVALDI:
+            cookies = browser_cookie3.vivaldi()
+        case Browser.EDGE_DEV:
+            raise ValueError("EDGE_DEV is not supported anymore.")
+        case _:
+            assert_never(browser)
     assert isinstance(cookies, CookieJar)
     return {cookie.name: cookie.value for cookie in cookies if "scratch.mit.edu" in cookie.domain and cookie.value}

scratchattach/site/forum.py

@@ -9,7 +9,7 @@
 from bs4 import BeautifulSoup
 
 from . import user
-from . import session
+from . import session as module_session
 from ..utils.commons import headers
 from ..utils import exceptions, commons
 from ._base import BaseSiteComponent
@@ -96,7 +96,7 @@ def update(self):
         return True
 
     @classmethod
-    def from_id(cls, id: int, session: session.Session, update: bool = False):
+    def from_id(cls, id: int, session: module_session.Session, update: bool = False):
         new = cls(id=id, _session=session, title="", last_updated="", category_name="")
         if update:
             new.update()