scratchattach 2.1.10a1__py3-none-any.whl → 2.1.10a2__py3-none-any.whl

scratchattach/__init__.py

@@ -19,10 +19,11 @@ from .site.comment import Comment
 from .site.cloud_activity import CloudActivity
 from .site.forum import ForumPost, ForumTopic, get_topic, get_topic_list, youtube_link_to_scratch
 from .site.project import Project, get_project, search_projects, explore_projects
-from .site.session import Session, login, login_by_id, login_by_session_string
+from .site.session import Session, login, login_by_id, login_by_session_string, login_by_io, login_by_file, login_from_browser
 from .site.studio import Studio, get_studio, search_studios, explore_studios
 from .site.classroom import Classroom, get_classroom
 from .site.user import User, get_user
 from .site._base import BaseSiteComponent
+from .site.browser_cookies import Browser, ANY, FIREFOX, CHROME, CHROMIUM, VIVALDI, EDGE, EDGE_DEV, SAFARI
 
 from . import editor

scratchattach/site/browser_cookies.py

@@ -0,0 +1,55 @@
+from typing import Optional
+from http.cookiejar import CookieJar
+from enum import Enum, auto
+browsercookie_err = None
+try:
+    import browsercookie
+except Exception as e:
+    browsercookie = None
+    browsercookie_err = e
+
+class Browser(Enum):
+    ANY = auto()
+    FIREFOX = auto()
+    CHROME = auto()
+    EDGE = auto()
+    SAFARI = auto()
+    CHROMIUM = auto()
+    EDGE_DEV = auto()
+    VIVALDI = 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
+
+def cookies_from_browser(browser : Browser = ANY) -> dict[str, str]:
+    """
+    Import cookies from browser to login
+    """
+    if not browsercookie:
+        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()
+    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/session.py

@@ -41,6 +41,7 @@ from ..utils import commons
 from ..utils import exceptions
 from ..utils.commons import headers, empty_project_json, webscrape_count, get_class_sort_mode
 from ..utils.requests import Requests as requests
+from .browser_cookies import Browser, ANY, cookies_from_browser
 
 ratelimit_cache: dict[str, list[float]] = {}
 
@@ -1132,3 +1133,12 @@ def login_by_file(file: FileDescriptorOrPath) -> Session:
     """
     with suppress_login_warning(), open(file, encoding="utf-8") as f:
         return login_by_io(f)
+
+def login_from_browser(browser: Browser = ANY):
+    """
+    Login from a browser
+    """
+    cookies = cookies_from_browser(browser)
+    if "scratchsessionsid" in cookies:
+        return login_by_id(cookies["scratchsessionsid"])
+    raise ValueError("Not enough data to log in.")

{scratchattach-2.1.10a1.dist-info → scratchattach-2.1.10a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scratchattach
-Version: 2.1.10a1
+Version: 2.1.10a2
 Summary: A Scratch API Wrapper
 Home-page: https://scratchattach.tim1de.net
 Author: TimMcCool

{scratchattach-2.1.10a1.dist-info → scratchattach-2.1.10a2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-scratchattach/__init__.py,sha256=rxdgt-IHdgd7shMTBNZVi15sma_CqZmUcrzIV6QD89Y,1377
+scratchattach/__init__.py,sha256=2iiV0SghFUyJJrJYt668cSoDrxSjLCWNtzMdhttnMdA,1532
 scratchattach/cloud/__init__.py,sha256=MN7s4grQcciqUO7TiFjTbU2sC69m6XXlwOHNRbN3FKo,41
 scratchattach/cloud/_base.py,sha256=gMaZkiNL0MW7TjSmn_2d8en4GFYF5Bxyy-pPENKrBGc,17753
 scratchattach/cloud/cloud.py,sha256=TcIcY0tMe1jRdzxJrz6AIL0gW9xeMc9x4vNUCvBbRWY,7735
@@ -41,12 +41,13 @@ scratchattach/site/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 scratchattach/site/_base.py,sha256=tvzDXU9C4ZOT1JonK_h1UP-atllao7vIN7NopbazXuY,2130
 scratchattach/site/activity.py,sha256=a019lhoUwL9mdZI1Sz9mMg9EsDt2Lp5ziJSSDQ8-BWM,14319
 scratchattach/site/backpack_asset.py,sha256=V_ypvTi-hqf0LF8zks2uHIicraBssc1_eEHVqHMzikc,3286
+scratchattach/site/browser_cookies.py,sha256=aaYLawtifngZ0pgaXHjBiWvYHUfflS8ZcXRjTTrge3A,1566
 scratchattach/site/classroom.py,sha256=WKMOcmYzKZx_EZNR4qipHOB8nxaggFe84lxqnrWd24E,16463
 scratchattach/site/cloud_activity.py,sha256=ie_DhChicks_RBagMM6_GfFIi1iAxf6UtJ3VFXC8StM,4159
 scratchattach/site/comment.py,sha256=Yt86iqwKZhCKNTEvB9DNDj9mXRV6A9qXyy1MrE7rMnA,8377
 scratchattach/site/forum.py,sha256=BZ_2jqDW3o-22AG1vP9s1W7l9yBbjBkFqG_DGV9IDuA,14802
 scratchattach/site/project.py,sha256=Mi5TAu31O07-Ue6N1jd_hwFwVpoTlzCdVBLv-xx7le4,30967
-scratchattach/site/session.py,sha256=iCmcnPKdwST52eZWo8qhHzJRdWPgp5eH-4g11eJRk9Y,47933
+scratchattach/site/session.py,sha256=mP4tTSZUs9dz0e3Zk6JF9RmSizFaYExbbEEYmA5TBnM,48278
 scratchattach/site/studio.py,sha256=Tv7AY1TwvlQpR9VjUEs-qmavrZsLxchkXk59aoH0_EI,22918
 scratchattach/site/user.py,sha256=fqXkUqKJWN4fUj4Wgnk27EYbEifrPAFvtz8WFkxvnvQ,34546
 scratchattach/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -55,8 +56,8 @@ scratchattach/utils/encoder.py,sha256=rqJfQ5gmjf7s8aTiGhR0W1ejYN5tHbAgJlxv7JhGqZ
 scratchattach/utils/enums.py,sha256=93ylCrxWycunahISSIjBqTIJ2r1Hb2b9RMvvzmUiQ-c,8294
 scratchattach/utils/exceptions.py,sha256=hrnPuXRRwR-kTHnrQVyfAD6PDOg1hZQd-jaXuUSNKSQ,6274
 scratchattach/utils/requests.py,sha256=x_EfcbLdBpQQuH9g4MMSaM8RN3tUm9OtzPEJQQiwilY,2709
-scratchattach-2.1.10a1.dist-info/licenses/LICENSE,sha256=1PRKLhZU4wYt5M-C9f7q0W3go3u_ojnZMNOdR3g3J-E,1080
-scratchattach-2.1.10a1.dist-info/METADATA,sha256=HlH2zqwDCTUIOHGH0UYbhZAg-EqbZf5-vqNJDXMP3J4,5465
-scratchattach-2.1.10a1.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-scratchattach-2.1.10a1.dist-info/top_level.txt,sha256=gIwCwW39ohXn0JlnvSzAjV7VtL3qPlRnHiRqBbxsEUE,14
-scratchattach-2.1.10a1.dist-info/RECORD,,
+scratchattach-2.1.10a2.dist-info/licenses/LICENSE,sha256=1PRKLhZU4wYt5M-C9f7q0W3go3u_ojnZMNOdR3g3J-E,1080
+scratchattach-2.1.10a2.dist-info/METADATA,sha256=YJAMgHg-_9oEuppoOEqdiHaukO3_W--R1y4k-xtgJsE,5465
+scratchattach-2.1.10a2.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+scratchattach-2.1.10a2.dist-info/top_level.txt,sha256=gIwCwW39ohXn0JlnvSzAjV7VtL3qPlRnHiRqBbxsEUE,14
+scratchattach-2.1.10a2.dist-info/RECORD,,