scratchattach 2.1.10a0__tar.gz → 2.1.10a2__tar.gz

{scratchattach-2.1.10a0 → scratchattach-2.1.10a2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: scratchattach
-Version: 2.1.10a0
+Version: 2.1.10a2
 Summary: A Scratch API Wrapper
 Home-page: https://scratchattach.tim1de.net
 Author: TimMcCool
@@ -24,6 +24,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: summary
 

{scratchattach-2.1.10a0 → scratchattach-2.1.10a2}/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-2.1.10a2/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-2.1.10a0 → scratchattach-2.1.10a2}/scratchattach/site/project.py

@@ -145,7 +145,7 @@ class PartialProject(BaseSiteComponent):
                 title = " remix"
         if project_json is None:
             if "title" in self.__dict__:
-                project_json = self.get_raw_json()
+                project_json = self.raw_json()
             else:
                 project_json = empty_project_json
 

{scratchattach-2.1.10a0 → scratchattach-2.1.10a2}/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.10a0 → scratchattach-2.1.10a2}/scratchattach.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: scratchattach
-Version: 2.1.10a0
+Version: 2.1.10a2
 Summary: A Scratch API Wrapper
 Home-page: https://scratchattach.tim1de.net
 Author: TimMcCool
@@ -24,6 +24,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: summary
 

{scratchattach-2.1.10a0 → scratchattach-2.1.10a2}/scratchattach.egg-info/SOURCES.txt

@@ -49,6 +49,7 @@ scratchattach/site/__init__.py
 scratchattach/site/_base.py
 scratchattach/site/activity.py
 scratchattach/site/backpack_asset.py
+scratchattach/site/browser_cookies.py
 scratchattach/site/classroom.py
 scratchattach/site/cloud_activity.py
 scratchattach/site/comment.py

{scratchattach-2.1.10a0 → scratchattach-2.1.10a2}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import codecs
 import os
 
-VERSION = '2.1.10a0'
+VERSION = '2.1.10a2'
 DESCRIPTION = 'A Scratch API Wrapper'
 LONG_DESCRIPTION = DESCRIPTION