up

Author: EricDing618

README.md

@@ -46,19 +46,12 @@ python ./src/stp.py -c ./../../tests/allblocks.sb3 --run -sl --tree -st
 ## merge.py
 ### 描述
 - merge.py是一个将两个`.sb3`文件合并为一个文件的脚本。
-# 第三方库&软件
-库：
-- loguru==0.7.2
-- cairosvg==2.7.1
-- pillow==9.5.0
-- pygame-ce==2.5.2
-- numpy==1.26.2
-- colorama==0.4.6
-
-软件：
-- GTK+ 3.24.31
-
-若您还没有安装这些第三方库或已经遇到了`ImportError`，请使用`pip install -r requirements.txt`，以及解压并安装`dependencies`分支下的软件（仅支持Windows x64）。
+# 安装依赖
+- 在根目录下执行：  
+```bash
+pip install -r requirements.txt
+```
+- 解压并安装`dependencies`分支下的软件（仅支持Windows x64）。
 ## 报错解决
 - `ImportError`：详见**第三方库&软件**。
 

requirements.txt

@@ -3,4 +3,5 @@ cairosvg==2.7.1
 pillow==9.5.0
 pygame-ce==2.5.2
 numpy==1.26.2
-colorama==0.4.6
+colorama==0.4.6
+js2py==0.74

src/__STP/config.py

@@ -1,18 +1,22 @@
-import sys,pathlib
+import os,sys,pathlib
+from ast import literal_eval as safe_eval
+import json
+import time
+from textwrap import dedent
+from typing import Any,Optional,Union,Tuple
+from string import digits
+
 def repath(path:str):
     return str(pathlib.Path(path).resolve(strict=True))
 def init_path():
     sys.path.append(repath("../.."))
+
 from numpy import array,where    
 from loguru import logger as log
+#from js2py import translate_js
+#import jiphy as jp
 log.remove()
 
-import json
-import os,sys,time
-from textwrap import dedent
-from typing import Any,Optional,Union,Tuple
-from string import digits
-
 THISPATH=os.getcwd()
 LOCALDATE=time.strftime('%Y-%m-%d_%H：%M',time.localtime(time.time()))
 LOGFORMAT="<level>[{time:YYYY-MM-DD HH:mm:ss}] [{level}]: {message}</level>"

src/__STP/core.py

@@ -1,7 +1,7 @@
 from .config import USERSET,json,SPRITE_INIT_CODE,GAME_INIT_CODE,HEAD,Any,Union,Tuple,digits,repath,init_path
 init_path()
 from .mypath import log,UnPackingScratch3File,PathTool
-from .spectype import FuncParser,ID,BlockBuffer,NestParser,VarListParser
+from .spectype import FuncParser,ID,BlockBuffer,InputParser,VarListParser
 
 class CodeParser:
     def __init__(self,last:UnPackingScratch3File):
@@ -15,18 +15,7 @@ def __init__(self,last:UnPackingScratch3File):
         self.t=PathTool(self.cdir)
         with open(self.t.join((self.cdir,"project.json")),'r',encoding='utf-8') as f: #导入project.json
             self.pj=json.load(f)
-        self.semver=self.pj['meta']['semver']
-        self.vmver=self.pj['meta']['vm']
-        self.agent=self.pj['meta']['agent']
-        self.platform_name=self.pj['meta']['platform']['name']
-        self.platform_url=self.pj['meta']['platform']['url']
-        log.debug("="*40)
-        log.debug(f"Project version: {self.semver}")
-        log.debug(f"VM version: {self.vmver}")
-        log.debug(f"Agent: {self.agent if self.agent else 'unknown'}")
-        log.debug(f'Platform name: {self.platform_name}')
-        log.debug(f'Platform url: {self.platform_url}')
-        log.debug("="*40)
+        self.baseinfo={"semver":self.pj['meta']['semver'],"vm":self.pj['meta']['vm'],"agent":self.pj['meta']['agent'],"platform_name":self.pj['meta']['platform']['name'],"platform_url":self.pj['meta']['platform']['url']}
         self.last=last
         self.mod={"internal":{"typing":["",["Any"]],"math":["",[]],"random":["",[]],"sys":["",[]],"threading":["",["Thread","Timer"]]},"third-party":{"pygame":["pg",[]]}} #根据情况导入所需要的库
         self.var={"public":{},"private":{}} #存储变量
@@ -134,7 +123,7 @@ def fstr(self,string:str|dict="",mode=0,args=()):
         mode=4: 游戏基础信息，string为代码，args不填  
         mode=5: 列表、变量管理，string为代码，args不填  
         mode=6: 嵌套类型管理，string为代码，args为每个的嵌套深度  
-        mode=7: 两者运算类，args为（inputs开头参数名，运算符）  
+        mode=7: 含参类，args为（inputs开头参数名，运算符）  
         '''
         args=list(str(i) for i in args)
         match mode:
@@ -257,10 +246,9 @@ def write_result(self):
                     self.code.append(f"    def {funcname}(self):")
                 if funcinfo[1]: #有代码
                     for line,depth in funcinfo[1].items():
-                        if line.startswith('id='):
-                            code=self.buffer.buffer.get(line[3:],[])
-                            if code:
-                                self.code.append('    '*(depth+2)+''.join(code))
+                        if line.startswith('id='): #输入类型占位标识
+                            code=self.buffer.get(line[3:])
+                            self.code.append('    '*(depth+2)+code)
                         self.code.append('    '*(depth+2)+line)
                     self.code.append("")
                 else: #无代码
@@ -288,6 +276,7 @@ def write_result(self):
 
     def code_tree(self):
         return {
+            "project_info": self.baseinfo,
             "import_modules": self.mod,
             "requirements": self.requirements,
             "variables": self.var,

src/__STP/frame/spriteframe.py

@@ -2,6 +2,17 @@
 import sys,math,random
 from threading import Timer,Thread
 
+class JSObject:
+    def __init__(self,obj):
+        self.obj=obj
+    def __eq__(self,other):
+        return str(self.obj)==str(other.obj)
+    def __ne__(self,other):
+        return str(self.obj)!=str(other.obj)
+    def __str__(self):
+        return str(self.obj)
+    def __repr__(self):
+        return str(self.obj)
 class Sprite(pg.sprite.Sprite,Thread): #角色框架
     def __init__(self, image_file:tuple[str], initxy:tuple[int,int], direction:int):
         super().__init__()

src/__STP/spectype.py

@@ -1,4 +1,4 @@
-from .config import Tuple,Union,init_path
+from .config import Tuple,Union,init_path,safe_eval
 init_path()
 from src.util import is_spcial
 
@@ -12,8 +12,8 @@ def __init__(self):
         self.buffer={}
     def add(self,id:str,value:tuple):
         self.buffer[id]=value
-    def get(self,id:str):
-        return self.buffer.get(id)
+    def get(self,id:str,default=[]):
+        return ''.join(self.buffer.get(id,default))
     def update(self):
         b1=self.buffer.copy()
         for id,values in b1.items():
@@ -50,12 +50,14 @@ def bigupdate(self,_id="",values=(),recursive=False):
         if recursive:
             return a
 
-class NestParser:
-    def __init__(self,blocks:dict,block:dict,baseblock:dict):
+class InputParser:
+    def __init__(self,blocks:dict,buffer:BlockBuffer):
         """
-        解析嵌套型积木块，生成python代码。
+        解析含参型积木块，生成python代码。
         """
         self.blocks=blocks
+        self.buffer=buffer
+        self.code=[]
 
 class VarListParser:
     def __init__(self,blocks:dict):
@@ -87,7 +89,7 @@ def __init__(self,blocks:dict,baseblock:dict):
         self.funcname='_'+'_'.join(self.name)
     def isidentifier(self,s:str):
         """
-        判断字符串是否为合法的标识符。
+        判断参数字符串是否为合法的标识符。
         """
         r=True
         for i in '!@#$%^&*()/\\+-=[]{}|;:,.<>?':
@@ -100,7 +102,7 @@ def create(self,funccode:dict):
         self.funccode=funccode
         if self.funcname not in self.funccode: #创建函数
             self.funccode[self.funcname]=[{},{}]
-        for argname,argdefault,argtype in zip(eval(self.funcmuta['argumentnames']),eval(self.funcmuta['argumentdefaults']),self.argtypes):
+        for argname,argdefault,argtype in zip(safe_eval(self.funcmuta['argumentnames']),safe_eval(self.funcmuta['argumentdefaults']),self.argtypes):
             self.funccode[self.funcname][0][argname.replace(' ','_')]=[argdefault,self.type.get(argtype,'Any')] #type: ignore 
 
     def addcode(self,free=False,args:Union[str,Tuple[str,...]]="",opcode:str="",depth:int=0):

src/stp.py

@@ -19,7 +19,7 @@ def main(fp:str='./tests/work1.sb3',args:ap.Namespace=ap.Namespace()):
         parser=CodeParser(info)
         parser.write_result()
         log.success(f"Converted successfully (in {repath(parser.outpyfile)}) .")
-        log.debug(f"Time used: {time.time()-start}s") #仅为积木转换时间，不包括解压缩及资源格式转换时间，与积木数量有关
+        log.success(f"Time used: {time.time()-start}s") #仅为积木转换时间，不包括解压缩及资源格式转换时间，与积木数量有关
         if args.tree:
             log.debug('Showing the code tree...')
             for i,j in parser.code_tree().items():

tests/blocktest.sb3

@@ -51,10 +51,7 @@ def __init__(self):
 class spr_角色1(Sprite):
     def __init__(self):
         super().__init__()
-        id=a
 
-    def _1(self):
-        ...
 
 
 class Game: