wpstudio
/
image
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Correct for use Majestic namespace

master
Alexander Demidov 11 years ago
parent
ba2985f072
commit
ccd1d64f70
8 changed files with 38 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      File.php
  2. 0
      FileHelper.php
  3. 8
      Image.php
  4. 10
      ImageCollection.php
  5. 2
      ImageVariant.php
  6. 36
      Upload.php
  7. 8
      UploadHelper.php
  8. 2
      composer.json

10
File.class.php → File.php
View File

@ -38,13 +38,13 @@ abstract class File
public function log($message) public function log($message)
{ {
if (Config::get('LOGGING')) {
if (\Majestic\Config::get('LOGGING')) {
if (is_null($this->logger)) { if (is_null($this->logger)) {
$this->logger = Logger::getInstance();
$this->logger = \Majestic\Logger\Logger::getInstance();
} }
$this->logger->log($message); $this->logger->log($message);
} else { } else {
$this->error_stream = Config::get('ErrorStream', 'php://stderr');
$this->error_stream = \Majestic\Config::get('ErrorStream', 'php://stderr');
file_put_contents($this->error_stream, PHP_EOL . 'Log ' . '#' . __CLASS__ . ': ' . $message . PHP_EOL, FILE_APPEND); file_put_contents($this->error_stream, PHP_EOL . 'Log ' . '#' . __CLASS__ . ': ' . $message . PHP_EOL, FILE_APPEND);
} }
} }
@ -52,7 +52,7 @@ abstract class File
/** /**
* @param array|string|null $data * @param array|string|null $data
* @return Image * @return Image
* @throws ErrorException
* @throws \ErrorException
*/ */
public static function getInstance($data = null) public static function getInstance($data = null)
{ {
@ -86,7 +86,7 @@ abstract class File
* @var $this Image * @var $this Image
*/ */
if (!array_key_exists($size, $this->variants)) { if (!array_key_exists($size, $this->variants)) {
$original_file_path = Config::get('PATH_WEB_ROOT') . '/' . $this->getWebName();
$original_file_path = \Majestic\Config::get('PATH_WEB_ROOT') . '/' . $this->getWebName();
if ($force_create && $this->getIsNoEmpty() && file_exists($original_file_path)) { if ($force_create && $this->getIsNoEmpty() && file_exists($original_file_path)) {
Upload::imageVariant($this, $size); Upload::imageVariant($this, $size);
} else { } else {

0
FileHelper.class.php → FileHelper.php
View File

8
Image.class.php → Image.php
View File

@ -29,18 +29,18 @@ abstract class Image extends File
} }
/** /**
* @param $class string|StdClass
* @throws ErrorException
* @param $class string|\StdClass
* @throws \ErrorException
*/ */
public static function checkSubClass($class) public static function checkSubClass($class)
{ {
if (!self::getIsSubClass($class)) { if (!self::getIsSubClass($class)) {
throw new ErrorException('Class "' . $class . '" mast be extend of "Image".');
throw new \ErrorException('Class "' . $class . '" mast be extend of "Image".');
} }
} }
/** /**
* @param $class string|StdClass
* @param $class string|\StdClass
* @return bool * @return bool
*/ */
public static function getIsSubClass($class) public static function getIsSubClass($class)

10
ImageCollection.class.php → ImageCollection.php
View File

@ -1,7 +1,7 @@
<?php <?php
namespace dimti\Image; namespace dimti\Image;
abstract class ImageCollection extends ArrayIterator
abstract class ImageCollection extends \ArrayIterator
{ {
/** /**
* @var string * @var string
@ -11,7 +11,7 @@ abstract class ImageCollection extends ArrayIterator
/** /**
* @param array|null $data * @param array|null $data
* @param mixed $owner * @param mixed $owner
* @throws ErrorException
* @throws \ErrorException
* TODO: рефакторить этот метод * TODO: рефакторить этот метод
*/ */
public function __construct($data = null, $owner = null) public function __construct($data = null, $owner = null)
@ -25,17 +25,17 @@ abstract class ImageCollection extends ArrayIterator
if (!is_array($data)) { if (!is_array($data)) {
$data = json_decode($data, true); $data = json_decode($data, true);
if (json_last_error() != JSON_ERROR_NONE) { if (json_last_error() != JSON_ERROR_NONE) {
ErrorMessage::log('Unable to convert json-string to array.');
\ErrorMessage::log('Unable to convert json-string to array.');
return; return;
} }
} }
if (!isset($data['order']) || !isset($data['files'])) { if (!isset($data['order']) || !isset($data['files'])) {
ErrorMessage::log('Incorrect format for create ImageCollection.');
\ErrorMessage::log('Incorrect format for create ImageCollection.');
return; return;
} }
foreach ($data['order'] as $original_filename) { foreach ($data['order'] as $original_filename) {
if (!isset($data['files'][$original_filename])) { if (!isset($data['files'][$original_filename])) {
ErrorMessage::log('Unable to fetch image "' . $original_filename . '" from ImageCollection.');
\ErrorMessage::log('Unable to fetch image "' . $original_filename . '" from ImageCollection.');
continue; continue;
} }
$image_instance = $class::getInstance($data['files'][$original_filename]); $image_instance = $class::getInstance($data['files'][$original_filename]);

2
ImageVariant.class.php → ImageVariant.php
View File

@ -9,7 +9,7 @@ class ImageVariant extends File
public $size; public $size;
/** /**
* @param $class string|StdClass
* @param $class string|\StdClass
* @return mixed * @return mixed
*/ */
public static function getIsClass($class) public static function getIsClass($class)

36
Upload.class.php → Upload.php
View File

@ -11,16 +11,16 @@ abstract class Upload
public static function &getGreagwarImage($file_path) public static function &getGreagwarImage($file_path)
{ {
$greagwar_image = new GreagwarImage($file_path);
$config_upload = Config::get('Upload');
$greagwar_image = new \GreagwarImage($file_path);
$config_upload = \Majestic\Config::get('Upload');
$dir_image_cache = $config_upload ? $config_upload->dir_image_cache : self::$dir_image_cache; $dir_image_cache = $config_upload ? $config_upload->dir_image_cache : self::$dir_image_cache;
$greagwar_image->setCacheDir(Config::get('PATH_WEB_ROOT') . DIRECTORY_SEPARATOR . $dir_image_cache);
$greagwar_image->setCacheDir(\Majestic\Config::get('PATH_WEB_ROOT') . DIRECTORY_SEPARATOR . $dir_image_cache);
return $greagwar_image; return $greagwar_image;
} }
public static function getFilePath($image) public static function getFilePath($image)
{ {
return Config::get('PATH_WEB_ROOT') . DIRECTORY_SEPARATOR . $image->path . DIRECTORY_SEPARATOR . $image->filename;
return \Majestic\Config::get('PATH_WEB_ROOT') . DIRECTORY_SEPARATOR . $image->path . DIRECTORY_SEPARATOR . $image->filename;
} }
/** /**
@ -37,10 +37,10 @@ abstract class Upload
* @var $image Image * @var $image Image
*/ */
if (is_null($class) || $class == '') { if (is_null($class) || $class == '') {
throw new ErrorException('Class not defined.');
throw new \ErrorException('Class not defined.');
} }
if (!is_object($class) && !class_exists($class)) { if (!is_object($class) && !class_exists($class)) {
throw new ErrorException('Class "' . $class . '" not exists.');
throw new \ErrorException('Class "' . $class . '" not exists.');
} }
Image::checkSubClass($class); Image::checkSubClass($class);
if (isset($file['error']) && $file['error'] != 0) { if (isset($file['error']) && $file['error'] != 0) {
@ -62,7 +62,7 @@ abstract class Upload
/** /**
* @param $image Image * @param $image Image
* @param $size string @ex '1200x960' * @param $size string @ex '1200x960'
* @param $greagwar_image GreagwarImage @deprecated
* @param $greagwar_image \GreagwarImage @deprecated
*/ */
public static function imageVariant($image, $size, $greagwar_image = null) public static function imageVariant($image, $size, $greagwar_image = null)
{ {
@ -70,21 +70,21 @@ abstract class Upload
$image_variant = new ImageVariant(); $image_variant = new ImageVariant();
$size_parts = explode('x', $size); $size_parts = explode('x', $size);
self::saveImage($image_variant, self::getFilePath($image), $size_parts[0] ? : null, $size_parts[1] ? : null); self::saveImage($image_variant, self::getFilePath($image), $size_parts[0] ? : null, $size_parts[1] ? : null);
if (Config::get('PYTHON_PIL_PASTE') &&
if (\Majestic\Config::get('PYTHON_PIL_PASTE') &&
method_exists($image, 'getWatermark') && method_exists($image, 'getWatermark') &&
$image->getWatermark($size) $image->getWatermark($size)
) { ) {
$script_file_path = Config::get('PYTHON_PIL_PASTE')->script_file_path;
$pil_options = (isset(Config::get('PYTHON_PIL_PASTE')->pil_options) && Config::get('PYTHON_PIL_PASTE')->pil_options) ? ' ' . implode(' ', Config::get('PYTHON_PIL_PASTE')->pil_options) : '';
$script_file_path = \Majestic\Config::get('PYTHON_PIL_PASTE')->script_file_path;
$pil_options = (isset(\Majestic\Config::get('PYTHON_PIL_PASTE')->pil_options) && \Majestic\Config::get('PYTHON_PIL_PASTE')->pil_options) ? ' ' . implode(' ', \Majestic\Config::get('PYTHON_PIL_PASTE')->pil_options) : '';
ob_start(); ob_start();
$code = null; $code = null;
$command = $script_file_path $command = $script_file_path
. $pil_options . $pil_options
. ' ' . self::getFilePath($image_variant) . ' ' . self::getFilePath($image_variant)
. ' ' . Config::get('PATH_WEB_ROOT') . '/' . $image->getWatermark($size);
. ' ' . \Majestic\Config::get('PATH_WEB_ROOT') . '/' . $image->getWatermark($size);
passthru('exec 2>&1; ' . $command, $code); passthru('exec 2>&1; ' . $command, $code);
if ($code !== 0) { if ($code !== 0) {
throw new ErrorException('Command PYTHON_PIL_PASTE exit with code "' . $code . '": ' . $command . PHP_EOL . 'Std out: ' . ob_get_clean() );
throw new \ErrorException('Command PYTHON_PIL_PASTE exit with code "' . $code . '": ' . $command . PHP_EOL . 'Std out: ' . ob_get_clean() );
} }
ob_end_clean(); ob_end_clean();
} }
@ -94,7 +94,7 @@ abstract class Upload
/** /**
* @param $image ImageVariant|Image * @param $image ImageVariant|Image
* @param $tmp_file_path string|GreagwarImage
* @param $tmp_file_path string|\GreagwarImage
* @param null $width * @param null $width
* @param null $height * @param null $height
* TODO: Возможно, стоит искоренить GreagwarImage * TODO: Возможно, стоит искоренить GreagwarImage
@ -126,9 +126,9 @@ abstract class Upload
copy($tmp_file_path, $file_path); copy($tmp_file_path, $file_path);
} }
} else { } else {
if (Config::get('PYTHON_PIL_RESIZE')) {
$script_file_path = Config::get( 'PYTHON_PIL_RESIZE' )->script_file_path;
$pil_options = isset( Config::get( 'PYTHON_PIL_RESIZE' )->pil_options ) ? ' ' . implode( ' ', Config::get( 'PYTHON_PIL_RESIZE' )->pil_options ) : '';
if (\Majestic\Config::get('PYTHON_PIL_RESIZE')) {
$script_file_path = \Majestic\Config::get( 'PYTHON_PIL_RESIZE' )->script_file_path;
$pil_options = isset( \Majestic\Config::get( 'PYTHON_PIL_RESIZE' )->pil_options ) ? ' ' . implode( ' ', \Majestic\Config::get( 'PYTHON_PIL_RESIZE' )->pil_options ) : '';
// ob_start(); // ob_start();
$code = null; $code = null;
$command = $script_file_path $command = $script_file_path
@ -140,7 +140,7 @@ abstract class Upload
ob_start(); ob_start();
passthru( 'exec 2>&1; ' . $command, $code ); passthru( 'exec 2>&1; ' . $command, $code );
if ($code !== 0) { if ($code !== 0) {
throw new ErrorException('Command PYTHON_PIL_RESIZE exit with code "' . $code . '": ' . $command . PHP_EOL . 'Std out: ' . ob_get_clean() );
throw new \ErrorException('Command PYTHON_PIL_RESIZE exit with code "' . $code . '": ' . $command . PHP_EOL . 'Std out: ' . ob_get_clean() );
} }
ob_end_clean(); ob_end_clean();
} else { } else {
@ -175,7 +175,7 @@ abstract class Upload
$output = shell_exec("convert {$file_path} -brightness-contrast {$value} {$file_path} 2>&1"); $output = shell_exec("convert {$file_path} -brightness-contrast {$value} {$file_path} 2>&1");
if (isset($output) && $output) { if (isset($output) && $output) {
if (class_exists('ErrorMessage')) { if (class_exists('ErrorMessage')) {
ErrorMessage::log($output);
\ErrorMessage::log($output);
} }
} }
} }

8
UploadHelper.class.php → UploadHelper.php
View File

@ -7,12 +7,12 @@ abstract class UploadHelper
* @param $proportion * @param $proportion
* @param $file_path * @param $file_path
* @return bool * @return bool
* @throws ErrorException
* @throws \ErrorException
*/ */
public static function imageCompareAspectRatio($proportion, $file_path) public static function imageCompareAspectRatio($proportion, $file_path)
{ {
if (!(file_exists($file_path) && is_readable($file_path) && is_file($file_path))) { if (!(file_exists($file_path) && is_readable($file_path) && is_file($file_path))) {
throw new ErrorException('Unable to read file "' . $file_path . '".');
throw new \ErrorException('Unable to read file "' . $file_path . '".');
} }
if ($imagesize = getimagesize($file_path)) { if ($imagesize = getimagesize($file_path)) {
$proprtion_parts = explode('x', $proportion); $proprtion_parts = explode('x', $proportion);
@ -27,12 +27,12 @@ abstract class UploadHelper
* @param $size * @param $size
* @param $file_path * @param $file_path
* @return bool * @return bool
* @throws ErrorException
* @throws \ErrorException
*/ */
public static function imageCompareSize($size, $file_path) public static function imageCompareSize($size, $file_path)
{ {
if (!(file_exists($file_path) && is_readable($file_path) && is_file($file_path))) { if (!(file_exists($file_path) && is_readable($file_path) && is_file($file_path))) {
throw new ErrorException('Unable to read file "' . $file_path . '".');
throw new \ErrorException('Unable to read file "' . $file_path . '".');
} }
if ($imagesize = getimagesize($file_path)) { if ($imagesize = getimagesize($file_path)) {
$size_parts = explode('x', $size); $size_parts = explode('x', $size);

2
composer.json
View File

@ -1,6 +1,6 @@
{ {
"name": "dimti/Image", "name": "dimti/Image",
"version": "0.1.3",
"version": "0.1.4",
"description": "Image lib", "description": "Image lib",
"autoload": { "autoload": {
"psr-4": { "psr-4": {

Write Preview
Loading…
Cancel
Save