scratchattach 2.1.10a1__tar.gz → 2.1.10a3__tar.gz

{scratchattach-2.1.10a1 → scratchattach-2.1.10a3}/PKG-INFO

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

{scratchattach-2.1.10a1 → scratchattach-2.1.10a3}/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.10a1 → scratchattach-2.1.10a3}/scratchattach/site/_base.py

@@ -4,9 +4,10 @@ from abc import ABC, abstractmethod
 
 import requests
 from ..utils import exceptions, commons
+from typing import TypeVar
 from types import FunctionType
 
-
+C = TypeVar("C", bound="BaseSiteComponent")
 class BaseSiteComponent(ABC):
     @abstractmethod
     def __init__(self):
@@ -51,7 +52,7 @@ class BaseSiteComponent(ABC):
             raise exceptions.Unauthenticated(
                 "You need to use session.connect_xyz (NOT get_xyz) in order to perform this operation.")
 
-    def _make_linked_object(self, identificator_id, identificator, Class, NotFoundException) -> BaseSiteComponent:
+    def _make_linked_object(self, identificator_id, identificator, Class: type[C], NotFoundException) -> C:
         """
         Internal function for making a linked object (authentication kept) based on an identificator (like a project id or username)
         Class must inherit from BaseSiteComponent

scratchattach-2.1.10a3/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.10a1 → scratchattach-2.1.10a3}/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 → scratchattach-2.1.10a3}/scratchattach/site/user.py

@@ -19,6 +19,17 @@ from . import activity
 
 from ..utils.requests import Requests as requests
 
+class Verificator:
+
+    def __init__(self, user: User, project_id: int):
+        self.project = user._make_linked_object("id", project_id, project.Project, exceptions.ProjectNotFound)
+        self.projecturl = self.project.url
+        self.code = ''.join(random.choices(string.ascii_letters + string.digits, k=8))
+        self.username = user.username
+
+    def check(self) -> bool:
+        return bool(list(filter(lambda x : x.author_name == self.username and (x.content == self.code or x.content.startswith(self.code) or x.content.endswith(self.code)), self.project.comments())))
+
 class User(BaseSiteComponent):
 
     '''
@@ -799,20 +810,8 @@ class User(BaseSiteComponent):
         It will return True if the user commented the code.
         """
 
-        class Verificator:
-
-            def __init__(self, user):
-                self.project = user._make_linked_object("id", verification_project_id, project.Project, exceptions.ProjectNotFound)
-                self.projecturl = self.project.url
-                self.code = ''.join(random.choices(string.ascii_letters + string.digits, k=130))
-                self.username = user.username
-
-            def check(self):
-                return list(filter(lambda x : x.author_name == self.username, self.project.comments())) != []
-
-        v = Verificator(self)
-        print(f"{self.username} has to go to {v.projecturl} and comment {v.code} to verify their identity")
-        return Verificator(self)
+        v = Verificator(self, verification_project_id)
+        return v
 
 # ------ #
 

{scratchattach-2.1.10a1 → scratchattach-2.1.10a3}/scratchattach.egg-info/PKG-INFO

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

{scratchattach-2.1.10a1 → scratchattach-2.1.10a3}/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.10a1 → scratchattach-2.1.10a3}/setup.py

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