Skip to content

Close import content output stream #266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ashfame wants to merge 1 commit into
base: trunk
Choose a base branch
from
+24 −20
Open

Close import content output stream #266

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 24 additions & 20 deletions components/Blueprints/Steps/class-importcontentstep.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,27 +86,31 @@ private function importWxr( Runtime $runtime, array $content_definition, Tracker
$import_process->start();

$output = $import_process->getOutputStream( Process::OUTPUT_FILE );
foreach ( $this->output_lines( $output ) as $line ) {
$data = @json_decode( $line, true );
if ( ! is_array( $data ) ) {
// Non-JSON output is treated as a crash. We use a dedicated file pipe
// for communication and it should never contain a non-JSON line.
$import_process->stop();
throw new ProcessFailedException( $import_process );
}
// Report progress, errors, etc.
switch ( $data['type'] ?? '**MISSING**' ) {
case 'progress':
$progress->set( $data['progress'], 'Importing WXR file: ' . $data['caption'] );
break;
case 'error':
throw new BlueprintExecutionException( $data['message'] );
case 'completion':
$progress->finish();
break;
default:
throw new BlueprintExecutionException( 'Unknown message type: ' . $data['type'] );
try {
foreach ( $this->output_lines( $output ) as $line ) {
$data = @json_decode( $line, true );
if ( ! is_array( $data ) ) {
// Non-JSON output is treated as a crash. We use a dedicated file pipe
// for communication and it should never contain a non-JSON line.
$import_process->stop();
throw new ProcessFailedException( $import_process );
}
// Report progress, errors, etc.
switch ( $data['type'] ?? '**MISSING**' ) {
case 'progress':
$progress->set( $data['progress'], 'Importing WXR file: ' . $data['caption'] );
break;
case 'error':
throw new BlueprintExecutionException( $data['message'] );
case 'completion':
$progress->finish();
break;
default:
throw new BlueprintExecutionException( 'Unknown message type: ' . $data['type'] );
}
}
} finally {
$output->close_reading();
}

if ( 0 !== $import_process->getExitCode() ) {
Expand Down
Loading