sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: wip

Browse Source
This commit is contained in:
こけっち 2022-03-13 14:37:55 +09:00
parent b48f76aad1
commit 84da9d4cd4
No known key found for this signature in database
GPG Key ID: 21460619C5FC4DD1
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/client/src/scripts/select-file-enc.ts
View File

@ -31,10 +31,10 @@ function select(src: any, label: string | null, multiple: boolean): Promise<Driv
let blob = getBlobFromBase64Data(b64Data, contentType); let blob = getBlobFromBase64Data(b64Data, contentType);
let blobUrl = URL.createObjectURL(blob); let blobUrl = URL.createObjectURL(blob);
let convertedVideo = { let convertedVideo: any = {
name: videoFileData.name.substring(0, videoFileData.name.lastIndexOf(".")), name: videoFileData.name.substring(0, videoFileData.name.lastIndexOf(".")),
format: targetFormat, format: targetFormat,
fileData: blob data: blob
} }
// console.log("convertedVideo: ", convertedVideo); // console.log("convertedVideo: ", convertedVideo);
resolve(convertedVideo); resolve(convertedVideo);
@ -100,13 +100,14 @@ function select(src: any, label: string | null, multiple: boolean): Promise<Driv
console.log('start convert video'); console.log('start convert video');
let convertedVideoDataObj = await VideoConverter(sourceVideoFile, targetVideoFormat); let convertedVideoDataObj = await VideoConverter(sourceVideoFile, targetVideoFormat);
console.log('end convert video'); console.log('end convert video');
// @ts-ignore // @ts-ignore
let convertedVideoFile = new File([convertedVideoDataObj.fileData], convertedVideoDataObj.name + "." + convertedVideoDataObj.format); let convertedVideoFile = new File([convertedVideoDataObj.data], convertedVideoDataObj.name + "." + convertedVideoDataObj.format);
os.upload(convertedVideoFile, defaultStore.state.uploadFolder, undefined, keepOriginal.value).then(res).catch(e => { os.alert({ type: 'error', text: e }) }); os.upload(convertedVideoFile, defaultStore.state.uploadFolder, undefined, keepOriginal.value).then(res).catch(e => { os.alert({ type: 'error', text: e }) });
} }
Array.from(input.files).map(file => { const promises = Array.from(input.files).map(file => {
if (file.type.indexOf('video') !== -1) { if (file.type.indexOf('video') !== -1) {
console.log('convert video'); console.log('convert video');
os.toast('Try convert to mp4'); os.toast('Try convert to mp4');
@ -118,6 +119,14 @@ function select(src: any, label: string | null, multiple: boolean): Promise<Driv
}); });
Promise.all(promises).then(driveFiles => {
res(multiple ? driveFiles : driveFiles[0]);
}).catch(e => {
os.alert({
type: 'error',
text: e
});
});
// 一応廃棄 // 一応廃棄