mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 04:57:52 +00:00
merge
This commit is contained in:
@@ -41,7 +41,10 @@ class UploadFileUseCase {
|
||||
|
||||
PublicationAttachmentEntity.chucksManager.setPath(path)
|
||||
PublicationAttachmentEntity.chucksManager.setResponse(initIndex, uploadRequest)
|
||||
alert("passs")
|
||||
} else {
|
||||
alert("erro dfsdfsdfsdr")
|
||||
PublicationAttachmentEntity.chucksManager.clearUploading()
|
||||
PublicationAttachmentEntity.chucksManager.setManualRetry()
|
||||
return reject(err(PublicationAttachmentEntity))
|
||||
}
|
||||
@@ -60,7 +63,6 @@ class UploadFileUseCase {
|
||||
const pingRequest = await this.CMAPIService.ping()
|
||||
if( pingRequest.isErr()) {
|
||||
connection = false
|
||||
PublicationAttachmentEntity.chucksManager.setManualRetry()
|
||||
return reject(err(PublicationAttachmentEntity))
|
||||
}
|
||||
} else {
|
||||
@@ -85,24 +87,31 @@ class UploadFileUseCase {
|
||||
}
|
||||
|
||||
if(!connection) {
|
||||
PublicationAttachmentEntity.chucksManager.clearUploading()
|
||||
PublicationAttachmentEntity.chucksManager.setManualRetry()
|
||||
return reject(err(PublicationAttachmentEntity))
|
||||
} else {
|
||||
} else if (PublicationAttachmentEntity.chucksManager.chunks.totalChunks != 1) {
|
||||
await Promise.all(allRequest)
|
||||
|
||||
const uploadRequest = await readAndUploadChunk(PublicationAttachmentEntity.chucksManager.chunks.totalChunks)
|
||||
if(uploadRequest.isErr()) {
|
||||
const pingRequest = await this.CMAPIService.ping()
|
||||
if( pingRequest.isErr()) {
|
||||
PublicationAttachmentEntity.chucksManager.setManualRetry()
|
||||
return reject(err(PublicationAttachmentEntity))
|
||||
}
|
||||
|
||||
PublicationAttachmentEntity.chucksManager.clearUploading()
|
||||
PublicationAttachmentEntity.chucksManager.setManualRetry()
|
||||
return reject(err(PublicationAttachmentEntity))
|
||||
} else {
|
||||
PublicationAttachmentEntity.chucksManager.setResponse(PublicationAttachmentEntity.chucksManager.chunks.totalChunks, uploadRequest)
|
||||
PublicationAttachmentEntity.chucksManager.doneChunkUpload()
|
||||
return resolve(ok(PublicationAttachmentEntity))
|
||||
}
|
||||
|
||||
} else {
|
||||
|
||||
PublicationAttachmentEntity.chucksManager.doneChunkUpload()
|
||||
resolve(ok(PublicationAttachmentEntity))
|
||||
return resolve(ok(PublicationAttachmentEntity))
|
||||
}
|
||||
|
||||
|
||||
@@ -222,7 +231,7 @@ export class PublicationFormMV {
|
||||
|
||||
if(!PublicationAttachmentEntity.hasChunkManger) {
|
||||
const fileBlob = PublicationAttachmentEntity.blobFile;
|
||||
const fileChunks = new Chunks({chunkSize: 500 })
|
||||
const fileChunks = new Chunks({chunkSize: 2000 })
|
||||
fileChunks.setFile(fileBlob)
|
||||
|
||||
PublicationAttachmentEntity.setChunkManger(fileChunks)
|
||||
@@ -239,6 +248,7 @@ export class PublicationFormMV {
|
||||
|
||||
} else {
|
||||
if(PublicationAttachmentEntity.chucksManager.doneUpload) {
|
||||
alert("done")
|
||||
return resolve(true)
|
||||
}
|
||||
}
|
||||
@@ -247,10 +257,18 @@ export class PublicationFormMV {
|
||||
PublicationAttachmentEntity.chucksManager.setUploading()
|
||||
const result = await this.UploadFileUseCase.execute(PublicationAttachmentEntity)
|
||||
PublicationAttachmentEntity.chucksManager.clearUploading()
|
||||
PublicationAttachmentEntity.chucksManager.setManualRetry()
|
||||
|
||||
|
||||
if(result.isErr()) {
|
||||
alert("error")
|
||||
|
||||
reject(false)
|
||||
} else {
|
||||
alert("passs")
|
||||
}
|
||||
} else {
|
||||
alert("not")
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user