wikimedia/mediawiki-extensions-PdfHandler
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/PdfHandler synced 2024-11-24 00:07:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Switch to the new shell framework"

Browse source
This commit is contained in:
jenkins-bot 2017-11-07 06:19:01 +00:00 committed by Gerrit Code Review
parent 2b7426db8e adf2733fea
commit acb0f0f2c5
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
PdfHandler.image.php
View file

@ -20,6 +20,7 @@
*/
use MediaWiki\Logger\LoggerFactory;
use MediaWiki\Shell\Shell;
use UtfNormal\Validator;
/**
@ -113,13 +114,17 @@ class PdfImage {
global $wgPdfInfo, $wgPdftoText;
if ( $wgPdfInfo ) {
$cmd = wfEscapeShellArg( $wgPdfInfo ) .
" -enc UTF-8 " . # Report metadata as UTF-8 text...
" -l 9999999 " . # Report page sizes for all pages
" -meta " . # Report XMP metadata
wfEscapeShellArg( $this->mFilename );
$retval = '';
$dump = wfShellExec( $cmd, $retval );
$cmd = [
$wgPdfInfo,
'-enc', 'UTF-8', # Report metadata as UTF-8 text...
'-l', '9999999', # Report page sizes for all pages
'-meta', # Report XMP metadata
$this->mFilename,
];
$result = Shell::command( $cmd )
->execute();
$dump = $result->getStdout();
$data = $this->convertDumpToArray( $dump );
} else {
$data = null;
@ -127,10 +132,11 @@ class PdfImage {
// Read text layer
if ( isset( $wgPdftoText ) ) {
$cmd = wfEscapeShellArg( $wgPdftoText ) . ' '. wfEscapeShellArg( $this->mFilename ) . ' - ';
wfDebug( __METHOD__.": $cmd\n" );
$retval = '';
$txt = wfShellExec( $cmd, $retval );
$cmd = [ $wgPdftoText, $this->mFilename, '-' ];
$result = Shell::command( $cmd )
->execute();
$retval = $result->getExitCode();
$txt = $result->getStdout();
if ( $retval == 0 ) {
$txt = str_replace( "\r\n", "\n", $txt );
$pages = explode( "\f", $txt );