Mercurial > hg > mgallery

comparison mgtool.php @ 310:b1fc8a908eac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Get med/tn image sizes after they have been generated.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 04 Apr 2020 17:52:42 +0300
parents b9530dda7ff0
children 8fd5c850f921
comparison
equal deleted inserted replaced
309:db2cd0fcd64b 310:b1fc8a908eac
983 { 983 {
984 echo "%"; 984 echo "%";
985 foreach ($galExifConversions as $conv) 985 foreach ($galExifConversions as $conv)
986 mgCopyEntryData($edata, $exif, $conv[GEC_TYPE], $conv[GEC_NAME], $conv[GEC_FIELDS]); 986 mgCopyEntryData($edata, $exif, $conv[GEC_TYPE], $conv[GEC_NAME], $conv[GEC_FIELDS]);
987 } 987 }
988
989 // Get width/height information for thumbnails and mediums
990 $edata["med"] = [];
991 if (($info = getimagesize($medFilename)) !== FALSE && count($info) >= 2)
992 {
993 $edata["med"]["width"] = $info[0];
994 $edata["med"]["height"] = $info[1];
995 echo "+";
996 }
997 else
998 echo "-";
999
1000 $edata["tn"] = [];
1001 if (($info = @getimagesize($tnFilename)) !== FALSE && count($info) > 0)
1002 {
1003 $edata["tn"]["width"] = $info[0];
1004 $edata["tn"]["height"] = $info[1];
1005 echo "+";
1006 }
1007 else
1008 echo "-";
1009 } 988 }
1010 else 989 else
1011 { 990 {
1012 // Copy old data that is not yet in new 991 // Copy old data that is not yet in new
1013 echo "*"; 992 echo "*";
1045 if ($updFlags & GUPD_CAPTION) 1024 if ($updFlags & GUPD_CAPTION)
1046 { 1025 {
1047 echo "?"; 1026 echo "?";
1048 if (($tmpData = @file_get_contents($capFilename)) !== FALSE) 1027 if (($tmpData = @file_get_contents($capFilename)) !== FALSE)
1049 $edata["caption"] = $tmpData; 1028 $edata["caption"] = $tmpData;
1029 }
1030
1031 if ($updFlags & GUPD_EXIF_INFO)
1032 {
1033 // Get width/height information for thumbnails and mediums
1034 $edata["med"] = [];
1035 if (($info = getimagesize($medFilename)) !== FALSE && count($info) >= 2)
1036 {
1037 $edata["med"]["width"] = $info[0];
1038 $edata["med"]["height"] = $info[1];
1039 echo "+";
1040 }
1041 else
1042 echo "-";
1043
1044 $edata["tn"] = [];
1045 if (($info = @getimagesize($tnFilename)) !== FALSE && count($info) > 0)
1046 {
1047 $edata["tn"]["width"] = $info[0];
1048 $edata["tn"]["height"] = $info[1];
1049 echo "+";
1050 }
1051 else
1052 echo "-";
1050 } 1053 }
1051 } 1054 }
1052 else 1055 else
1053 if ($edata["type"] == 1) 1056 if ($edata["type"] == 1)
1054 { 1057 {