LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

TUS: handle remaining locked file error messages

Browse source
This commit is contained in:
infinite-persistence 2021-11-23 11:23:05 +08:00
parent 605a8f371d
commit eb83a834a1
No known key found for this signature in database
GPG key ID: B9C3252EDC3D0AA0
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
web/setup/publish-v2.js
View file

@ -76,13 +76,12 @@ export function makeResumableUploadRequest(
}, },
onError: (err) => { onError: (err) => {
const status = err.originalResponse ? err.originalResponse.getStatus() : 0; const status = err.originalResponse ? err.originalResponse.getStatus() : 0;
if (status === STATUS_CONFLICT || status === STATUS_LOCKED) { const errMsg = typeof err === 'string' ? err : err.message;
if (status === STATUS_CONFLICT || status === STATUS_LOCKED || errMsg === 'file currently locked') {
window.store.dispatch(doUpdateUploadProgress({ params, status: 'conflict' })); window.store.dispatch(doUpdateUploadProgress({ params, status: 'conflict' }));
reject( // prettier-ignore
new Error( reject(new Error(`${status}: concurrent upload detected. Uploading the same file from multiple tabs or windows is not allowed.`));
`${status}: concurrent upload detected. Uploading the same file from multiple tabs or windows is not allowed.`
)
);
} else { } else {
window.store.dispatch(doUpdateUploadProgress({ params, status: 'error' })); window.store.dispatch(doUpdateUploadProgress({ params, status: 'error' }));
reject(new Error(err)); reject(new Error(err));