From 16f584608f8147a58bfe295ff3295aae0f85b38a Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 19 Nov 2017 16:56:59 -0800 Subject: text thumbnails in cloud tile mode --- Zotlabs/Daemon/Thumbnail.php | 62 +++++++++++++++++++++++ Zotlabs/Storage/Browser.php | 13 ++++- Zotlabs/Storage/Directory.php | 2 + Zotlabs/Storage/File.php | 3 ++ include/attach.php | 3 ++ include/photo/photo_driver.php | 109 +++++++++++++++++++++++------------------ include/photos.php | 8 ++- 7 files changed, 150 insertions(+), 50 deletions(-) create mode 100644 Zotlabs/Daemon/Thumbnail.php diff --git a/Zotlabs/Daemon/Thumbnail.php b/Zotlabs/Daemon/Thumbnail.php new file mode 100644 index 000000000..aeea07410 --- /dev/null +++ b/Zotlabs/Daemon/Thumbnail.php @@ -0,0 +1,62 @@ + $t) { + $l = $l + 1; + $x = 3; + $y = ($l * $lsize) + 3 - $fsize; + imagestring($image,1,$x,$y,$t,$colour); + if(($l * $lsize) >= $isize) { + break; + } + } + imagejpeg($image,$attach['content'] . '.thumb'); + } + } + } +} \ No newline at end of file diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php index 17b07ad82..dd3067cf8 100644 --- a/Zotlabs/Storage/Browser.php +++ b/Zotlabs/Storage/Browser.php @@ -208,6 +208,16 @@ class Browser extends DAV\Browser\Plugin { $photo_icon = ''; $preview_style = intval(get_config('system','thumbnail_security',0)); + $r = q("select content from attach where hash = '%s' and uid = %d limit 1", + dbesc($attachHash), + intval($owner) + ); + + if($r && file_exists(dbunescbin($r[0]['content']) . '.thumb')) { + $photo_icon = 'data:image/jpeg;base64,' . base64_encode(file_get_contents(dbunescbin($r[0]['content']) . '.thumb')); +// logger('found thumb: ' . $photo_icon); + } + if(strpos($type,'image/') === 0 && $attachHash) { $r = q("select resource_id, imgscale from photo where resource_id = '%s' and imgscale in ( %d, %d ) order by imgscale asc limit 1", dbesc($attachHash), @@ -220,12 +230,11 @@ class Browser extends DAV\Browser\Plugin { if($type === 'image/svg+xml' && $preview_style > 0) { $photo_icon = $fullPath; } - } $g = [ 'resource_id' => $attachHash, 'thumbnail' => $photo_icon, 'security' => $preview_style ]; call_hooks('file_thumbnail', $g); - $photo_icon = $g['photo_icon']; + $photo_icon = $g['thumbnail']; $attachIcon = ""; // ""; diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php index 27df3569f..45df9ddd5 100644 --- a/Zotlabs/Storage/Directory.php +++ b/Zotlabs/Storage/Directory.php @@ -362,6 +362,8 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota { $args = array( 'resource_id' => $hash, 'album' => $album, 'os_syspath' => $f, 'os_path' => $xpath['os_path'], 'display_path' => $xpath['path'], 'filename' => $name, 'getimagesize' => $gis, 'directory' => $direct); $p = photo_upload($c[0], \App::get_observer(), $args); } + + \Zotlabs\Daemon\Master::Summon([ 'Thumbnail' , $this->folder_hash ]); $sync = attach_export_data($c[0], $hash); diff --git a/Zotlabs/Storage/File.php b/Zotlabs/Storage/File.php index 8bf9997ed..37376c177 100644 --- a/Zotlabs/Storage/File.php +++ b/Zotlabs/Storage/File.php @@ -244,6 +244,9 @@ class File extends DAV\Node implements DAV\IFile { } } + \Zotlabs\Daemon\Master::Summon([ 'Thumbnail' , $this->data['hash'] ]); + + $sync = attach_export_data($c[0],$this->data['hash']); if($sync) diff --git a/include/attach.php b/include/attach.php index 0f07fe035..0f31ed012 100644 --- a/include/attach.php +++ b/include/attach.php @@ -951,6 +951,9 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { call_hooks('photo_upload_end', $ret); } + \Zotlabs\Daemon\Master::Summon([ 'Thumbnail' , $hash ]); + + if($dosync) { $sync = attach_export_data($channel,$hash); diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index 21431e96f..f75ff2386 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -241,69 +241,84 @@ abstract class photo_driver { } + /** + * @brief reads exif data from filename + */ + public function exif($filename) { - public function orient($filename) { - /** - * This function is a bit unusual, because it is operating on a file, but you must - * first create an image from that file to initialise the type and check validity - * of the image. - */ - - if(! $this->is_valid()) + if((! function_exists('exif_read_data')) + || (! in_array($this->getType(), [ 'image/jpeg' , 'image/tiff'] ))) { return false; + } - if((! function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg')) - return false; - - $exif = @exif_read_data($filename,null,true); - - if($exif) { - $ort = $exif['IFD0']['Orientation']; - - switch($ort) - { - case 1: // nothing - break; + /* + * PHP 7.2 allows you to use a stream resource, which should reduce/avoid + * memory exhaustion on large images. + */ - case 2: // horizontal flip - $this->flip(); - break; + if(version_compare(PHP_VERSION,'7.2.0') >= 0) { + $f = @fopen($filename,'rb'); + } + else { + $f = $filename; + } - case 3: // 180 rotate left - $this->rotate(180); - break; + if($f) { + return @exif_read_data($f); + } - case 4: // vertical flip - $this->flip(false, true); - break; + return false; + } - case 5: // vertical flip + 90 rotate right - $this->flip(false, true); - $this->rotate(-90); - break; + /** + * @brief orients current image based on exif orientation information + */ - case 6: // 90 rotate right - $this->rotate(-90); - break; + public function orient($exif) { - case 7: // horizontal flip + 90 rotate right - $this->flip(); - $this->rotate(-90); - break; + if(! ($this->is_valid() && $exif)) { + return false; + } - case 8: // 90 rotate left - $this->rotate(90); - break; - } + $ort = $exif['IFD0']['Orientation']; - return $exif; + if(! $ort) { + return false; + } + switch($ort) { + case 1: // nothing + break; + case 2: // horizontal flip + $this->flip(); + break; + case 3: // 180 rotate left + $this->rotate(180); + break; + case 4: // vertical flip + $this->flip(false, true); + break; + case 5: // vertical flip + 90 rotate right + $this->flip(false, true); + $this->rotate(-90); + break; + case 6: // 90 rotate right + $this->rotate(-90); + break; + case 7: // horizontal flip + 90 rotate right + $this->flip(); + $this->rotate(-90); + break; + case 8: // 90 rotate left + $this->rotate(90); + break; + default: + break; } - - return false; + return true; } diff --git a/include/photos.php b/include/photos.php index 41a1d18cb..b1391f284 100644 --- a/include/photos.php +++ b/include/photos.php @@ -203,7 +203,13 @@ function photo_upload($channel, $observer, $args) { return $ret; } - $exif = $ph->orient(($args['os_syspath']) ? $args['os_syspath'] : $src); + // obtain exif data from the source file if present + + $exif = $ph->exif(($args['os_syspath']) ? $args['os_syspath'] : $src); + + if($exif) { + $ph->orient($exif); + } @unlink($src); -- cgit v1.2.3 From 250d947667b1500633d80b043ac3760be21446fc Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 19 Nov 2017 21:51:21 -0800 Subject: cloud tiles: use folder-o for folders and set the icon colour to something a bit less harsh than the link colour for system icons. Dark solid blue folders are a bit overwhelming, as is the default text_colour (black) --- Zotlabs/Module/Ping.php | 3 ++- include/text.php | 4 ++-- view/theme/redbasic/css/style.css | 4 ++++ view/tpl/cloud_directory.tpl | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index 8644b8326..406e554d1 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -492,10 +492,11 @@ class Ping extends \Zotlabs\Web\Controller { $t3 = dba_timer(); if($vnotify & (VNOTIFY_NETWORK|VNOTIFY_CHANNEL)) { + $r = q("SELECT id, item_wall FROM item WHERE item_unseen = 1 and uid = %d $item_normal - AND author_xchan != '%s'", + AND author_xchan != '%s' $sql_extra ", intval(local_channel()), dbesc($ob_hash) ); diff --git a/include/text.php b/include/text.php index ee8318d7c..343e3f00b 100644 --- a/include/text.php +++ b/include/text.php @@ -2704,8 +2704,8 @@ function linkify_tags($a, &$body, $uid, $diaspora = false) { function getIconFromType($type) { $iconMap = array( //Folder - t('Collection') => 'fa-folder', - 'multipart/mixed' => 'fa-folder', //dirs in attach use this mime type + t('Collection') => 'fa-folder-o', + 'multipart/mixed' => 'fa-folder-o', //dirs in attach use this mime type //Common file 'application/octet-stream' => 'fa-file-o', //Text diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 5f31004ff..b3cd9c9f8 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -105,6 +105,10 @@ a, color: $link_colour; } +.cloud-icon.tiles i { + color: #aaa; +} + a:hover, a:focus, .fakelink:hover, diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 3ae8cbf35..a9840a0b8 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -3,7 +3,7 @@ {{if $parentpath}}
-
+
@@ -14,7 +14,7 @@ {{foreach $entries as $item}}
-
+
{{if $item.photo_icon}} {{else}} -- cgit v1.2.3