Skip to content
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

Jump to bottom

Make methods fluent and also add more methods to class #17

Merged
merged 2 commits into from
Apr 6, 2021
Merged

Make methods fluent and also add more methods to class #17

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0509686
change methods to class
mantey-github Mar 19, 2021
aec6fe7
set some methods as private
mantey-github Mar 19, 2021
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
234 changes: 107 additions & 127 deletions src/InitRed/Tabula/Tabula.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,21 @@ class Tabula
public $os;
public $encoding = 'utf-8';
public $javaOptions = [];
public $options = [];
public $input = null;
public $options = [
'pages' => null,
'guess' => true,
'area' => [],
'relativeArea' => false,
'lattice' => false,
'stream' => false,
'password' => null,
'silent' => false,
'columns' => null,
'format' => null,
'batch' => null,
'outfile' => null,
];

/**
* Additional dir to check for java executable
Expand All @@ -42,6 +55,7 @@ class Tabula
/**
* Tabula constructor.
* @param null $binDir
* @param string $encoding
*/
public function __construct($binDir = null, $encoding = 'utf-8')
{
Expand Down Expand Up @@ -94,10 +108,13 @@ public function getJarArchive()

/**
* @param string $jarArchive
* @return Tabula
*/
public function setJarArchive($jarArchive)
public function setJarArchive(string $jarArchive)
{
$this->jarArchive = $jarArchive;

return $this;
}

/**
Expand All @@ -110,13 +127,39 @@ public function getBinDir()

/**
* @param $binDir
* @return Tabula
*/
public function setBinDir($binDir)
{
$this->binDir = $binDir;

return $this;
}

/**
* @param string $input
* @return Tabula
*/
public function setPdf(string $input)
{
$this->input = $input;

return $this;
}

public function buildJavaOptions()
/**
* @param array $options
* @return Tabula
*/
public function setOptions(array $options)
{
$this->options = array_merge($this->options, $options);

return $this;
}


private function buildJavaOptions()
{
$javaOptions = ['java'];

Expand All @@ -143,6 +186,10 @@ public function buildJavaOptions()
$this->javaOptions = $javaOptions;
}

/**
* @param $format
* @return string
*/
public function extractFormatForConversion($format)
{
if(empty($format)) {
Expand All @@ -158,146 +205,126 @@ public function extractFormatForConversion($format)
}
}

/**
* @param $path
* @return bool
*/
public function existFileCheck($path)
{
if(!file_exists($path)) {
throw new InvalidArgumentException('File does not exist.');
}

if (!is_readable($path)) {
throw new InvalidArgumentException("Could not read `{$path}`");
}

return true;
}

/**
* @param $path
* @return bool
*/
public function existDirectoryCheck($path)
{
if(!is_dir($path)) {
throw new InvalidArgumentException('Folder to target Pdf does not exist.');
}
}

public function addInputOption($input)
{
$this->input = $input;
return true;
}


/**
* @param null $pages
* @param bool $guess
* @param null $area
* @param bool $relativeArea
* @param bool $lattice
* @param bool $stream
* @param null $password
* @param bool $silent
* @param null $columns
* @param null $format
* @param null $batch
* @param null $outputPath
* @param string $options
* @param array $options
*/
public function buildOptions(
$pages = null,
$guess = true,
$area = null,
$relativeArea = false,
$lattice = false,
$stream = false,
$password = null,
$silent = false,
$columns = null,
$format = null,
$batch = null,
$outputPath = null,
$options = ''
) {
$this->options = [];

private function buildOptions(array $options)
{
$buildOptions = [];

if(!is_null($this->input)) {
if($this->existFileCheck($this->input)) {
if (! is_null($this->input)) {
if ($this->existFileCheck($this->input)) {
$buildOptions = array_merge($buildOptions, [$this->input]);
}
}

if(!is_null($pages)) {
if($pages === 'all') {
if (! is_null($options['pages'])) {
if ($options['pages'] === 'all') {
$buildOptions = array_merge($buildOptions, ['--page', 'all']);
} else {
$area = implode( ',', $pages);
$buildOptions = array_merge($buildOptions, ['--page', $pages]);
$options['area'] = implode(',', [$options['pages']]);
$buildOptions = array_merge($buildOptions, ['--page', $options['pages']]);
}
}

$multipleArea = false;

if(!is_null($area)) {
$guess = false;
if (! is_null($options['area']) && !empty($options['area'])) {
$options['guess'] = false;

foreach($area as $key => $value) {
if(substr( $value, 0, 1 ) === '%') {
if($relativeArea) {
$area[$key] = str_replace('%', '', $area[$key]);
foreach ($options['area'] as $key => $value) {
if (substr($value, 0, 1) === '%') {
if ($options['relativeArea']) {
$options['area'][$key] = str_replace('%', '', $options['area'][$key]);
}
}
}

$area = implode( ',', $area);
$options['area'] = implode(',', $options['area']);

$buildOptions = array_merge($buildOptions, ["--area", $area]);
$buildOptions = array_merge($buildOptions, ['--area', $options['area']]);
}

if($lattice) {
$buildOptions = array_merge($buildOptions, ["--lattice"]);
if ($options['lattice']) {
$buildOptions = array_merge($buildOptions, ['--lattice']);
}

if($stream) {
$buildOptions = array_merge($buildOptions, ["--stream"]);
if ($options['stream']) {
$buildOptions = array_merge($buildOptions, ['--stream']);
}

if($guess && !$multipleArea) {
$buildOptions = array_merge($buildOptions, ["--guess"]);
if ($options['guess'] && ! $multipleArea) {
$buildOptions = array_merge($buildOptions, ['--guess']);
}

if(!is_null($format)) {

$format = $this->extractFormatForConversion($format);
$buildOptions = array_merge($buildOptions, ["--format", $format]);
if (! is_null($options['format'])) {
$format = $this->extractFormatForConversion($options['format']);
$buildOptions = array_merge($buildOptions, ['--format', $format]);
}

if(!is_null($outputPath)) {
$buildOptions = array_merge($buildOptions, ["--outfile", $outputPath]);
if (! is_null($options['outfile'])) {
$buildOptions = array_merge($buildOptions, ['--outfile', $options['outfile']]);
}

if(!is_null($columns)) {
$columns = implode( ',', $columns );
$buildOptions = array_merge($buildOptions, ["--columns", $columns]);
if (! is_null($options['columns'])) {
$columns = implode(',', $options['columns']);
$buildOptions = array_merge($buildOptions, ['--columns', $columns]);
}

if(!is_null($password)) {
$buildOptions = array_merge($buildOptions, ["--password", $password]);
if (! is_null($options['password'])) {
$buildOptions = array_merge($buildOptions, ['--password', $options['password']]);
}

if(!is_null($batch)) {

if(!is_dir($batch)) {
throw new InvalidArgumentException('Folder to output Pdf does not exist.');
if (! is_null($options['batch'])) {
if ($this->existDirectoryCheck($options['batch'])) {
$buildOptions = array_merge($buildOptions, ['--batch', $options['batch']]);
}

$buildOptions = array_merge($buildOptions, ['--batch', $batch]);
}

if($silent) {
$buildOptions = array_merge($buildOptions, ["--silent"]);
if ($options['silent']) {
$buildOptions = array_merge($buildOptions, ['--silent']);
}

$this->options = $buildOptions;
}

public function run()
private function run()
{
$parameters = array_merge($this->javaOptions, $this->options);

$process = new Process($parameters);

$process->run();

if (!$process->isSuccessful()) {
Expand All @@ -307,57 +334,10 @@ public function run()
$process->getOutput();
}

/**
* @param $input
* @param $output
* @param string $format
* @param string $pages
*/
public function convertInto($input, $output, $format = 'csv', $pages = 'all')
{
self::buildJavaOptions();
self::addInputOption($input);
self::buildOptions(
$pages,
true,
null,
false,
false,
false,
null,
false,
null,
$format,
null,
$output,
null
);
self::run();
}

/**
* @param $directory
* @param string $format
* @param string $pages
*/
public function convertIntoByBatch($directory, $format = 'csv', $pages = 'all')
public function convert()
{
self::buildJavaOptions();
self::buildOptions(
$pages,
true,
null,
false,
false,
false,
null,
false,
null,
$format,
$directory,
null,
null
);
self::buildOptions($this->options);
self::run();
}
}
}