Skip to content
This repository has been archived by the owner on May 26, 2020. It is now read-only.

Only fetch the width and height when it is a file #116

Merged
merged 3 commits into from
Mar 27, 2017
Merged

Only fetch the width and height when it is a file #116

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba5fb36
Only determine the with and height when it is a file
laoneo Mar 25, 2017
c165056
Handle image detection properly
laoneo Mar 27, 2017
516561c
Handle image detection properly
laoneo Mar 27, 2017
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
12 changes: 4 additions & 8 deletions administrator/components/com_media/libraries/media/file/adapter/local.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,20 +277,16 @@ private function getPathInformation($path)
$obj->modified_date = $modifiedDate->format('c', true);
$obj->modified_date_formatted = (string) $modifiedDate; // TODO use format from config
$obj->mime_type = mime_content_type($path);
$obj->width = 0;
$obj->height = 0;

try
if (strpos($obj->mime_type, 'image/') === 0 && in_array(strtolower($obj->extension), array('jpg', 'jpeg', 'png', 'gif', 'bmp')))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we put this in an isImage method to be more readable?

{
// Get the image properties
$props = JImage::getImageFileProperties($path);
$obj->width = $props->width;
$obj->height = $props->height;
}
catch (Exception $e)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What kind of exception do we catch here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'v removed that and opened issue #117 as we don't have a defined way of exception handling.

{
// Probably not an image
$obj->width = 0;
$obj->height = 0;
}

return $obj;
}
Expand All @@ -310,7 +306,7 @@ private function getDate($date = null)

$timezone = JFactory::getApplication()->get('offset');
$user = JFactory::getUser();

if ($user->id)
{
$userTimezone = $user->getParam('timezone');
Expand Down