Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions apps/studio/src/lib/import-export/export/export-database.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,13 @@ export async function exportDatabaseToFile(
// Execute the command to export directly to the temp file
// Use absolute path /wordpress/ because that's where site.path is mounted in the WASM filesystem
const vfsFilePath = `/wordpress/${ tempFileName }`;
const { stderr, exitCode } = await server.executeWpCliCommand(
const { exitCode } = await server.executeWpCliCommand(
`sqlite export ${ vfsFilePath } --require=/tmp/sqlite-command/command.php --enable-ast-driver`,
{
skipPluginsAndThemes: true,
}
);

if ( stderr ) {
throw new Error( `Database export failed: ${ stderr }` );
}

if ( exitCode ) {
throw new Error( 'Database export failed' );
}
Expand Down Expand Up @@ -58,9 +54,6 @@ export async function exportDatabaseToMultipleFiles(
skipPluginsAndThemes: true,
}
);
if ( tablesResult.stderr ) {
throw new Error( `Database export failed: ${ tablesResult.stderr }` );
}
if ( tablesResult.exitCode ) {
throw new Error( 'Database export failed' );
}
Expand Down Expand Up @@ -89,17 +82,13 @@ export async function exportDatabaseToMultipleFiles(
const vfsFilePath = `/wordpress/${ fileName }`;

// Execute the command to export directly to a temporary file in the project directory
const { stderr, exitCode } = await server.executeWpCliCommand(
const { exitCode } = await server.executeWpCliCommand(
`sqlite export ${ vfsFilePath } --tables=${ table } --require=/tmp/sqlite-command/command.php --enable-ast-driver`,
{
skipPluginsAndThemes: true,
}
);

if ( stderr ) {
throw new Error( `Database export failed: ${ stderr }` );
}

if ( exitCode ) {
throw new Error( 'Database export failed' );
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ export class DefaultExporter extends EventEmitter implements Exporter {
return [];
}

const { stderr, stdout } = await server.executeWpCliCommand(
const { exitCode, stdout } = await server.executeWpCliCommand(
'plugin list --status=active,inactive --fields=name,status,version --format=json',
{
skipPluginsAndThemes: true,
Expand All @@ -320,8 +320,7 @@ export class DefaultExporter extends EventEmitter implements Exporter {
try {
return parseJsonFromPhpOutput( stdout );
} catch ( error ) {
if ( stderr ) {
console.error( `Could not get information about plugins: ${ stderr }` );
if ( exitCode ) {
throw new Error(
'Could not get information about installed plugins to create meta.json file.'
);
Expand All @@ -340,7 +339,7 @@ export class DefaultExporter extends EventEmitter implements Exporter {
return [];
}

const { stderr, stdout } = await server.executeWpCliCommand(
const { exitCode, stdout } = await server.executeWpCliCommand(
'theme list --fields=name,status,version --format=json',
{
skipPluginsAndThemes: true,
Expand All @@ -352,8 +351,7 @@ export class DefaultExporter extends EventEmitter implements Exporter {
try {
return parseJsonFromPhpOutput( stdout );
} catch ( error ) {
if ( stderr ) {
console.error( `Could not get information about themes: ${ stderr }` );
if ( exitCode ) {
throw new Error(
'Could not get information about installed themes to create meta.json file.'
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ platformTestSuite( 'DefaultExporter', ( { normalize } ) => {
return Promise.resolve( {
stdout: '<a><br/>some html</ap>',
stderr: 'Error',
exitCode: 0,
exitCode: 1,
} );
default:
return Promise.resolve( { stdout: '', stderr: '', exitCode: 0 } );
Expand Down
Loading