scratchattach 3.0.0b1__tar.gz → 3.0.0b2__tar.gz

{scratchattach-3.0.0b1 → scratchattach-3.0.0b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scratchattach
-Version: 3.0.0b1
+Version: 3.0.0b2
 Summary: A Scratch API Wrapper
 Author: TimMcCool
 License-Expression: MIT

{scratchattach-3.0.0b1 → scratchattach-3.0.0b2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "scratchattach"
-version = "3.0.0b1"
+version = "3.0.0b2"
 authors = [{ name = "TimMcCool" }]
 description = "A Scratch API Wrapper"
 requires-python = ">= 3.12"
@@ -55,41 +55,47 @@ lark = ["lark"]
 [tool.ruff]
 line-length = 127
 exclude = [
-    ".bzr",
-    ".direnv",
-    ".eggs",
-    ".git",
-    ".git-rewrite",
-    ".hg",
-    ".ipynb_checkpoints",
-    ".mypy_cache",
-    ".nox",
-    ".pants.d",
-    ".pyenv",
-    ".pytest_cache",
-    ".pytype",
-    ".ruff_cache",
-    ".svn",
-    ".tox",
-    ".venv",
-    ".vscode",
-    "__pypackages__",
-    "_build",
-    "buck-out",
-    "build",
-    "dist",
-    "node_modules",
-    "site-packages",
-    "venv",
+  ".bzr",
+  ".direnv",
+  ".eggs",
+  ".git",
+  ".git-rewrite",
+  ".hg",
+  ".ipynb_checkpoints",
+  ".mypy_cache",
+  ".nox",
+  ".pants.d",
+  ".pyenv",
+  ".pytest_cache",
+  ".pytype",
+  ".ruff_cache",
+  ".svn",
+  ".tox",
+  ".venv",
+  ".vscode",
+  "__pypackages__",
+  "_build",
+  "buck-out",
+  "build",
+  "dist",
+  "node_modules",
+  "site-packages",
+  "venv",
 ]
 [tool.ruff.lint]
-select = ["E9", "F63", "F7", "F82"] # , "C901"]  # uncomment to re-enable mccabe complexity - see https://github.com/TimMcCool/scratchattach/issues/566
+select = [
+  "E9",
+  "F63",
+  "F7",
+  "F82",
+] # , "C901"]  # uncomment to re-enable mccabe complexity - see https://github.com/TimMcCool/scratchattach/issues/566
 
 [tool.ruff.lint.mccabe]
 # max-complexity = 10
 
 [tool.setuptools.packages.find]
-where = ["scratchattach"]
+where = ["."]
+include = ["scratchattach*"]
 
 [dependency-groups]
 dev = ["cryptography>=46.0.3", "pytest>=9.0.2"]

scratchattach-3.0.0b2/scratchattach/__init__.py

@@ -0,0 +1,37 @@
+from .cloud.cloud import ScratchCloud, TwCloud, get_cloud, get_scratch_cloud, get_tw_cloud
+from .cloud._base import BaseCloud, AnyCloud
+
+from .eventhandlers.cloud_server import init_cloud_server
+from .eventhandlers._base import BaseEventHandler
+from .eventhandlers.filterbot import Filterbot, HardFilter, SoftFilter, SpamFilter
+from .eventhandlers.cloud_storage import Database
+from .eventhandlers.combine import MultiEventHandler
+
+from .other.other_apis import *
+# from .other.project_json_capabilities import ProjectBody, get_empty_project_pb, get_pb_from_dict, read_sb3_file, download_asset
+from .utils.encoder import Encoding
+from .utils.enums import Languages, TTSVoices
+from .utils.exceptions import (
+    LoginDataWarning,
+    GetAuthenticationWarning,
+    StudioAuthenticationWarning,
+    ClassroomAuthenticationWarning,
+    ProjectAuthenticationWarning,
+    UserAuthenticationWarning)
+
+from .site.activity import Activity, ActivityTypes
+from .site.backpack_asset import BackpackAsset
+from .site.comment import Comment, CommentSource
+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, 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, Rank
+from .site._base import BaseSiteComponent
+from .site.browser_cookies import Browser, ANY, FIREFOX, CHROME, CHROMIUM, VIVALDI, EDGE, EDGE_DEV, SAFARI
+from .site.placeholder import PlaceholderProject, get_placeholder_project, create_placeholder_project
+
+from . import editor

scratchattach-3.0.0b2/scratchattach/__main__.py

@@ -0,0 +1,93 @@
+"""
+Scratchattach CLI. Most source code is in the `cli` directory
+"""
+
+import argparse
+
+from scratchattach import cli
+from scratchattach.cli import db, cmd
+from scratchattach.cli.context import ctx, console
+
+import rich.traceback
+
+rich.traceback.install()
+
+
+# noinspection PyUnusedLocal
+def main():
+    parser = argparse.ArgumentParser(
+        prog="scratch",
+        description="Scratchattach CLI",
+        epilog=f"Running scratchattach CLI version {cli.VERSION}",
+    )
+
+    # Using walrus operator & ifs for artificial indentation
+    if commands := parser.add_subparsers(dest="command"):
+        commands.add_parser("profile", help="View your profile")
+        commands.add_parser("sessions", help="View session list")
+        if login := commands.add_parser("login", help="Login to Scratch"):
+            login.add_argument("--sessid", dest="sessid", nargs="?", default=False, const=True,
+                               help="Login by session ID")
+        if group := commands.add_parser("group", help="View current session group"):
+            if group_commands := group.add_subparsers(dest="group_command"):
+                group_commands.add_parser("list", help="List all session groups")
+                group_commands.add_parser("add", help="Add sessions to group")
+                group_commands.add_parser("remove", help="Remove sessions from a group")
+                group_commands.add_parser("delete", help="Delete current group")
+                if group_copy := group_commands.add_parser("copy", help="Copy current group with a new name"):
+                    group_copy.add_argument("group_name", help="New group name")
+                if group_rename := group_commands.add_parser("rename", help="Rename current group"):
+                    group_rename.add_argument("group_name", help="New group name")
+                if group_new := group_commands.add_parser("new", help="Create a new group"):
+                    group_new.add_argument("group_name")
+                if group_switch := group_commands.add_parser("switch", help="Change the current group"):
+                    group_switch.add_argument("group_name")
+
+    parser.add_argument("-U", "--username", dest="username", help="Name of user to look at")
+    parser.add_argument("-P", "--project", dest="project_id", help="ID of project to look at")
+    parser.add_argument("-S", "--studio", dest="studio_id", help="ID of studio to look at")
+    parser.add_argument("-L", "--session_name", dest="session_name",
+                        help="Name of (registered) session/login to look at")
+
+    args = parser.parse_args(namespace=cli.ArgSpace())
+    cli.ctx.args = args
+    cli.ctx.parser = parser
+
+    match args.command:
+        case "sessions":
+            cmd.sessions()
+        case "login":
+            cmd.login()
+        case "group":
+            cmd.group()
+        case "profile":
+            cmd.profile()
+        case None:
+            if args.username:
+                user = ctx.session.connect_user(args.username)
+                console.print(cli.try_get_img(user.icon, (30, 30)))
+                console.print(user)
+                return
+            if args.studio_id:
+                studio = ctx.session.connect_studio(args.studio_id)
+                console.print(cli.try_get_img(studio.thumbnail, (34, 20)))
+                console.print(studio)
+                return
+            if args.project_id:
+                project = ctx.session.connect_project(args.project_id)
+                console.print(cli.try_get_img(project.thumbnail, (30, 23)))
+                console.print(project)
+                return
+            if args.session_name:
+                if sess := ctx.db_get_sess(args.session_name):
+                    console.print(sess)
+                else:
+                    raise ValueError(f"No session logged in called {args.session_name!r} "
+                                     f"- try using `scratch sessions` to see available sessions")
+                return
+
+            parser.print_help()
+
+
+if __name__ == '__main__':
+    main()

{scratchattach-3.0.0b1/scratchattach → scratchattach-3.0.0b2}/scratchattach.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scratchattach
-Version: 3.0.0b1
+Version: 3.0.0b2
 Summary: A Scratch API Wrapper
 Author: TimMcCool
 License-Expression: MIT

{scratchattach-3.0.0b1/scratchattach → scratchattach-3.0.0b2}/scratchattach.egg-info/SOURCES.txt

@@ -1,6 +1,14 @@
 LICENSE
 README.md
 pyproject.toml
+scratchattach/__init__.py
+scratchattach/__main__.py
+scratchattach.egg-info/PKG-INFO
+scratchattach.egg-info/SOURCES.txt
+scratchattach.egg-info/dependency_links.txt
+scratchattach.egg-info/entry_points.txt
+scratchattach.egg-info/requires.txt
+scratchattach.egg-info/top_level.txt
 scratchattach/cli/__about__.py
 scratchattach/cli/__init__.py
 scratchattach/cli/context.py
@@ -50,12 +58,6 @@ scratchattach/eventhandlers/message_events.py
 scratchattach/other/__init__.py
 scratchattach/other/other_apis.py
 scratchattach/other/project_json_capabilities.py
-scratchattach/scratchattach.egg-info/PKG-INFO
-scratchattach/scratchattach.egg-info/SOURCES.txt
-scratchattach/scratchattach.egg-info/dependency_links.txt
-scratchattach/scratchattach.egg-info/entry_points.txt
-scratchattach/scratchattach.egg-info/requires.txt
-scratchattach/scratchattach.egg-info/top_level.txt
 scratchattach/site/__init__.py
 scratchattach/site/_base.py
 scratchattach/site/activity.py

scratchattach-3.0.0b2/scratchattach.egg-info/top_level.txt

@@ -0,0 +1 @@
+scratchattach

scratchattach-3.0.0b1/scratchattach/scratchattach.egg-info/top_level.txt

@@ -1,7 +0,0 @@
-cli
-cloud
-editor
-eventhandlers
-other
-site
-utils