scratchattach 2.1.10a3__py3-none-any.whl → 2.1.12__py3-none-any.whl

scratchattach/cloud/_base.py

@@ -142,7 +142,7 @@ class WebSocketEventStream(EventStream):
         i = 0
         with self.reading:
             try:
-                self.receive_new(True)
+                self.receive_new(amount != -1)
                 while (self.packets_left and amount == -1) or (amount != -1 and i < amount):
                     if not self.packets_left and amount != -1:
                         self.receive_new()
@@ -150,7 +150,7 @@ class WebSocketEventStream(EventStream):
                     i += 1
             except Exception:
                 self.source_cloud.reconnect()
-                self.receive_new(True)
+                self.receive_new(amount != -1)
                 while (self.packets_left and amount == -1) or (amount != -1 and i < amount):
                     if not self.packets_left and amount != -1:
                         self.receive_new()

scratchattach/eventhandlers/cloud_requests.py

@@ -23,7 +23,7 @@ class Request:
         self.enabled = enabled
         self.response_priority = response_priority
         self.cloud_requests = cloud_requests # the corresponding CloudRequests object
-        self.debug = debug
+        self.debug = debug or self.cloud_requests.debug
         
     def __call__(self, received_request):
         if not self.enabled:
@@ -63,7 +63,7 @@ class CloudRequests(CloudEvents):
 
     # The CloudRequests class is built upon CloudEvents, similar to how Filterbot is built upon MessageEvents
 
-    def __init__(self, cloud, used_cloud_vars=["1", "2", "3", "4", "5", "6", "7", "8", "9"], no_packet_loss=False, respond_order="receive"):
+    def __init__(self, cloud, used_cloud_vars=["1", "2", "3", "4", "5", "6", "7", "8", "9"], no_packet_loss=False, respond_order="receive", debug=False):
         super().__init__(cloud)
         # Setup
         self._requests = {}
@@ -73,6 +73,7 @@ class CloudRequests(CloudEvents):
         self.no_packet_loss = no_packet_loss # When enabled, query the clouddata log regularly for missed requests and reconnect after every single request (reduces packet loss a lot, but is spammy and can make response duration longer)
         self.used_cloud_vars = used_cloud_vars
         self.respond_order = respond_order
+        self.debug = debug
 
         # Lists and dicts for saving request-related stuff
         self.request_parts = {} # Dict (key: request_id) for saving the parts of the requests not fully received yet
@@ -99,7 +100,7 @@ class CloudRequests(CloudEvents):
 
     # -- Adding and removing requests --
 
-    def request(self, function=None, *, enabled=True, name=None, thread=True, response_priority=0):
+    def request(self, function=None, *, enabled=True, name=None, thread=True, response_priority=0, debug=False):
         """
         Decorator function. Adds a request to the request handler.
         """
@@ -113,7 +114,8 @@ class CloudRequests(CloudEvents):
                 thread=thread,
                 response_priority=response_priority,
                 on_call=function,
-                cloud_requests=self
+                cloud_requests=self,
+                debug=debug
             )
 
         if function is None:

scratchattach/site/activity.py

@@ -14,9 +14,9 @@ class Activity(BaseSiteComponent):
     """
 
     def __repr__(self):
-        return repr(self.raw)
+        return f"Activity({repr(self.raw)})"
 
-    def str(self):
+    def __str__(self):
         return str(self.raw)
 
     def __init__(self, **entries):

scratchattach/site/project.py

@@ -136,8 +136,6 @@ class PartialProject(BaseSiteComponent):
         """
         self._assert_auth()
 
-        global CREATE_PROJECT_USES
-
         if title is None:
             if "title" in self.__dict__:
                 title = self.title+" remix"

{scratchattach-2.1.10a3.dist-info → scratchattach-2.1.12.dist-info}/METADATA

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

{scratchattach-2.1.10a3.dist-info → scratchattach-2.1.12.dist-info}/RECORD

@@ -1,6 +1,6 @@
 scratchattach/__init__.py,sha256=2iiV0SghFUyJJrJYt668cSoDrxSjLCWNtzMdhttnMdA,1532
 scratchattach/cloud/__init__.py,sha256=MN7s4grQcciqUO7TiFjTbU2sC69m6XXlwOHNRbN3FKo,41
-scratchattach/cloud/_base.py,sha256=gMaZkiNL0MW7TjSmn_2d8en4GFYF5Bxyy-pPENKrBGc,17753
+scratchattach/cloud/_base.py,sha256=3Kc1VKX6ogDqyItLUbHPom9DeGq7EUjpS0bjr-JuTHQ,17769
 scratchattach/cloud/cloud.py,sha256=TcIcY0tMe1jRdzxJrz6AIL0gW9xeMc9x4vNUCvBbRWY,7735
 scratchattach/editor/__init__.py,sha256=gfTQrtyQ-oZJBanp-5eNae72cwm4WoKHzNtZ4rn1dqg,727
 scratchattach/editor/asset.py,sha256=jNXJA09hU5b4ZTLegu7c0azlwHo5k_XZJfDN24uDux8,6078
@@ -28,7 +28,7 @@ scratchattach/eventhandlers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 scratchattach/eventhandlers/_base.py,sha256=8NjYF7qOEhjUFksA0qKg4XDH5aXgEG5PSVgMAYDbGD4,3078
 scratchattach/eventhandlers/cloud_events.py,sha256=iaUFo58D5JUCHstch2VhmhqMPq8WX_xrzPelFMCFRF8,4084
 scratchattach/eventhandlers/cloud_recorder.py,sha256=o4wcWJFCddpcSsPx5YU2DFFMFoKUknKM2RQ36HLpheQ,800
-scratchattach/eventhandlers/cloud_requests.py,sha256=Xmh_UmmgqM16OWduQo83-VqcSDfImOtUY8ur0y_4tQo,22080
+scratchattach/eventhandlers/cloud_requests.py,sha256=jW3tLpfNmgsVuac5Y7vqx--qu1nQxytTV71Dx6ejGfU,22191
 scratchattach/eventhandlers/cloud_server.py,sha256=tah77FTr1Kp4DWpux48w8pJNZQL_1qL0hAXaAXlzQ9Y,12266
 scratchattach/eventhandlers/cloud_storage.py,sha256=9dvKPxbPZ_hBhw1HYlTl72YJmBo2OMwrSrMQ7kQwwOE,4660
 scratchattach/eventhandlers/combine.py,sha256=2n5SC6tSpgrmmK04sqsm4eqx26O9haBKA5YgsWNIoso,895
@@ -39,14 +39,14 @@ scratchattach/other/other_apis.py,sha256=7EyB3uB-1AYAH7Nb6eZ3VmACGdXvEQ39NJ1iahU
 scratchattach/other/project_json_capabilities.py,sha256=qSlJIJOgAxhSchD3fOIhK57rCe0_GrHadXBs5UXKuFU,22622
 scratchattach/site/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scratchattach/site/_base.py,sha256=S-ynYKe7LslZxaZzE0hZsga0eLB2XlQo5erAfKct8yc,2193
-scratchattach/site/activity.py,sha256=a019lhoUwL9mdZI1Sz9mMg9EsDt2Lp5ziJSSDQ8-BWM,14319
+scratchattach/site/activity.py,sha256=fczH9_v5CoFuMTobm7BcbnMy2scf9c2ZjzfIqBEOBes,14338
 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/project.py,sha256=_yMzacrTiy_LYfyEfWVeoHRHm5t9vBUr88eR_ULcK7Q,30931
 scratchattach/site/session.py,sha256=mP4tTSZUs9dz0e3Zk6JF9RmSizFaYExbbEEYmA5TBnM,48278
 scratchattach/site/studio.py,sha256=Tv7AY1TwvlQpR9VjUEs-qmavrZsLxchkXk59aoH0_EI,22918
 scratchattach/site/user.py,sha256=TCO1QRtPeJdb3p-ziCwa6NqObHSNP0DMmcOl5De-Yl8,34496
@@ -56,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.10a3.dist-info/licenses/LICENSE,sha256=1PRKLhZU4wYt5M-C9f7q0W3go3u_ojnZMNOdR3g3J-E,1080
-scratchattach-2.1.10a3.dist-info/METADATA,sha256=RzReJUHflsgc5P29JhmZkHG3eAMMkKRre5dK9LOD_Ms,5465
-scratchattach-2.1.10a3.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-scratchattach-2.1.10a3.dist-info/top_level.txt,sha256=gIwCwW39ohXn0JlnvSzAjV7VtL3qPlRnHiRqBbxsEUE,14
-scratchattach-2.1.10a3.dist-info/RECORD,,
+scratchattach-2.1.12.dist-info/licenses/LICENSE,sha256=1PRKLhZU4wYt5M-C9f7q0W3go3u_ojnZMNOdR3g3J-E,1080
+scratchattach-2.1.12.dist-info/METADATA,sha256=lvyNTW5sZGd0G6koIl1te2esiF4Y8oadiXZ_K9tcBQM,5463
+scratchattach-2.1.12.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+scratchattach-2.1.12.dist-info/top_level.txt,sha256=gIwCwW39ohXn0JlnvSzAjV7VtL3qPlRnHiRqBbxsEUE,14
+scratchattach-2.1.12.dist-info/RECORD,,