2410191345

app.py

@@ -20,7 +20,6 @@ app.add_middleware(
 
 router = APIRouter()
 processing = False
-defaultZip = None
 
 class TextRequest(BaseModel): text: str
 
@@ -60,22 +59,16 @@ async def load(zip_data: TextRequest):
 
 @router.get('/check')
 async def check():
-    global processing, defaultZip
-    return 'ng' if processing or defaultZip is None else 'ok'
-
-@router.post('/zip')
-async def zip(zip_data: TextRequest):
-    global defaultZip
-    defaultZip = BytesIO(base64.b64decode(zip_data.text))
-    return ''
+    global processing
+    return 'ng' if processing else 'ok'
 
 @router.post('/sb3')
 async def sb3(req_data: TextRequest):
-    global processing, defaultZip
+    global processing
     if processing: return ''
     processing = True
     data = json.loads(req_data.text)
-    with zipfile.ZipFile(defaultZip, 'r') as template_zip:
+    with zipfile.ZipFile('app/public/mmp4.zip', 'r') as template_zip:
         with template_zip.open('project.json') as f:
             project = json.loads(f.read().decode('utf-8'))
 

public/mmp4.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5e79821c3e65e85abf1c6eb8a45cf9143d6844f15e2402f080cd06de018af428
+size 11143447

public/script.js

@@ -160,35 +160,25 @@ const save = async () => {
 const load = async () => {
     const file = document.createElement(`input`);
     file.type = `file`;
-    file.accept = `.mf4,.zip`;
+    file.accept = `.mf4`;
     file.click();
     file.addEventListener(`change`, async () => {
         const fileReader = new FileReader();
         fileReader.addEventListener(`load`, async () => {
             const base64Data = btoa(String.fromCharCode.apply(null, new Uint8Array(fileReader.result)));
-            if (file.files[0].name.endsWith(`.mf4`)) {
-                fetch(`/api/load`, {
-                    method: `post`,
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({ text: base64Data })
-                })
-                    .then(res => res.json())
-                    .then(data => {
-                        const dom = (new DOMParser()).parseFromString(data[0], `application/xml`);
-                        workspace.clear();
-                        Blockly.Xml.domToWorkspace(dom.documentElement, workspace);
-                        costumes = data.slice(2, data.length);
-                        reloadCos();
-                    });
-            } else if (file.files[0].name.endsWith(`.zip`)) {
-                if (confirm(`zip ファイルをセットします ( 管理者以外が行うと使えなくなる可能性があります )`)) {
-                    await fetch(`/api/zip`, {
-                        method: `post`,
-                        headers: { 'Content-Type': 'application/json' },
-                        body: JSON.stringify({ text: base64Data })
-                    });
-                }
-            }
+            fetch(`/api/load`, {
+                method: `post`,
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({ text: base64Data })
+            })
+                .then(res => res.json())
+                .then(data => {
+                    const dom = (new DOMParser()).parseFromString(data[0], `application/xml`);
+                    workspace.clear();
+                    Blockly.Xml.domToWorkspace(dom.documentElement, workspace);
+                    costumes = data.slice(2, data.length);
+                    reloadCos();
+                });
         });
         fileReader.readAsArrayBuffer(file.files[0]);
     });