yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-20 14:00:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve error handling

Browse Source
This commit is contained in:
Ben Irvin 2023-04-14 18:19:08 +02:00
parent 87c678b351
commit 39f180a814
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/core/data-transfer/src/file/providers/source/index.ts
View File

@ -4,7 +4,7 @@ import fs from 'fs-extra';
import zip from 'zlib'; import zip from 'zlib';
import tar from 'tar'; import tar from 'tar';
import path from 'path'; import path from 'path';
import { keyBy } from 'lodash/fp'; import { isEmpty, keyBy } from 'lodash/fp';
import { chain } from 'stream-chain'; import { chain } from 'stream-chain';
import { pipeline, PassThrough } from 'stream'; import { pipeline, PassThrough } from 'stream';
import { parser } from 'stream-json/jsonl/Parser'; import { parser } from 'stream-json/jsonl/Parser';
@ -73,6 +73,8 @@ class LocalFileSourceProvider implements ISourceProvider {
try { try {
// Read the metadata to ensure the file can be parsed // Read the metadata to ensure the file can be parsed
this.#metadata = await this.getMetadata(); this.#metadata = await this.getMetadata();
// TODO: we might also need to read the schema.jsonl files & implements a custom stream-check
} catch (e) { } catch (e) {
if (this.options?.encryption?.enabled) { if (this.options?.encryption?.enabled) {
throw new ProviderInitializationError( throw new ProviderInitializationError(
@ -81,11 +83,17 @@ class LocalFileSourceProvider implements ISourceProvider {
} }
throw new ProviderInitializationError(`File '${filePath}' is not a valid Strapi data file.`); throw new ProviderInitializationError(`File '${filePath}' is not a valid Strapi data file.`);
} }
if (!this.#metadata) {
throw new ProviderInitializationError('Could not load metadata from Strapi data file.');
}
}
async getMetadata() {
if (this.#metadata) {
return this.#metadata;
} }
getMetadata() {
// TODO: need to read the file & extract the metadata json file
// => we might also need to read the schema.jsonl files & implements a custom stream-check
const backupStream = this.#getBackupStream(); const backupStream = this.#getBackupStream();
return this.#parseJSONFile<IMetadata>(backupStream, METADATA_FILE_PATH); return this.#parseJSONFile<IMetadata>(backupStream, METADATA_FILE_PATH);
} }