Merge branch 'main' of https://github.com/TimMcCool/scratchattach

Author: faretek1

.github/workflows/deploy-website.yml

@@ -0,0 +1,84 @@
+name: Deploy website
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'website/**'
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    environment: release
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      deployments: write
+      statuses: write
+      pull-requests: write
+
+    steps:
+      - name: Checkout main branch
+        uses: actions/checkout@v4
+
+      - name: Deploy website directory to website branch
+        uses: peaceiris/actions-gh-pages@v4
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./website
+          publish_branch: website
+          keep_files: true
+          destination_dir: api
+          user_name: 'github-actions[bot]'
+          user_email: 'github-actions[bot]@users.noreply.github.com'
+          commit_message: ${{ github.event.head_commit.message }}
+
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v3
+        with:
+          python-version: "3.12"
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+          pip install cryptography scratchattach
+
+      - name: Generate and mask Vercel secrets
+        id: generate_vars
+        env:
+          FERNET_KEY: ${{ secrets.FERNET_KEY }}
+        run: |
+          cd tests
+          # Extract secrets securely
+          vercel_token_val=$(python -m util vercel | sed -n '1p')
+          org_id_val=$(python -m util vercel | sed -n '2p')
+          project_id_val=$(python -m util vercel | sed -n '3p')
+
+          # Mask values so they never appear in logs
+          echo "::add-mask::$vercel_token_val"
+          echo "::add-mask::$org_id_val"
+          echo "::add-mask::$project_id_val"
+
+          # Store them as environment variables (scoped to this job)
+          echo "vercel_token=$vercel_token_val" >> $GITHUB_ENV
+          echo "org_id=$org_id_val" >> $GITHUB_ENV
+          echo "project_id=$project_id_val" >> $GITHUB_ENV
+
+          cd ..
+        shell: bash
+
+      - name: Checkout website branch
+        uses: actions/checkout@v4
+        with:
+          ref: 'website'
+
+      - uses: nexterias/actions-vercel@v1
+        id: vercel
+        with:
+          token: ${{ env.vercel_token }}
+          org-id: ${{ env.org_id }}
+          project-id: ${{ env.project_id }}
+          production: true
+          prebuilt: true

.python-version

@@ -1 +1 @@
-3.12.5
+3.12.12

scratchattach/editor/blockshape.py

@@ -5,7 +5,7 @@
 
 # Perhaps this should be merged with pallete.py
 from dataclasses import dataclass
-from typing import Final
+from typing import Final, Literal
 
 from . import commons
 from scratchattach.utils.enums import _EnumWrapper
@@ -20,7 +20,7 @@ def __bool__(self):
         raise TypeError("Need mutation data to work out attribute value.")
 
 
-MUTATION_DEPENDENT: Final[_MutationDependent] = _MutationDependent()
+MUTATION_DEPENDENT: Final[Literal[_MutationDependent.INSTANCE]] = _MutationDependent.INSTANCE
 """Value used when mutation data is required to work out the attribute value"""
 
 

scratchattach/editor/commons.py

@@ -141,53 +141,5 @@ def get_name_nofldr(name: str) -> str:
     else:
         return name[len(fldr) + 2:]
 
+Singleton = Enum
 
-class SingletonMeta(EnumMeta):
-
-    def __call__(self, value=0, *args, **kwds):
-        if value != 0:
-            raise ValueError("Value must be 0.")
-        old_bases = self.__bases__
-        self.__bases__ = old_bases + (Enum,)
-        result = super().__call__(value, *args, **kwds)
-        self.__bases__ = old_bases
-        return result
-
-
-if TYPE_CHECKING:
-    Singleton = Enum
-else:
-    class Singleton(metaclass=SingletonMeta):
-
-        def __new__(cls, val=None):
-            if cls is Singleton:
-                raise TypeError("Singleton cannot be created directly.")
-            if hasattr(cls, "INSTANCE"):
-                return getattr(cls, "INSTANCE")
-            if val == 0:
-                return super().__new__(cls)
-            raise TypeError("Has no instance.")
-
-        def __init__(self, *args, **kwds):
-            pass
-
-        def __repr__(self):
-            return self.__class__.__name__
-
-        def __str__(self):
-            return self.__class__.__name__
-
-        def __format__(self, format_spec):
-            return str.__format__(str(self), format_spec)
-
-        def __hash__(self):
-            return hash(self.__class__)
-
-        def __reduce_ex__(self, proto):
-            return self.__class__, ()
-
-        def __deepcopy__(self, memo):
-            return self
-
-        def __copy__(self):
-            return self

scratchattach/eventhandlers/cloud_storage.py

@@ -105,7 +105,6 @@ def get(self, db_name, key) -> str:
                 return f"Error: Key {key} doesn't exist in database {db_name}"
 
     def set(self, db_name, key, value):
-        print(db_name, key, value, self._databases)
         return self.get_database(db_name).set(key, value)
 
     def keys(self, db_name) -> list:
@@ -133,4 +132,4 @@ def save(self):
         Saves the data in the JSON files for all databases in self._databases
         """
         for dbname in self._databases:
-            self._databases[dbname].save_to_json()
+            self._databases[dbname].save_to_json()

scratchattach/site/project.py

@@ -326,7 +326,7 @@ def load_description(self):
 
     # -- Project contents (body/json) -- #
 
-    def download(self, *, filename=None, dir=""):
+    def download(self, *, filename=None, dir="."):
         """
         Downloads the project json to the given directory.
 
@@ -338,14 +338,15 @@ def download(self, *, filename=None, dir=""):
             if filename is None:
                 filename = str(self.id)
             if not (dir.endswith("/") or dir.endswith("\\")):
-                dir = dir + "/"
+                dir += "/"
             self.update()
             response = requests.get(
                 f"https://projects.scratch.mit.edu/{self.id}?token={self.project_token}",
                 timeout=10,
             )
-            filename = filename.replace(".sb3", "")
-            open(f"{dir}{filename}.sb3", "wb").write(response.content)
+            filename = filename.removesuffix(".sb3")
+            with open(f"{dir}{filename}.sb3", "wb") as f:
+                f.write(response.content)
         except Exception:
             raise (
                 exceptions.FetchError(

tests/test_studio.py

@@ -12,7 +12,7 @@ def test_studio():
     sess = session()
 
     studio = sess.connect_studio(34253687)
-    assert studio.get_exact_project_count() == 1251
+    assert studio.get_exact_project_count() == 1250
 
     studio = sess.connect_studio(50809872)
 

tests/util/__init__.py

@@ -42,3 +42,4 @@ def teacher_session() -> Optional[_Session]:
         _teacher_session = login(data["username"], data["password"])
 
     return _teacher_session
+

tests/util/__main__.py

@@ -6,8 +6,10 @@
 
 try:
     from .keyhandler import FERNET
-except ImportError:
+    from .vercelauth import vercel_auth
+except ImportError as excp:
     from keyhandler import FERNET
+    from vercelauth import vercel_auth
 
 
 def gen_keystr():
@@ -28,6 +30,8 @@ class Args(argparse.Namespace):
             decrypt.add_argument("content", nargs="?")
         if keygen := command.add_parser("keygen", help="Generate a key. You could set this to $FERNET_KEY if you want"):
             ...
+        if vercelauth := command.add_parser("vercel", help="Output the vercel auth data."):
+            ...
 
     args = parser.parse_args(namespace=Args())
 
@@ -44,6 +48,11 @@ class Args(argparse.Namespace):
 
         case "keygen":
             print(gen_keystr())
+            
+        case "vercel":
+            print(
+                "\n".join(vercel_auth())
+            )
 
 
 if __name__ == "__main__":

tests/util/auth.toml

@@ -12,3 +12,8 @@ scratchattachv2 = "gAAAAABozo75u7Eov4zakrObMqLVs6wmwSNXQ7KroU5ntU7vZvM49fW-RnEWl
 [teacher_auth]
 username = "gAAAAABo2AwGrm5MsCqFTz7yPBZf8F--b3529aCsi9olynL0DKBi5EllZR1jNtsTt4vUPdke7eyEHBToMfN00QgxAU4RmlH3GCAK4TpXs7Qd7eI4iGD1hIU="
 password = "gAAAAABo2AwLc-oRH45T6V-xlcpbaqH4Ds93nMCrMbgUv_AHoQhTO1L7NkU54npm54-Zjs7YVlkOSFS5kffWzJeMZB7maNAv1WKnHJ4YvzF_R7PlIaeIBa8="
+
+[vercel_auth]
+vercel_token = "gAAAAABpB06MNHj6aq9DvD4NVe5KhC5wKn4yopSimtUKVDz1VvuE430xn2eytrLV0JtN05coZEg_ZjZ4Hekw3S2CjbN9pFLN61vsy87BsnPi-IemLTobQoY="
+org_id = "gAAAAABpB069BVBM7X0-TTS-VXv4rDcdGVb7Z3n2EWM73SHFv7gHQpBMtxoe2SLZf6OD1K5B1TGgC-52NwPOwKgA78Jt3WfQuGpL88El2MnUmdaoqvrn2OI="
+project_id = "gAAAAABpB04hpAEZdZT6LLvWEzibe-Vi3tORO_STdGUOSq4HwVids23UhKoHJSi9d9z-_5ULq7DO5h37kJ7GbcpjfDS85b7IGgHmQu-Z1FT_rLYsHnhAMGKLIKEuXXVV-nLLY7WlDa_0"