From facd770688983198cbd5b8c7b29a9154631d0153 Mon Sep 17 00:00:00 2001 From: 1 <1> Date: Wed, 25 Sep 2024 21:13:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BD=91=E9=A1=B5=E6=80=BB?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 4 ++-- .../assets/assets/{index-BHXorCFj.js => index-DkYEv2xP.js} | 2 +- app/src/main/assets/index.html | 2 +- .../java/com/donut/mixfile/server/routes/DownloadRoute.kt | 2 ++ app/src/test/java/com/donut/mixfile/ExampleUnitTest.kt | 3 +-- 5 files changed, 7 insertions(+), 6 deletions(-) rename app/src/main/assets/assets/{index-BHXorCFj.js => index-DkYEv2xP.js} (99%) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 4ad3d56..04904f0 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -14,8 +14,8 @@ android { applicationId = "com.donut.mixfile" minSdk = 24 targetSdk = 34 - versionCode = 41 - versionName = "1.4.10" + versionCode = 42 + versionName = "1.4.11" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { diff --git a/app/src/main/assets/assets/index-BHXorCFj.js b/app/src/main/assets/assets/index-DkYEv2xP.js similarity index 99% rename from app/src/main/assets/assets/index-BHXorCFj.js rename to app/src/main/assets/assets/index-DkYEv2xP.js index fd72db8..6e64e32 100644 --- a/app/src/main/assets/assets/index-BHXorCFj.js +++ b/app/src/main/assets/assets/index-DkYEv2xP.js @@ -299,7 +299,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${t}Chann font-size: max(.6rem, 14px); } `;let aa=null,la=null;function aS(e){const[t,n]=fe([]),[r,o]=fe("");if(aa=n,la=o,t.length===0)return null;const i=r.split(` -`),s=r.trim()&&i.length===t.length;return $(Qa,{open:!0,children:$(sS,{className:"shadow",children:[s?$("h3",{className:"file-card animate__animated animate__bounceIn",children:[t.length," 个文件全部上传成功"]}):$("h3",{children:[t.length," 个文件正在上传"]}),$("div",{class:"content",children:t.map((a,l)=>$(iS,{file:a},l))}),r.trim()&&$(ia.CopyToClipboard,{className:"file-card animate__animated animate__bounceIn",text:r,onCopy:()=>{zo("复制成功!")},children:$(jn,{variant:"outlined",children:"全部复制"})}),$(jn,{variant:"contained",onClick:()=>{aa([]),la("")},children:s?"关闭":"取消"})]})})}function Qc(e){aa(t=>[...t,...e])}function lS(e){la(t=>`${t} +`),s=r.trim()?i.length:0,a=r.trim()&&i.length===t.length;return $(Qa,{open:!0,children:$(sS,{className:"shadow",children:[a?$("h3",{className:"file-card animate__animated animate__bounceIn",children:[t.length," 个文件全部上传成功"]}):$("h3",{children:[s," / ",t.length," 个文件正在上传"]}),$("div",{class:"content",children:t.map((l,c)=>$(iS,{file:l},c))}),r.trim()&&$(ia.CopyToClipboard,{className:"file-card animate__animated animate__bounceIn",text:r,onCopy:()=>{zo("复制成功!")},children:$(jn,{variant:"outlined",children:"全部复制"})}),$(jn,{variant:"contained",onClick:()=>{aa([]),la("")},children:a?"关闭":"取消"})]})})}function Qc(e){aa(t=>[...t,...e])}function lS(e){la(t=>`${t} ${e}`.trim())}class cS{constructor(t){this.queue=void 0,this.maxConcurrent=void 0,this.count=void 0,this.queue=[],this.maxConcurrent=t,this.count=0}get canAcquire(){return this.countthis.queue.push(t))}release(){const t=this.queue.shift();t?setTimeout(t,0):this.count--}}const Bt="_default";class uS{constructor(t=1){this.semaphoreInstances=void 0,this.maxConcurrent=void 0,this.semaphoreInstances={},this.maxConcurrent=t}hasSemaphoreInstance(t=Bt){return!!this.semaphoreInstances[t]}getSemaphoreInstance(t=Bt){return this.hasSemaphoreInstance(t)||(this.semaphoreInstances[t]=new cS(this.maxConcurrent)),this.semaphoreInstances[t]}tidy(t=Bt){this.hasSemaphoreInstance(t)&&this.getSemaphoreInstance(t).count===0&&delete this.semaphoreInstances[t]}canAcquire(t=Bt){return this.getSemaphoreInstance(t).canAcquire}acquire(t=Bt){return this.getSemaphoreInstance(t).acquire()}release(t=Bt){this.getSemaphoreInstance(t).release(),this.tidy(t)}count(t=Bt){return this.hasSemaphoreInstance(t)?this.getSemaphoreInstance(t).count:0}hasTasks(t=Bt){return this.count(t)>0}async request(t,n=Bt){try{return await this.acquire(n),await t()}finally{this.release(n)}}async requestIfAvailable(t,n=Bt){return this.canAcquire(n)?this.request(t,n):null}}const dS=cn.div` display: flex; flex-wrap: wrap; diff --git a/app/src/main/assets/index.html b/app/src/main/assets/index.html index 8789cf8..593320c 100644 --- a/app/src/main/assets/index.html +++ b/app/src/main/assets/index.html @@ -6,7 +6,7 @@ MixFile - + diff --git a/app/src/main/java/com/donut/mixfile/server/routes/DownloadRoute.kt b/app/src/main/java/com/donut/mixfile/server/routes/DownloadRoute.kt index 5e622ec..e714e0c 100644 --- a/app/src/main/java/com/donut/mixfile/server/routes/DownloadRoute.kt +++ b/app/src/main/java/com/donut/mixfile/server/routes/DownloadRoute.kt @@ -1,6 +1,7 @@ package com.donut.mixfile.server.routes import com.donut.mixfile.server.utils.bean.MixShareInfo +import com.donut.mixfile.ui.routes.increaseDownloadData import com.donut.mixfile.util.cachedMutableOf import com.donut.mixfile.util.encodeURL import com.donut.mixfile.util.file.resolveMixShareInfo @@ -107,6 +108,7 @@ private suspend fun responseFileStream( } try { writeFully(dataToWrite) + increaseDownloadData(dataToWrite.size.toLong()) } catch (e: Exception) { close(e) } diff --git a/app/src/test/java/com/donut/mixfile/ExampleUnitTest.kt b/app/src/test/java/com/donut/mixfile/ExampleUnitTest.kt index e5eef9d..8bcfe9b 100644 --- a/app/src/test/java/com/donut/mixfile/ExampleUnitTest.kt +++ b/app/src/test/java/com/donut/mixfile/ExampleUnitTest.kt @@ -1,6 +1,5 @@ package com.donut.mixfile -import com.donut.mixfile.util.file.encodeHex import kotlinx.coroutines.runBlocking import org.junit.Test @@ -10,6 +9,7 @@ import org.junit.Test * * See [testing documentation](http://d.android.com/tools/testing). */ + class ExampleUnitTest { @@ -17,7 +17,6 @@ class ExampleUnitTest { fun main() { runBlocking { - } }