From d27a567411538e7aa451544b3a285907fc2beeaf Mon Sep 17 00:00:00 2001
From: lan <hhxk666@gmail.com>
Date: Wed, 1 Mar 2023 16:22:40 +0800
Subject: [PATCH] =?UTF-8?q?update:=E5=BC=82=E6=AD=A5=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.py              |  2 +-
 settings.py          |  4 +--
 templates/index.html | 77 +++++++++++++++++++++++++++++---------------
 3 files changed, 54 insertions(+), 29 deletions(-)

diff --git a/main.py b/main.py
index db6a575..00b0a4a 100644
--- a/main.py
+++ b/main.py
@@ -193,7 +193,7 @@ async def upload_file(file_key: str, file: bytes = File(...), chunk_index: int =
     return {'code': 200}
 
 
-@app.get('/file/merge/{file_key}')
+@app.get('/file/merge/{file_key}/')
 async def merge_chunks(file_key: str, file_name: str, total_chunks: int):
     return {'code': 200, 'data': await storage.merge_chunks(file_key, file_name, total_chunks)}
 
diff --git a/settings.py b/settings.py
index b7134e0..be5e825 100644
--- a/settings.py
+++ b/settings.py
@@ -18,7 +18,7 @@ class Settings:
     # Sqlite套接字
     DATABASE_URL = config('DATABASE_URL', cast=str, default=f"sqlite+aiosqlite:///{DATABASE_FILE}")
     # 数据存储文件夹，文件就不暴露在静态资源里面了
-    DATA_ROOT = './data/' + config('DATA_ROOT', cast=str, default=f"static")
+    DATA_ROOT = config('DATA_ROOT', cast=str, default=f"./data/static")
     # 静态文件夹URL
     STATIC_URL = config('STATIC_URL', cast=str, default="/static")
     # 开启上传
@@ -42,7 +42,7 @@ class Settings:
     # 管理密码
     ADMIN_PASSWORD = config('ADMIN_PASSWORD', cast=str, default=uuid.uuid4().hex)
     # 文件大小限制，默认10MB
-    FILE_SIZE_LIMIT = config('FILE_SIZE_LIMIT', cast=int, default=10) * 1024 * 1024
+    FILE_SIZE_LIMIT = config('FILE_SIZE_LIMIT', cast=int, default=10 * 1024 * 1024)
     # 网站标题
     TITLE = config('TITLE', cast=str, default="文件快递柜")
     # 网站描述
diff --git a/templates/index.html b/templates/index.html
index b6c3c8d..846a4eb 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -11,7 +11,7 @@
     <meta name="description" content="{{description}}"/>
     <meta name="keywords" content="{{keywords}}"/>
     <meta name="generator" content="FileCodeBox"/>
-    <meta name="template" content="V1.6 Beta"/>
+    <meta name="template" content="V1.7 Beta"/>
     <style>
         body {
             background: #f5f5f5;
@@ -288,6 +288,7 @@
                 },
                 quFiles: [],
                 jiFiles: [],
+                uploadGroup: [],
                 pageNum: 0,
                 inputDisable: false,
                 fileSizeLimit: '{{fileSizeLimit}}',
@@ -386,7 +387,11 @@
                 formData.append('file_key', file_key);
                 formData.append('chunk_index', chunk_index);
                 formData.append('total_chunks', total_chunks);
-                await this.http('post', `/file/upload/${file_key}/`, formData)
+                this.http('post', `/file/upload/${file_key}/`, formData).then((res) => {
+                    this.upload_groups[chunk_index - 1] = 1;
+                }).catch((res) => {
+                    this.upload_groups[chunk_index - 1] = 2;
+                })
             },
             copyText: function (value, style = 1) {
                 if (style === 0) {
@@ -475,36 +480,56 @@
                         const shardSize = 1024 * 1024 * 5;
                         const {name, size, type} = file;
                         const total_chunks = Math.ceil(size / shardSize);
+                        this.upload_groups = [];
+                        for (let i = 0; i < total_chunks; i++) {
+                            this.upload_groups.push(0);
+                        }
                         while (chunk_index < total_chunks) {
                             const start = chunk_index * shardSize
                             const end = Math.min(start + shardSize, size)
                             chunk_index += 1;
-                            await this.uploadChunk(file.slice(start, end), res.data, chunk_index, total_chunks);
+                            this.uploadChunk(file.slice(start, end), res.data, chunk_index, total_chunks);
                         }
-                        this.http('get', `/file/merge/${res.data}/?file_name=${name}&total_chunks=${total_chunks}`).then(text => {
-                            this.http('post', '/share/file/', {
-                                text: text.data,
-                                size: size,
-                                exp_style: this.uploadData.exp_style,
-                                exp_value: this.uploadData.exp_value,
-                                type: type,
-                                name: name,
-                                key: res.data,
-                            }, {
-                                headers: {
-                                    'pwd': this.pwd
+                        const interval = setInterval(() => {
+                            let flag = true;
+                            for (let i = 0; i < total_chunks; i++) {
+                                if (this.upload_groups[i] === 0) {
+                                    flag = false;
+                                } else if (this.upload_groups[i] === 2) {
+                                    flag = false;
+                                    start = chunk_index * shardSize;
+                                    const end = Math.min(start + shardSize, size)
+                                    this.uploadChunk(file.slice(start, end), res.data, chunk_index, total_chunks);
                                 }
-                            }).then(res => {
-                                this.jiFiles.unshift(res.data);
-                                this.jiDrawer = true;
-                                this.uploadData.text = '';
-                                this.uploadData.file = null;
-                                this.$message({
-                                    message: '上传成功',
-                                    type: 'success'
-                                });
-                            })
-                        })
+                            }
+                            if (flag) {
+                                clearInterval(interval);
+                                this.http('get', `/file/merge/${res.data}/?file_name=${name}&total_chunks=${total_chunks}`).then(text => {
+                                    this.http('post', '/share/file/', {
+                                        text: text.data,
+                                        size: size,
+                                        exp_style: this.uploadData.exp_style,
+                                        exp_value: this.uploadData.exp_value,
+                                        type: type,
+                                        name: name,
+                                        key: res.data,
+                                    }, {
+                                        headers: {
+                                            'pwd': this.pwd
+                                        }
+                                    }).then(res => {
+                                        this.jiFiles.unshift(res.data);
+                                        this.jiDrawer = true;
+                                        this.uploadData.text = '';
+                                        this.uploadData.file = null;
+                                        this.$message({
+                                            message: '上传成功',
+                                            type: 'success'
+                                        });
+                                    })
+                                })
+                            }
+                        }, 100);
                     });
                 }
             },