diff --git a/src/Plugin/MediaEntity/Type/Svg.php b/src/Plugin/MediaEntity/Type/Svg.php index 7605ee1..23975e7 100644 --- a/src/Plugin/MediaEntity/Type/Svg.php +++ b/src/Plugin/MediaEntity/Type/Svg.php @@ -2,9 +2,6 @@ namespace Drupal\media_entity_svg\Plugin\MediaEntity\Type; -use Drupal\Core\Config\Config; -use Drupal\Core\Entity\EntityFieldManagerInterface; -use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\media_entity\MediaInterface; use Drupal\media_entity\MediaTypeBase; use Drupal\Core\Form\FormStateInterface; @@ -76,77 +73,6 @@ class Svg extends MediaTypeBase { } /** - * Create thumbnail. - * - * @param \Drupal\media_entity\MediaInterface $media - * Media entity. - * @param bool $overwrite - * Whether the thumbnail should be overwritten if one is found. - * - * @return string|bool - * Thumbnail URI of the media or false. - */ - public function createThumbnail(MediaInterface $media, $overwrite = FALSE) { - $thumbnail_uri = $this->getThumbnailUri($media); - $output = NULL; - - if (!$overwrite && file_exists($thumbnail_uri)) { - $output = $thumbnail_uri; - } - else { - $svg2png_path = \Drupal::config('media_entity_svg.settings') - ->get('svg2png_path'); - if (empty($svg2png_path)) { - return FALSE; - } - - $thumbnail_uri = $this->getThumbnailUri($media); - $thumbnail_path = $this->fileSystem->realpath($thumbnail_uri); - file_prepare_directory($this->thumbnailDir, FILE_CREATE_DIRECTORY); - - // Try to convert the icon as SVG. - $icon_id = $this->getField($media, 'id'); - $source_realpath = $this->getField($media, 'source_realpath'); - $svg_data = $this->svgManager->extractIconAsSvg($source_realpath, $icon_id); - if (!$svg_data) { - return $this->getDefaultThumbnail(); - } - - // Convert the SVG as a PNG. - $tmp = $this->fileSystem->tempnam('temporary://', 'icon_'); - $svg_tmp = $this->fileSystem->realpath($tmp . '.svg'); - if (file_put_contents($svg_tmp, $svg_data) === FALSE) { - drupal_set_message(t('The SVG file could not be prepared.'), 'error'); - return FALSE; - } - - // Convert via svg2png. - $png_tmp = $this->fileSystem->realpath($tmp . '.png'); - $cmd = $svg2png_path - . ' ' . $svg_tmp - . ' --output=' . $png_tmp; - $thumbnail_width = \Drupal::config('media_entity_icon.settings') - ->get('thumbnail_width'); - if (!empty($thumbnail_width)) { - $cmd .= ' --width=' . $thumbnail_width; - } - try { - exec($cmd); - if (file_unmanaged_move($png_tmp, $thumbnail_path, FILE_EXISTS_REPLACE)) { - $output = $thumbnail_uri; - } - } - catch (\Exception $e) { - $output = FALSE; - } - - file_unmanaged_delete($svg_tmp); - } - - return $output; - } - - /** * {@inheritdoc} */ public function thumbnail(MediaInterface $media) { @@ -155,20 +81,11 @@ class Svg extends MediaTypeBase { $file = $media->{$source_field}->entity; if ($file) { - $mimetype = $file->getMimeType(); - $mimetype = explode('/', $mimetype); - $thumbnail = $this->config->get('icon_base') . "/{$mimetype[0]}-{$mimetype[1]}.png"; - - if (!is_file($thumbnail)) { - $thumbnail = $this->config->get('icon_base') . "/{$mimetype[1]}.png"; - - if (!is_file($thumbnail)) { - $thumbnail = $this->config->get('icon_base') . '/document.png'; - } - } + $thumbnail = $file->getFileUri(); } else { - $thumbnail = $this->config->get('icon_base') . '/document.png'; + $module_path = drupal_get_path('module', 'media_entity_svg'); + $thumbnail = $module_path . '/images/icons/document.png'; } return $thumbnail; diff --git a/src/Plugin/SvgManager.php b/src/Plugin/SvgManager.php index 36b969d..c08a861 100644 --- a/src/Plugin/SvgManager.php +++ b/src/Plugin/SvgManager.php @@ -30,98 +30,6 @@ class SvgManager implements SvgManagerInterface { } /** - * {@inheritdoc} - */ - public function getIconSize($svg_path, $icon_id) { - $size = []; - $svg_source = $this->getSimpleXml($svg_path); - - // Find matching element. - $elements = $svg_source ? $svg_source->xpath('//ns:symbol[@id="' . $icon_id . '"]') : NULL; - if (!isset($elements[0])) { - return $size; - } - - // Gather meaningful attributes. - $attributes = $elements[0]->attributes(); - if (isset($attributes['viewBox'])) { - list(,, $width, $height) = explode(' ', $attributes['viewBox']); - $size['width'] = $width; - $size['height'] = $height; - } - else { - if (isset($attributes['width'])) { - $size['width'] = $attributes['width']; - } - if (isset($attributes['height'])) { - $size['height'] = $attributes['height']; - } - } - - return $size; - } - - /** - * {@inheritdoc} - */ - public function extractIconIds($svg_path) { - if (isset($this->cachedExtractedIds[$svg_path])) { - return $this->cachedExtractedIds[$svg_path]; - } - - $ids = []; - $svg_source = $this->getSimpleXml($svg_path); - - // Find matching element. - $elements = $svg_source ? $svg_source->xpath('//ns:symbol[@id]') : NULL; - if (empty($elements)) { - return $ids; - } - - foreach ($elements as $element) { - $attributes = $element->attributes(); - $id = !empty($attributes->id) ? $attributes->id->__toString() : NULL; - if (isset($id)) { - $ids[$id] = $id; - } - } - - $this->cachedExtractedIds[$svg_path] = $ids; - - return $this->cachedExtractedIds[$svg_path]; - } - - /** - * {@inheritdoc} - */ - public function extractIconAsSvg($svg_path, $icon_id) { - $svg_source = $this->getSimpleXml($svg_path); - - // Find matching element. - $elements = $svg_source ? $svg_source->xpath('//ns:symbol[@id="' . $icon_id . '"]') : NULL; - if (!isset($elements[0])) { - return NULL; - } - - // New SVG. - $svg = new \SimpleXMLElement(''); - $svg->addAttribute('xmlns', 'http://www.w3.org/2000/svg'); - foreach ($elements[0]->attributes() as $attr => $value) { - $svg->addAttribute($attr, $value); - } - /** @var \SimpleXMLElement $data */ - foreach ($elements[0]->children() as $name => $data) { - $xmlElement = $svg->addChild($name, $data); - foreach ($data->attributes() as $attr => $value) { - $xmlElement->addAttribute($attr, $value); - } - } - - // Return SVG. - return $svg->asXML(); - } - - /** * Get SimpleXML from SVG file, store it in static cache to avoid redundancy. * * @param string $svg_path diff --git a/src/Plugin/SvgManagerInterface.php b/src/Plugin/SvgManagerInterface.php index 81638df..50a1229 100644 --- a/src/Plugin/SvgManagerInterface.php +++ b/src/Plugin/SvgManagerInterface.php @@ -9,41 +9,4 @@ namespace Drupal\media_entity_svg; */ interface SvgManagerInterface { - /** - * Gather width and height from icon. - * - * @param string $svg_path - * SVG local or distant path. - * @param int $icon_id - * Icon identifier. - * - * @return array - * Width and height as keys of an array. - */ - public function getIconSize($svg_path, $icon_id); - - /** - * Extract icon ids. - * - * @param string $svg_path - * SVG local or distant path. - * - * @return array - * Found icons fetched by IDs. - */ - public function extractIconIds($svg_path); - - /** - * Extract icon as a single SVG. - * - * @param string $svg_path - * SVG local or distant path. - * @param int $icon_id - * Icon identifier. - * - * @return string - * SVG string representing the isolated icon. - */ - public function extractIconAsSvg($svg_path, $icon_id); - } diff --git a/src/Plugin/SvgTypeManager.php b/src/Plugin/SvgTypeManager.php index 6b11478..6cca954 100644 --- a/src/Plugin/SvgTypeManager.php +++ b/src/Plugin/SvgTypeManager.php @@ -26,20 +26,6 @@ class SvgTypeManager implements SvgTypeManagerInterface { protected $mediaTypeManager; /** - * Static cache of icon bundle ids. - * - * @var array - */ - protected $iconBundleIds; - - /** - * Static cache of icon bundles config fields. - * - * @var array - */ - protected $iconBundlesConfig; - - /** * Static cache of sprite bundle ids. * * @var array @@ -69,85 +55,6 @@ class SvgTypeManager implements SvgTypeManagerInterface { /** * {@inheritdoc} */ - public function getIconBundleNames($reset = FALSE) { - if ($reset || !isset($this->iconBundleIds)) { - $this->iconBundleIds = []; - $media_bundles = $this->mediaTypeManager->getDefinitions(); - foreach ($media_bundles as $id => $definition) { - if ('Drupal\media_entity_icon\Plugin\MediaEntity\Type\SvgIcon' === $definition['class']) { - $this->iconBundleIds[$id] = $definition['label']; - } - } - } - - return $this->iconBundleIds; - } - - /** - * {@inheritdoc} - */ - public function getIconBundleConfigs($reset = FALSE) { - if ($reset || !isset($this->iconBundlesConfig)) { - $this->iconBundlesConfig = []; - - // Load media bundles ... - $icon_bundle_ids = array_keys($this->getIconBundleNames()); - $icon_bundles = []; - if (!empty($icon_bundle_ids)) { - $icon_bundles = $this->entityTypeManager - ->getStorage('media_bundle') - ->loadMultiple($icon_bundle_ids); - } - - // ... to get the config. - foreach ($icon_bundles as $icon_bundle_id => $icon_bundle) { - $this->iconBundlesConfig[$icon_bundle_id] = $icon_bundle->getTypeConfiguration(); - } - } - - return $this->iconBundlesConfig; - } - - /** - * {@inheritdoc} - */ - public function getIconBundleConfig($bundle_id, $reset = FALSE) { - if ($reset || !isset($this->iconBundlesConfig[$bundle_id])) { - $this->iconBundlesConfig[$bundle_id] = []; - - // Load media bundle ... - $icon_bundle = $this->entityTypeManager - ->getStorage('media_bundle') - ->load($bundle_id); - - // ... to get the config. - $this->iconBundlesConfig[$bundle_id] = $icon_bundle->getTypeConfiguration(); - } - - return $this->iconBundlesConfig[$bundle_id]; - } - - /** - * {@inheritdoc} - */ - public function getIconBundleSourceField($bundle_id, $reset = FALSE) { - $icon_bundle_config = $this->getIconBundleConfig($bundle_id, $reset); - - return isset($icon_bundle_config['source_field']) ? $icon_bundle_config['source_field'] : NULL; - } - - /** - * {@inheritdoc} - */ - public function getIconBundleIdField($bundle_id, $reset = FALSE) { - $icon_bundle_config = $this->getIconBundleConfig($bundle_id, $reset); - - return isset($icon_bundle_config['id_field']) ? $icon_bundle_config['id_field'] : NULL; - } - - /** - * {@inheritdoc} - */ public function getSpriteBundleNames($reset = FALSE) { if ($reset || !isset($this->spriteBundleIds)) { $this->spriteBundleIds = []; diff --git a/src/Plugin/SvgTypeManagerInterface.php b/src/Plugin/SvgTypeManagerInterface.php index d1016c5..3dc9122 100644 --- a/src/Plugin/SvgTypeManagerInterface.php +++ b/src/Plugin/SvgTypeManagerInterface.php @@ -10,67 +10,6 @@ namespace Drupal\media_entity_svg; interface SvgTypeManagerInterface { /** - * Get icon bundle names fetched by IDs. - * - * @param bool $reset - * Whether it should purge the static cache or not. - * - * @return array - * Icon bundles names fetched by bundle ID. - */ - public function getIconBundleNames($reset = FALSE); - - /** - * Get icon bundles configuration. - * - * @param bool $reset - * Whether it should purge the static cache or not. - * - * @return array - * Icon bundles config fetch by bundle ID. - */ - public function getIconBundleConfigs($reset = FALSE); - - /** - * Get icon bundle configuration. - * - * @param string $bundle_id - * Icon bundle ID. - * @param bool $reset - * Whether it should purge the static cache or not. - * - * @return array - * Bundle configuration. - */ - public function getIconBundleConfig($bundle_id, $reset = FALSE); - - /** - * Get icon bundle source field. - * - * @param string $bundle_id - * Icon bundle ID. - * @param bool $reset - * Whether it should purge the static cache or not. - * - * @return string - * Source field name or null if none found. - */ - public function getIconBundleSourceField($bundle_id, $reset = FALSE); - - /** - * Get icon bundle id field. - * - * @param string $bundle_id - * Icon bundle ID. - * @param bool $reset - * Whether it should purge the static cache or not. - * - * @return string - * ID field name or null if none found. - */ - public function getIconBundleIdField($bundle_id, $reset = FALSE); - - /** * Get sprite bundle names fetched by ids. * * @param bool $reset