Compare commits
1
Commits
master
..
b5e50f786b
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b5e50f786b |
@@ -10,7 +10,7 @@
|
||||
<p v-if="!fileName" class="text-sm text-muted-foreground">Select an image to view its metadata.</p>
|
||||
|
||||
<template v-else-if="entry.status === 'error' && !entry.output">
|
||||
<p class="whitespace-pre-wrap text-sm text-destructive">{{ entry.detailMessage ?? entry.message }}</p>
|
||||
<p class="text-sm text-destructive">{{ entry.message }}</p>
|
||||
</template>
|
||||
|
||||
<template v-else-if="showMetadataTabs">
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
<MetadataOutputPanel v-if="tabBody?.kind === 'output'">{{ tabBody.text }}</MetadataOutputPanel>
|
||||
|
||||
<p v-else-if="tabBody?.kind === 'error'" class="whitespace-pre-wrap text-sm text-destructive">{{ tabBody.text }}</p>
|
||||
<p v-else-if="tabBody?.kind === 'error'" class="text-sm text-destructive">{{ tabBody.text }}</p>
|
||||
</template>
|
||||
|
||||
<p v-else class="text-sm text-muted-foreground">{{ entry.message }}</p>
|
||||
@@ -83,7 +83,7 @@ const tabBody = computed((): MetadataTabBody | null => {
|
||||
}
|
||||
|
||||
if (entry.status === 'error') {
|
||||
return { kind: 'error', text: entry.detailMessage ?? entry.message };
|
||||
return { kind: 'error', text: entry.message };
|
||||
}
|
||||
|
||||
return null;
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
{{ formatMetadataPreviewMessage(row.metadata) }}
|
||||
</span>
|
||||
<span class="min-w-0 truncate" :class="uploadStatusClass(row.upload)">
|
||||
{{ row.upload.message }}
|
||||
{{ formatUploadQueueMessage(row.upload) }}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
@@ -105,4 +105,18 @@ const formatMetadataPreviewMessage = (entry: MetadataPreviewEntry): string => {
|
||||
|
||||
return entry.message;
|
||||
};
|
||||
|
||||
const formatUploadQueueMessage = (entry: UploadQueueEntry): string => {
|
||||
if (entry.status === 'uploading') {
|
||||
const percent = entry.uploadPercent;
|
||||
|
||||
if (percent === null || percent === undefined) {
|
||||
return entry.message;
|
||||
}
|
||||
|
||||
return `${entry.message} ${percent}%`;
|
||||
}
|
||||
|
||||
return entry.message;
|
||||
};
|
||||
</script>
|
||||
|
||||
@@ -3,7 +3,6 @@ import { ref } from 'vue';
|
||||
import { useExiftoolStore } from '@/stores/exiftool';
|
||||
import type { MetadataPreviewEntry } from '@/types/metadata/MetadataPreview';
|
||||
import { makeKeyFromFile } from '@/utils/file/makeKeyFromFile';
|
||||
import { resolveErrorMessage } from '@/utils/resolveErrorMessage';
|
||||
|
||||
const METADATA_IDLE_MESSAGE = 'Waiting to load metadata...';
|
||||
const EXIFTOOL_INITIALIZING_MESSAGE = 'Downloading ExifTool…';
|
||||
@@ -18,6 +17,11 @@ const METADATA_IDLE_PREVIEW: MetadataPreviewEntry = {
|
||||
message: METADATA_IDLE_MESSAGE
|
||||
};
|
||||
|
||||
const METADATA_LOAD_ERROR_PREVIEW: MetadataPreviewEntry = {
|
||||
status: 'error',
|
||||
message: METADATA_LOAD_ERROR_MESSAGE
|
||||
};
|
||||
|
||||
const EXIFTOOL_PREPARE_ERROR_PREVIEW: MetadataPreviewEntry = {
|
||||
status: 'error',
|
||||
message: EXIFTOOL_PREPARE_ERROR_MESSAGE
|
||||
@@ -92,15 +96,9 @@ export const useMetadataStore = defineStore('metadata', () => {
|
||||
} catch (error) {
|
||||
console.error('[metadata] read failed', { file: file.name, error });
|
||||
|
||||
const entry: MetadataPreviewEntry = {
|
||||
status: 'error',
|
||||
message: METADATA_LOAD_ERROR_MESSAGE,
|
||||
detailMessage: resolveErrorMessage(error, METADATA_LOAD_ERROR_MESSAGE)
|
||||
};
|
||||
setPreviewEntry(key, METADATA_LOAD_ERROR_PREVIEW);
|
||||
|
||||
setPreviewEntry(key, entry);
|
||||
|
||||
return entry;
|
||||
return METADATA_LOAD_ERROR_PREVIEW;
|
||||
}
|
||||
|
||||
let strippedBlob: Blob;
|
||||
@@ -118,7 +116,6 @@ export const useMetadataStore = defineStore('metadata', () => {
|
||||
const entry: MetadataPreviewEntry = {
|
||||
status: 'error',
|
||||
message: METADATA_STRIP_ERROR_MESSAGE,
|
||||
detailMessage: resolveErrorMessage(error, METADATA_STRIP_ERROR_MESSAGE),
|
||||
output
|
||||
};
|
||||
|
||||
@@ -139,16 +136,9 @@ export const useMetadataStore = defineStore('metadata', () => {
|
||||
} catch (error) {
|
||||
console.error('[metadata] read after strip failed', { file: file.name, error });
|
||||
|
||||
const entry: MetadataPreviewEntry = {
|
||||
status: 'error',
|
||||
message: METADATA_LOAD_ERROR_MESSAGE,
|
||||
detailMessage: resolveErrorMessage(error, METADATA_LOAD_ERROR_MESSAGE),
|
||||
output
|
||||
};
|
||||
setPreviewEntry(key, METADATA_LOAD_ERROR_PREVIEW);
|
||||
|
||||
setPreviewEntry(key, entry);
|
||||
|
||||
return entry;
|
||||
return METADATA_LOAD_ERROR_PREVIEW;
|
||||
}
|
||||
|
||||
setStrippedBlob(key, strippedBlob);
|
||||
|
||||
@@ -16,6 +16,8 @@ import { prepareHotlinkUploadRequest } from '@/utils/upload/prepareHotlinkUpload
|
||||
import { prepareZkUploadRequest } from '@/utils/upload/prepareZkUploadRequest';
|
||||
import type { PreparedZkUploadRequest } from '@/types/upload/PreparedZkUploadRequest';
|
||||
import type { PreparedHotlinkUploadRequest } from '@/types/upload/PreparedHotlinkUploadRequest';
|
||||
import { percentFromAxiosProgress } from '@/utils/percentFromAxiosProgress';
|
||||
import type { AxiosProgressEvent } from 'axios';
|
||||
|
||||
const UPLOAD_IDLE_MESSAGE = 'Waiting to upload...';
|
||||
const UPLOAD_QUEUED_MESSAGE = 'Upload queued';
|
||||
@@ -39,10 +41,11 @@ const UPLOAD_QUEUED_ENTRY: UploadQueueEntry = {
|
||||
message: UPLOAD_QUEUED_MESSAGE
|
||||
};
|
||||
|
||||
const UPLOAD_UPLOADING_ENTRY: UploadQueueEntry = {
|
||||
const buildUploadingEntry = (uploadPercent: number | null = null): UploadQueueEntry => ({
|
||||
status: 'uploading',
|
||||
message: UPLOAD_UPLOADING_MESSAGE
|
||||
};
|
||||
message: UPLOAD_UPLOADING_MESSAGE,
|
||||
uploadPercent
|
||||
});
|
||||
|
||||
const UPLOAD_FAILED_ENTRY: UploadQueueEntry = {
|
||||
status: 'failed',
|
||||
@@ -80,17 +83,41 @@ export const useUploadStore = defineStore('upload', () => {
|
||||
uploadByKey.value = {};
|
||||
};
|
||||
|
||||
const uploadZk = async (body: CreateZkUploadRequest, altcha?: string): Promise<CreatedUploadResult> => {
|
||||
const getUploadRequestHeaders = (altcha?: string) => (altcha ? { [ALTCHA_REQUEST_HEADER]: altcha } : undefined);
|
||||
|
||||
const onUploadProgress = (queueKey: string, progressEvent: AxiosProgressEvent): void => {
|
||||
const percent = percentFromAxiosProgress(progressEvent);
|
||||
|
||||
if (percent !== null) {
|
||||
const entry = buildUploadingEntry(percent);
|
||||
|
||||
setUploadEntry(queueKey, entry);
|
||||
}
|
||||
};
|
||||
|
||||
const uploadZk = async (
|
||||
body: CreateZkUploadRequest,
|
||||
altcha: string | undefined,
|
||||
queueKey: string
|
||||
): Promise<CreatedUploadResult> => {
|
||||
const { data } = await api.post<CreatedUploadResult>('/uploads/zk', body, {
|
||||
headers: getUploadRequestHeaders(altcha)
|
||||
headers: getUploadRequestHeaders(altcha),
|
||||
onUploadProgress: progressEvent => onUploadProgress(queueKey, progressEvent)
|
||||
});
|
||||
|
||||
return data;
|
||||
};
|
||||
|
||||
const uploadHotlink = async (body: CreateHotlinkUploadRequest, altcha?: string): Promise<CreatedUploadResult> => {
|
||||
const uploadHotlink = async (
|
||||
body: CreateHotlinkUploadRequest,
|
||||
altcha: string | undefined,
|
||||
queueKey: string
|
||||
): Promise<CreatedUploadResult> => {
|
||||
const { data } = await api.post<CreatedUploadResult>('/uploads/hotlink', body, {
|
||||
headers: getUploadRequestHeaders(altcha)
|
||||
headers: getUploadRequestHeaders(altcha),
|
||||
onUploadProgress: progressEvent => {
|
||||
onUploadProgress(queueKey, progressEvent);
|
||||
}
|
||||
});
|
||||
|
||||
return data;
|
||||
@@ -102,8 +129,6 @@ export const useUploadStore = defineStore('upload', () => {
|
||||
});
|
||||
};
|
||||
|
||||
const getUploadRequestHeaders = (altcha?: string) => (altcha ? { [ALTCHA_REQUEST_HEADER]: altcha } : undefined);
|
||||
|
||||
const uploadBatch = async (
|
||||
files: readonly File[],
|
||||
settings: UploadBatchSettingsForm,
|
||||
@@ -176,11 +201,14 @@ export const useUploadStore = defineStore('upload', () => {
|
||||
continue;
|
||||
}
|
||||
|
||||
setUploadEntry(key, UPLOAD_UPLOADING_ENTRY);
|
||||
const entry = buildUploadingEntry();
|
||||
|
||||
setUploadEntry(key, entry);
|
||||
|
||||
try {
|
||||
const { request, fragmentKey } = prepared;
|
||||
|
||||
const result = await uploadZk(request, altcha);
|
||||
const result = await uploadZk(request, altcha, key);
|
||||
|
||||
setUploadEntry(key, {
|
||||
status: 'uploaded',
|
||||
@@ -209,11 +237,13 @@ export const useUploadStore = defineStore('upload', () => {
|
||||
continue;
|
||||
}
|
||||
|
||||
setUploadEntry(key, UPLOAD_UPLOADING_ENTRY);
|
||||
const entry = buildUploadingEntry();
|
||||
|
||||
setUploadEntry(key, entry);
|
||||
try {
|
||||
const { request, secret } = prepared;
|
||||
|
||||
const result = await uploadHotlink(request, altcha);
|
||||
const result = await uploadHotlink(request, altcha, key);
|
||||
|
||||
setUploadEntry(key, {
|
||||
status: 'uploaded',
|
||||
@@ -253,7 +283,6 @@ export const useUploadStore = defineStore('upload', () => {
|
||||
} else {
|
||||
setUploadEntry(key, { status: 'skipped', message: UPLOAD_SKIPPED_METADATA_MESSAGE });
|
||||
}
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -3,4 +3,4 @@ export type MetadataPreviewEntry =
|
||||
| { status: 'initializing'; message: string }
|
||||
| { status: 'processing'; message: string }
|
||||
| { status: 'ready'; message: string; output: string; afterStripOutput: string }
|
||||
| { status: 'error'; message: string; output?: string; detailMessage?: string };
|
||||
| { status: 'error'; message: string; output?: string };
|
||||
|
||||
@@ -4,7 +4,7 @@ export type UploadQueueEntry =
|
||||
| { status: 'idle'; message: string }
|
||||
| { status: 'queued'; message: string }
|
||||
| { status: 'preparing'; message: string }
|
||||
| { status: 'uploading'; message: string }
|
||||
| { status: 'uploading'; message: string; uploadPercent?: number | null }
|
||||
| {
|
||||
status: 'uploaded';
|
||||
message: string;
|
||||
|
||||
Reference in New Issue
Block a user