refactor
This commit is contained in:
parent
5c80d9093b
commit
151586ab60
|
@ -87,7 +87,7 @@ export default defineComponent({
|
||||||
},
|
},
|
||||||
|
|
||||||
async openDrive() {
|
async openDrive() {
|
||||||
os.selectDriveFile();
|
os.selectDriveFile(false);
|
||||||
},
|
},
|
||||||
|
|
||||||
async selectUser() {
|
async selectUser() {
|
||||||
|
|
|
@ -19,6 +19,7 @@ import MkContextMenu from '@/components/MkContextMenu.vue';
|
||||||
import { MenuItem } from '@/types/menu';
|
import { MenuItem } from '@/types/menu';
|
||||||
import copyToClipboard from './scripts/copy-to-clipboard';
|
import copyToClipboard from './scripts/copy-to-clipboard';
|
||||||
import { showMovedDialog } from './scripts/show-moved-dialog';
|
import { showMovedDialog } from './scripts/show-moved-dialog';
|
||||||
|
import { DriveFile } from 'misskey-js/built/entities';
|
||||||
|
|
||||||
export const openingWindowsCount = ref(0);
|
export const openingWindowsCount = ref(0);
|
||||||
|
|
||||||
|
@ -420,7 +421,7 @@ export async function selectUser(opts: { includeSelf?: boolean } = {}) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function selectDriveFile(multiple: boolean) {
|
export async function selectDriveFile(multiple: boolean): Promise<DriveFile[]> {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
popup(defineAsyncComponent(() => import('@/components/MkDriveSelectDialog.vue')), {
|
popup(defineAsyncComponent(() => import('@/components/MkDriveSelectDialog.vue')), {
|
||||||
type: 'file',
|
type: 'file',
|
||||||
|
@ -428,7 +429,7 @@ export async function selectDriveFile(multiple: boolean) {
|
||||||
}, {
|
}, {
|
||||||
done: files => {
|
done: files => {
|
||||||
if (files) {
|
if (files) {
|
||||||
resolve(multiple ? files : files[0]);
|
resolve(files);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
}, 'closed');
|
}, 'closed');
|
||||||
|
|
|
@ -33,8 +33,8 @@ const emit = defineEmits<{
|
||||||
let file: any = $ref(null);
|
let file: any = $ref(null);
|
||||||
|
|
||||||
async function choose() {
|
async function choose() {
|
||||||
os.selectDriveFile(false).then((fileResponse: any) => {
|
os.selectDriveFile(false).then((fileResponse) => {
|
||||||
file = fileResponse;
|
file = fileResponse[0];
|
||||||
emit('update:modelValue', {
|
emit('update:modelValue', {
|
||||||
...props.modelValue,
|
...props.modelValue,
|
||||||
fileId: fileResponse.id,
|
fileId: fileResponse.id,
|
||||||
|
|
|
@ -6,71 +6,77 @@ import { i18n } from '@/i18n';
|
||||||
import { defaultStore } from '@/store';
|
import { defaultStore } from '@/store';
|
||||||
import { uploadFile } from '@/scripts/upload';
|
import { uploadFile } from '@/scripts/upload';
|
||||||
|
|
||||||
function select(src: any, label: string | null, multiple: boolean): Promise<DriveFile | DriveFile[]> {
|
export function chooseFileFromPc(multiple: boolean, keepOriginal = false): Promise<DriveFile[]> {
|
||||||
|
return new Promise((res, rej) => {
|
||||||
|
const input = document.createElement('input');
|
||||||
|
input.type = 'file';
|
||||||
|
input.multiple = multiple;
|
||||||
|
input.onchange = () => {
|
||||||
|
const promises = Array.from(input.files).map(file => uploadFile(file, defaultStore.state.uploadFolder, undefined, keepOriginal));
|
||||||
|
|
||||||
|
Promise.all(promises).then(driveFiles => {
|
||||||
|
res(driveFiles);
|
||||||
|
}).catch(err => {
|
||||||
|
// アップロードのエラーは uploadFile 内でハンドリングされているためアラートダイアログを出したりはしてはいけない
|
||||||
|
});
|
||||||
|
|
||||||
|
// 一応廃棄
|
||||||
|
(window as any).__misskey_input_ref__ = null;
|
||||||
|
};
|
||||||
|
|
||||||
|
// https://qiita.com/fukasawah/items/b9dc732d95d99551013d
|
||||||
|
// iOS Safari で正常に動かす為のおまじない
|
||||||
|
(window as any).__misskey_input_ref__ = input;
|
||||||
|
|
||||||
|
input.click();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function chooseFileFromDrive(multiple: boolean): Promise<DriveFile[]> {
|
||||||
|
return new Promise((res, rej) => {
|
||||||
|
os.selectDriveFile(multiple).then(files => {
|
||||||
|
res(files);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function chooseFileFromUrl(): Promise<DriveFile> {
|
||||||
|
return new Promise((res, rej) => {
|
||||||
|
os.inputText({
|
||||||
|
title: i18n.ts.uploadFromUrl,
|
||||||
|
type: 'url',
|
||||||
|
placeholder: i18n.ts.uploadFromUrlDescription,
|
||||||
|
}).then(({ canceled, result: url }) => {
|
||||||
|
if (canceled) return;
|
||||||
|
|
||||||
|
const marker = Math.random().toString(); // TODO: UUIDとか使う
|
||||||
|
|
||||||
|
const connection = stream.useChannel('main');
|
||||||
|
connection.on('urlUploadFinished', urlResponse => {
|
||||||
|
if (urlResponse.marker === marker) {
|
||||||
|
res(urlResponse.file);
|
||||||
|
connection.dispose();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
os.api('drive/files/upload-from-url', {
|
||||||
|
url: url,
|
||||||
|
folderId: defaultStore.state.uploadFolder,
|
||||||
|
marker,
|
||||||
|
});
|
||||||
|
|
||||||
|
os.alert({
|
||||||
|
title: i18n.ts.uploadFromUrlRequested,
|
||||||
|
text: i18n.ts.uploadFromUrlMayTakeTime,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function select(src: any, label: string | null, multiple: boolean): Promise<DriveFile[]> {
|
||||||
return new Promise((res, rej) => {
|
return new Promise((res, rej) => {
|
||||||
const keepOriginal = ref(defaultStore.state.keepOriginalUploading);
|
const keepOriginal = ref(defaultStore.state.keepOriginalUploading);
|
||||||
|
|
||||||
const chooseFileFromPc = () => {
|
|
||||||
const input = document.createElement('input');
|
|
||||||
input.type = 'file';
|
|
||||||
input.multiple = multiple;
|
|
||||||
input.onchange = () => {
|
|
||||||
const promises = Array.from(input.files).map(file => uploadFile(file, defaultStore.state.uploadFolder, undefined, keepOriginal.value));
|
|
||||||
|
|
||||||
Promise.all(promises).then(driveFiles => {
|
|
||||||
res(multiple ? driveFiles : driveFiles[0]);
|
|
||||||
}).catch(err => {
|
|
||||||
// アップロードのエラーは uploadFile 内でハンドリングされているためアラートダイアログを出したりはしてはいけない
|
|
||||||
});
|
|
||||||
|
|
||||||
// 一応廃棄
|
|
||||||
(window as any).__misskey_input_ref__ = null;
|
|
||||||
};
|
|
||||||
|
|
||||||
// https://qiita.com/fukasawah/items/b9dc732d95d99551013d
|
|
||||||
// iOS Safari で正常に動かす為のおまじない
|
|
||||||
(window as any).__misskey_input_ref__ = input;
|
|
||||||
|
|
||||||
input.click();
|
|
||||||
};
|
|
||||||
|
|
||||||
const chooseFileFromDrive = () => {
|
|
||||||
os.selectDriveFile(multiple).then(files => {
|
|
||||||
res(files);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const chooseFileFromUrl = () => {
|
|
||||||
os.inputText({
|
|
||||||
title: i18n.ts.uploadFromUrl,
|
|
||||||
type: 'url',
|
|
||||||
placeholder: i18n.ts.uploadFromUrlDescription,
|
|
||||||
}).then(({ canceled, result: url }) => {
|
|
||||||
if (canceled) return;
|
|
||||||
|
|
||||||
const marker = Math.random().toString(); // TODO: UUIDとか使う
|
|
||||||
|
|
||||||
const connection = stream.useChannel('main');
|
|
||||||
connection.on('urlUploadFinished', urlResponse => {
|
|
||||||
if (urlResponse.marker === marker) {
|
|
||||||
res(multiple ? [urlResponse.file] : urlResponse.file);
|
|
||||||
connection.dispose();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
os.api('drive/files/upload-from-url', {
|
|
||||||
url: url,
|
|
||||||
folderId: defaultStore.state.uploadFolder,
|
|
||||||
marker,
|
|
||||||
});
|
|
||||||
|
|
||||||
os.alert({
|
|
||||||
title: i18n.ts.uploadFromUrlRequested,
|
|
||||||
text: i18n.ts.uploadFromUrlMayTakeTime,
|
|
||||||
});
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
os.popupMenu([label ? {
|
os.popupMenu([label ? {
|
||||||
text: label,
|
text: label,
|
||||||
type: 'label',
|
type: 'label',
|
||||||
|
@ -81,23 +87,23 @@ function select(src: any, label: string | null, multiple: boolean): Promise<Driv
|
||||||
}, {
|
}, {
|
||||||
text: i18n.ts.upload,
|
text: i18n.ts.upload,
|
||||||
icon: 'ti ti-upload',
|
icon: 'ti ti-upload',
|
||||||
action: chooseFileFromPc,
|
action: () => chooseFileFromPc(multiple, keepOriginal.value).then(files => res(files)),
|
||||||
}, {
|
}, {
|
||||||
text: i18n.ts.fromDrive,
|
text: i18n.ts.fromDrive,
|
||||||
icon: 'ti ti-cloud',
|
icon: 'ti ti-cloud',
|
||||||
action: chooseFileFromDrive,
|
action: () => chooseFileFromDrive(multiple).then(files => res(files)),
|
||||||
}, {
|
}, {
|
||||||
text: i18n.ts.fromUrl,
|
text: i18n.ts.fromUrl,
|
||||||
icon: 'ti ti-link',
|
icon: 'ti ti-link',
|
||||||
action: chooseFileFromUrl,
|
action: () => chooseFileFromUrl().then(file => res([file])),
|
||||||
}], src);
|
}], src);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
export function selectFile(src: any, label: string | null = null): Promise<DriveFile> {
|
export function selectFile(src: any, label: string | null = null): Promise<DriveFile> {
|
||||||
return select(src, label, false) as Promise<DriveFile>;
|
return select(src, label, false).then(files => files[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function selectFiles(src: any, label: string | null = null): Promise<DriveFile[]> {
|
export function selectFiles(src: any, label: string | null = null): Promise<DriveFile[]> {
|
||||||
return select(src, label, true) as Promise<DriveFile[]>;
|
return select(src, label, true);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue