Mercurial > hg > mgallery
annotate mgtool.php @ 314:020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
hack we now also support EXIF in WebP.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Mon, 06 Apr 2020 19:05:13 +0300 |
| parents | d94b0ebe97c6 |
| children | 8a69e693e08c |
| rev | line source |
|---|---|
| 0 | 1 #!/usr/bin/php |
| 2 <?php | |
| 3 // | |
| 4 // Yet Another Image Gallery | |
|
69
7777887bc515
Update header/copyright blurbs.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
5 // -- Commandline tool for creating / updating gallery |
|
7777887bc515
Update header/copyright blurbs.
Matti Hamalainen <ccr@tnsp.org>
parents:
64
diff
changeset
|
6 // Programmed and designed by Matti 'ccr' Hamalainen <ccr@tnsp.org> |
| 306 | 7 // (C) Copyright 2015-2020 Tecnic Software productions (TNSP) |
| 0 | 8 // |
| 9 require_once "mgallery.inc.php"; | |
| 10 | |
| 11 // | |
| 282 | 12 // Operating modes and update flags |
| 13 // | |
| 14 define("GCMD_UPDATE" , 1); | |
| 15 define("GCMD_RESCAN" , 2); | |
| 16 define("GCMD_CLEAN" , 3); | |
| 17 | |
| 18 define("GCLEAN_CACHES" , 0x01); | |
| 19 define("GCLEAN_IMAGES" , 0x02); | |
| 20 define("GCLEAN_TRASH" , 0x04); | |
| 21 define("GCLEAN_ALL" , 0x0f); | |
| 22 | |
| 23 define("GUPD_MED_IMAGE" , 0x01); | |
| 24 define("GUPD_TN_IMAGE" , 0x02); | |
| 25 define("GUPD_IMAGES" , 0x0f); | |
| 26 define("GUPD_EXIF_INFO" , 0x10); | |
| 27 define("GUPD_CAPTION" , 0x20); | |
| 28 | |
| 29 | |
| 30 // | |
| 0 | 31 // Array for specifying what will be copied and converted |
| 32 // from the image file's EXIF information tag(s). | |
| 33 // | |
|
283
1bcaab2d3e6a
Define named constants for $galExifConversions array fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
282
diff
changeset
|
34 define("GEC_TYPE" , 0); |
|
1bcaab2d3e6a
Define named constants for $galExifConversions array fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
282
diff
changeset
|
35 define("GEC_NAME" , 1); |
|
1bcaab2d3e6a
Define named constants for $galExifConversions array fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
282
diff
changeset
|
36 define("GEC_FIELDS" , 2); |
|
286
878d2a772fd6
Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
284
diff
changeset
|
37 define("GEC_IS_UNIQUE" , 3); |
|
283
1bcaab2d3e6a
Define named constants for $galExifConversions array fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
282
diff
changeset
|
38 |
| 45 | 39 $galExifConversions = |
| 40 [ | |
|
286
878d2a772fd6
Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
284
diff
changeset
|
41 [ MG_STR, "caption" , "ImageDescription" , TRUE ], |
|
878d2a772fd6
Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
284
diff
changeset
|
42 [ MG_STR, "copyright" , "Copyright" , FALSE ], |
|
878d2a772fd6
Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
284
diff
changeset
|
43 [ MG_STR, "model" , "Model" , FALSE ], |
|
878d2a772fd6
Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
284
diff
changeset
|
44 [ MG_STR, "lensmodel" , "UndefinedTag:0xA434" , FALSE ], |
|
878d2a772fd6
Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
284
diff
changeset
|
45 [ MG_INT, "width" , ["COMPUTED", "Width"] , TRUE ], |
|
878d2a772fd6
Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
284
diff
changeset
|
46 [ MG_INT, "height" , ["COMPUTED", "Height"] , TRUE ], |
|
878d2a772fd6
Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
284
diff
changeset
|
47 [ MG_DVA, "fnumber" , "FNumber" , TRUE ], |
|
878d2a772fd6
Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
284
diff
changeset
|
48 [ MG_DVA, "exposure" , "ExposureTime" , TRUE ], |
|
878d2a772fd6
Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
284
diff
changeset
|
49 [ MG_INT, "iso" , "ISOSpeedRatings" , TRUE ], |
|
878d2a772fd6
Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
284
diff
changeset
|
50 [ MG_DVA, "focallength" , "FocalLength" , TRUE ], |
|
878d2a772fd6
Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
284
diff
changeset
|
51 [ MG_DATE, "datetime" , "DateTimeOriginal" , TRUE ], |
|
878d2a772fd6
Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
284
diff
changeset
|
52 [ MG_DATE, "datetime" , "DateTimeDigitized" , TRUE ], |
|
878d2a772fd6
Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
284
diff
changeset
|
53 [ MG_INT, "filesize" , "FileSize" , TRUE ], |
|
878d2a772fd6
Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
284
diff
changeset
|
54 [ MG_STR, "keywords" , "keywords" , FALSE ], |
| 45 | 55 ]; |
| 0 | 56 |
| 275 | 57 |
|
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
58 // |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
59 // SQL table schemas |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
60 // |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
61 $galSQLTables = |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
62 [ |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
63 "images" => [ |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
64 ["id" , "INTEGER", "PRIMARY KEY", "AUTOINCREMENT"], |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
65 ["path_id" , "INTEGER"], |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
66 ["filename" , "VARCHAR(64)"], |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
67 ], |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
68 |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
69 "paths" => [ |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
70 ["id" , "INTEGER", "PRIMARY KEY", "AUTOINCREMENT"], |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
71 ["path" , "VARCHAR(128)"], |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
72 ], |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
73 |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
74 "metadata" => [ |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
75 ["id" , "INTEGER", "PRIMARY KEY", "AUTOINCREMENT"], |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
76 ["field" , "VARCHAR(64)"], |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
77 ["data" , "VARCHAR(64)", "UNIQUE"], |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
78 ["status" , "INTEGER"], |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
79 ], |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
80 |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
81 "images_meta" => [ |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
82 ["image_id" , "INTEGER"], |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
83 ["meta_id" , "INTEGER"], |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
84 ], |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
85 ]; |
| 0 | 86 |
| 87 | |
| 88 // | |
| 89 // Convert and scale image file function, for generating | |
| 90 // the intermediate size images and thumbnails. Uses the | |
|
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
91 // PHP ImageMagick or GraphicsMagick bindings. |
| 0 | 92 // |
| 93 function mgConvertImage($inFilename, $outFilename, $outDim, $outFormat, $outQuality, $thumb) | |
| 94 { | |
|
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
95 if (extension_loaded("imagick")) |
| 0 | 96 { |
|
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
97 // Create conversion entity |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
98 try |
| 0 | 99 { |
|
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
100 $img = new Imagick($inFilename); |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
101 } |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
102 catch (Exception $e) |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
103 { |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
104 return mgError("ImageMagick exception for file '".$inFilename."':\n".$e->getMessage()."\n"); |
| 0 | 105 } |
| 106 | |
|
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
107 if ($img === FALSE) |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
108 return mgError("ImageMagick could not digest '".$inFilename."'.\n"); |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
109 |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
110 $profiles = $img->getImageProfiles("icc", true); |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
111 $img->setImageDepth(16); |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
112 $img->transformImageColorspace(Imagick::COLORSPACE_SRGB); |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
113 $img->setImageColorspace(Imagick::COLORSPACE_SRGB); |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
114 |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
115 if ($outDim !== FALSE) |
| 0 | 116 { |
|
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
117 // Get dimensions, setup background |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
118 $dim = $img->getImageGeometry(); |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
119 $img->setGravity(imagick::GRAVITY_CENTER); |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
120 |
| 301 | 121 // Width smaller than height? Swap dimensions |
|
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
122 if ($dim["width"] < $dim["height"]) |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
123 { |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
124 $stmp = $outDim[0]; |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
125 $outDim[0] = $outDim[1]; |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
126 $outDim[1] = $stmp; |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
127 } |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
128 |
| 301 | 129 // Compute new height if needed |
|
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
130 if ($dim["width"] != $outDim[0] || $dim["height"] != $outDim[1]) |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
131 { |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
132 $outDim[1] = ($dim["height"] * $outDim[0]) / $dim["width"]; |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
133 } |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
134 |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
135 // Act based on image size vs. desired size and $thumb mode |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
136 if ($thumb || $dim["width"] != $outDim[0] || $dim["height"] != $outDim[1]) |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
137 { |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
138 $img->resizeImage($outDim[0], $outDim[1], Imagick::FILTER_LANCZOS, 1); |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
139 $img->setImageExtent($outDim[0], $outDim[1]); |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
140 $img->unsharpMaskImage(0, 0.5, 1, 0.05); |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
141 } |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
142 } |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
143 |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
144 $img->setImageDepth(8); |
|
303
6bb434968623
Add new MG_STR_LC setting type, which is string but automatically lowercased.
Matti Hamalainen <ccr@tnsp.org>
parents:
301
diff
changeset
|
145 switch ($outFormat) |
|
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
146 { |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
147 case "jpeg": |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
148 $img->setFormat("JPEG"); |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
149 $img->setImageCompression(Imagick::COMPRESSION_JPEG); |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
150 break; |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
151 |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
152 case "webp": |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
153 $img->setFormat("WEBP"); |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
154 $img->setOption('webp:method', '6'); |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
155 break; |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
156 |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
157 default: |
|
303
6bb434968623
Add new MG_STR_LC setting type, which is string but automatically lowercased.
Matti Hamalainen <ccr@tnsp.org>
parents:
301
diff
changeset
|
158 return mgError("Unsupported MGallery med/tn format '".$outFormat."'.\n"); |
| 0 | 159 } |
| 160 | |
|
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
161 $img->setImageCompressionQuality($outQuality); |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
162 |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
163 $img->stripImage(); |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
164 if (!empty($profiles)) |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
165 $img->profileImage("icc", $profiles["icc"]); |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
166 |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
167 $img->writeImage($outFilename); |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
168 $img->removeImage(); |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
169 } |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
170 else |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
171 if (extension_loaded("gmagick")) |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
172 { |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
173 // Create conversion entity |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
174 try |
| 0 | 175 { |
|
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
176 $img = new Gmagick($inFilename); |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
177 } |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
178 catch (Exception $e) |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
179 { |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
180 return mgError("GraphicsMagick exception for file '".$inFilename."':\n".$e->getMessage()."\n"); |
| 0 | 181 } |
|
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
182 |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
183 if ($img === FALSE) |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
184 return mgError("GraphicsMagick could not digest '".$inFilename."'.\n"); |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
185 |
| 284 | 186 //$profiles = $img->getImageProfile("icc"); |
| 187 //$img->setImageDepth(16); | |
| 188 //$img->setImageColorspace(Gmagick::COLORSPACE_SRGB); | |
|
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
189 |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
190 if ($outDim !== FALSE) |
| 0 | 191 { |
|
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
192 // Get dimensions, setup background |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
193 $dim = $img->getImageGeometry(); |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
194 //$img->setGravity(Gmagick::GRAVITY_CENTER); |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
195 |
| 301 | 196 // Compute new height if needed |
|
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
197 if ($dim["width"] < $dim["height"]) |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
198 { |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
199 $stmp = $outDim[0]; |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
200 $outDim[0] = $outDim[1]; |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
201 $outDim[1] = $stmp; |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
202 } |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
203 |
| 301 | 204 // Compute new height if needed |
|
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
205 if ($dim["width"] != $outDim[0] || $dim["height"] != $outDim[1]) |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
206 { |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
207 $outDim[1] = ($dim["height"] * $outDim[0]) / $dim["width"]; |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
208 } |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
209 |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
210 // Act based on image size vs. desired size and $thumb mode |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
211 if ($thumb || $dim["width"] != $outDim[0] || $dim["height"] != $outDim[1]) |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
212 { |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
213 $img->resizeImage($outDim[0], $outDim[1], Gmagick::FILTER_LANCZOS, 1); |
|
268
07b2b271c12a
Some fixes to GraphicsMagick image conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
265
diff
changeset
|
214 $img->cropImage($outDim[0], $outDim[1], 0, 0); |
|
07b2b271c12a
Some fixes to GraphicsMagick image conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
265
diff
changeset
|
215 $img->unsharpMaskImage(0, 0.5, 1, 0.05); |
|
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
216 } |
| 0 | 217 } |
|
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
218 |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
219 $img->setImageDepth(8); |
|
303
6bb434968623
Add new MG_STR_LC setting type, which is string but automatically lowercased.
Matti Hamalainen <ccr@tnsp.org>
parents:
301
diff
changeset
|
220 switch ($outFormat) |
|
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
221 { |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
222 case "jpeg": |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
223 $img->setFormat("JPEG"); |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
224 $img->setImageCompression(Gmagick::COMPRESSION_JPEG); |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
225 break; |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
226 |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
227 case "webp": |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
228 $img->setFormat("WEBP"); |
| 284 | 229 //$img->setOption('webp:method', '6'); |
|
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
230 break; |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
231 |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
232 default: |
|
303
6bb434968623
Add new MG_STR_LC setting type, which is string but automatically lowercased.
Matti Hamalainen <ccr@tnsp.org>
parents:
301
diff
changeset
|
233 return mgError("Unsupported MGallery med/tn format '".$outFormat."'.\n"); |
|
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
234 } |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
235 |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
236 $img->setCompressionQuality($outQuality); |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
237 |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
238 $img->stripImage(); |
| 284 | 239 //if (!empty($profiles)) |
| 240 // $img->profileImage("icc", $profiles); | |
|
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
241 |
|
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
242 $img->writeImage($outFilename); |
|
268
07b2b271c12a
Some fixes to GraphicsMagick image conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
265
diff
changeset
|
243 $img->destroy(); |
|
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
244 } |
| 0 | 245 |
| 246 return TRUE; | |
| 247 } | |
| 248 | |
| 249 | |
| 250 // | |
|
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
251 // Read EXIF and XMP data from a file |
|
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
252 // |
|
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
253 // TODO XXX: Perhaps support XMP sidecar files? |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
254 // |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
255 function mgReadEXIFAndXMPData($filename, &$exif, &$xmp) |
|
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
256 { |
|
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
257 $exif = FALSE; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
258 $xmp = FALSE; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
259 |
|
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
260 if (($fh = @fopen($filename, 'rb')) === FALSE) |
|
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
261 return "Could not open file for reading."; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
262 |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
263 $fileData = fstat($fh); |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
264 |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
265 // Probe the file for type |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
266 $probeSize = 4 * 3; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
267 if (($probeData = @fread($fh, $probeSize)) === FALSE) |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
268 return "Error reading file for type probe"; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
269 |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
270 $probe = unpack("C4magic/L1riffsize/c4riffid", $probeData); |
|
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
271 |
|
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
272 // Check for RIFF / WEBP |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
273 if ($probe["magic1"] == 0x52 && $probe["magic2"] == 0x49 && |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
274 $probe["magic3"] == 0x46 && $probe["magic4"] == 0x46 && |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
275 $probe["riffid1"] == 0x57 && $probe["riffid2"] == 0x45 && |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
276 $probe["riffid3"] == 0x42 && $probe["riffid4"] == 0x50) |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
277 { |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
278 if ($probe["riffsize"] > $fileData["size"]) |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
279 return "Invalid WebP file, chunk size larger than file size"; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
280 |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
281 $done = 0; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
282 while (!feof($fh) && $done < 2) |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
283 { |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
284 // Read chunk header |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
285 if (($data = @fread($fh, 2 * 4)) == FALSE) |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
286 return "File read error in WebP RIFF chunk header"; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
287 |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
288 $chunk = unpack("c4id/L1size", $data); |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
289 |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
290 /* |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
291 printf("chunk: '%c%c%c%c' (%02x %02x %02x %02x) osize=%d\n", |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
292 $chunk["id1"], $chunk["id2"], $chunk["id3"], $chunk["id4"], |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
293 $chunk["id1"], $chunk["id2"], $chunk["id3"], $chunk["id4"], |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
294 $chunk["size"]); |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
295 */ |
|
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
296 |
|
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
297 // Check for EXIF chunk |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
298 if ($chunk["id1"] == 0x45 && $chunk["id2"] == 0x58 && |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
299 $chunk["id3"] == 0x49 && $chunk["id4"] == 0x46) |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
300 { |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
301 // This is an incredibly stupid hack to work around the |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
302 // fact that PHP's exif_read_data() wants to seek to stream |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
303 // start and probe things .. if we just had a direct parser |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
304 // function we would not need this shit. |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
305 if (($tmpEXIF = @fread($fh, $chunk["size"])) === FALSE) |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
306 return "Error reading WebP EXIF chunk"; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
307 |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
308 // Create a temporary file for the EXIF data |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
309 if (($tmpFile = @tmpfile()) === FALSE) |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
310 return "Could not create temporary WebP EXIF data file"; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
311 |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
312 if ((@fwrite($tmpFile, $tmpEXIF, $chunk["size"])) === FALSE) |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
313 { |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
314 fclose($tmpFile); |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
315 return "Error writing WebP EXIT chunk to temporary file"; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
316 } |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
317 |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
318 // Parse the EXIF from the temp file |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
319 $exif = @exif_read_data($tmpFile); |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
320 fclose($tmpFile); |
|
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
321 |
|
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
322 $done++; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
323 } |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
324 else |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
325 if ($chunk["id1"] == 0x58 && $chunk["id2"] == 0x4d && |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
326 $chunk["id3"] == 0x50 && $chunk["id4"] == 0x20) |
|
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
327 { |
|
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
328 // Read and parse XMP data chunk |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
329 if (($xmpStr = fread($fh, $chunk["size"])) === FALSE) |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
330 return "File read error in XMP data read"; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
331 |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
332 $xmp = mgParseXMPData($xmpStr); |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
333 |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
334 $done++; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
335 } |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
336 else |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
337 { |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
338 // Skip other chunks |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
339 if (fseek($fh, $chunk["size"], SEEK_CUR) < 0) |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
340 return "File seek error in chunk skip"; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
341 } |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
342 |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
343 // If the chunk size is not aligned, skip one byte |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
344 if ($chunk["size"] & 1) |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
345 { |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
346 if (fseek($fh, 1, SEEK_CUR) < 0) |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
347 return "File seek error in chunk skip"; |
|
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
348 } |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
349 } |
|
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
350 |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
351 return TRUE; |
|
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
352 } |
|
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
353 else |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
354 { |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
355 // Other fileformats, e.g. JPEG, PNG, GIF, .. |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
356 |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
357 // Read EXIF .. |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
358 if (fseek($fh, 0, SEEK_SET) < 0) |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
359 return "File seek error in EXIF fptr restore"; |
|
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
360 |
|
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
361 $exif = @exif_read_data($fh); |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
362 |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
363 if (fseek($fh, 0, SEEK_SET) < 0) |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
364 return "File seek error in EXIF fptr restore"; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
365 |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
366 // Read XMP data block from the file .. it's a horrible hack. |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
367 $xmpStartTag = "<x:xmpmeta"; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
368 $xmpEndTag = "</x:xmpmeta>"; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
369 $xmpBlockSize = 64 * 1024; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
370 |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
371 // Check for start tag |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
372 $buffer = ""; |
|
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
373 $xmpOK = FALSE; |
|
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
374 while (!feof($fh)) |
|
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
375 { |
|
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
376 if (($tmp = fread($fh, $xmpBlockSize)) === FALSE) |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
377 return "File read error in JPEG XMP read"; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
378 |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
379 $buffer .= $tmp; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
380 if (($spos1 = strpos($buffer, "<")) !== FALSE) |
|
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
381 { |
|
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
382 $buffer = substr($buffer, $spos1); |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
383 if (($spos2 = strpos($buffer, $xmpStartTag)) !== FALSE) |
|
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
384 { |
|
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
385 $buffer = substr($buffer, $spos2); |
|
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
386 $xmpOK = TRUE; |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
387 break; |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
388 } |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
389 } |
|
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
390 else |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
391 $buffer = ""; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
392 } |
|
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
393 |
|
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
394 // Check for end tag if start tag was found |
|
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
395 if ($xmpOK) |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
396 { |
|
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
397 $xmpOK = FALSE; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
398 $buffer2 = $buffer; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
399 do |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
400 { |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
401 if (($spos1 = strpos($buffer2, "<")) !== FALSE) |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
402 { |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
403 $buffer2 = substr($buffer2, $spos1); |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
404 if (($spos2 = strpos($buffer2, $xmpEndTag)) !== FALSE) |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
405 { |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
406 $xmpOK = TRUE; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
407 break; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
408 } |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
409 } |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
410 |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
411 if (($tmp = @fread($fh, $xmpBlockSize)) !== FALSE) |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
412 { |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
413 $buffer2 .= $tmp; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
414 $buffer .= $tmp; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
415 } |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
416 else |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
417 { |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
418 $xmpOK = FALSE; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
419 break; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
420 } |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
421 } while (!$xmpOK); |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
422 |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
423 if ($xmpOK) |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
424 { |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
425 if (($spos = strpos($buffer, $xmpEndTag)) !== FALSE) |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
426 $buffer = substr($buffer, 0, $spos + strlen($xmpEndTag)); |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
427 else |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
428 $xmpOK = FALSE; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
429 } |
|
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
430 } |
|
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
431 |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
432 $xmp = mgParseXMPData($buffer); |
|
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
433 |
|
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
434 return TRUE; |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
435 } |
|
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
436 } |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
437 |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
438 |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
439 function mgParseXMPData($xmpStr) |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
440 { |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
441 // SimpleXML apparently can't handle namespaces, |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
442 // so we will crudely remove them with some regexes |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
443 $xmpPatterns = |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
444 [ |
|
312
326935332784
Remove <?xpacket ?> from the XMP, as SimpleXML can't parse it.
Matti Hamalainen <ccr@tnsp.org>
parents:
311
diff
changeset
|
445 "/<\?xpacket\s+.*?\?>/", |
|
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
446 "/[a-zA-Z]+:/", |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
447 "/\/[a-zA-Z]+:/", |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
448 "/<\/?(Bag|Alt|Seq)>/" |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
449 ]; |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
450 |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
451 $xmpReplacements = |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
452 [ |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
453 "", |
|
312
326935332784
Remove <?xpacket ?> from the XMP, as SimpleXML can't parse it.
Matti Hamalainen <ccr@tnsp.org>
parents:
311
diff
changeset
|
454 "", |
|
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
455 "\/", |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
456 "", |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
457 ]; |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
458 |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
459 $xmpStr = preg_replace($xmpPatterns, $xmpReplacements, $xmpStr); |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
460 |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
461 // Parse XML to a SimpleXMLElement structure |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
462 if (($xmpOb = @simplexml_load_string($xmpStr)) === FALSE) |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
463 return FALSE; |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
464 |
| 301 | 465 // Process structure to simple flat array of data for the desired elements only |
|
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
466 $xmpData = []; |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
467 |
|
313
d94b0ebe97c6
Add some commented out / unused example code in mgParseXMPData().
Matti Hamalainen <ccr@tnsp.org>
parents:
312
diff
changeset
|
468 /* |
|
d94b0ebe97c6
Add some commented out / unused example code in mgParseXMPData().
Matti Hamalainen <ccr@tnsp.org>
parents:
312
diff
changeset
|
469 // We get these from EXIF, or at least we should .. also EXIF contains information |
|
d94b0ebe97c6
Add some commented out / unused example code in mgParseXMPData().
Matti Hamalainen <ccr@tnsp.org>
parents:
312
diff
changeset
|
470 // that XMP does not have, for some reason (like width/height, ISO, etc.) |
|
d94b0ebe97c6
Add some commented out / unused example code in mgParseXMPData().
Matti Hamalainen <ccr@tnsp.org>
parents:
312
diff
changeset
|
471 // Leaving this code here just as an example. |
|
d94b0ebe97c6
Add some commented out / unused example code in mgParseXMPData().
Matti Hamalainen <ccr@tnsp.org>
parents:
312
diff
changeset
|
472 if (($xres = $xmpOb->xpath("RDF/Description")) !== FALSE) |
|
d94b0ebe97c6
Add some commented out / unused example code in mgParseXMPData().
Matti Hamalainen <ccr@tnsp.org>
parents:
312
diff
changeset
|
473 { |
|
d94b0ebe97c6
Add some commented out / unused example code in mgParseXMPData().
Matti Hamalainen <ccr@tnsp.org>
parents:
312
diff
changeset
|
474 $tmp = $xres[0]->attributes(); |
|
d94b0ebe97c6
Add some commented out / unused example code in mgParseXMPData().
Matti Hamalainen <ccr@tnsp.org>
parents:
312
diff
changeset
|
475 mgConvertAttribute($xmpData, $tmp, "lensmodel", "Lens"); |
|
d94b0ebe97c6
Add some commented out / unused example code in mgParseXMPData().
Matti Hamalainen <ccr@tnsp.org>
parents:
312
diff
changeset
|
476 mgConvertAttribute($xmpData, $tmp, "datetime", "CreateDate"); |
|
d94b0ebe97c6
Add some commented out / unused example code in mgParseXMPData().
Matti Hamalainen <ccr@tnsp.org>
parents:
312
diff
changeset
|
477 } |
|
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
478 |
|
313
d94b0ebe97c6
Add some commented out / unused example code in mgParseXMPData().
Matti Hamalainen <ccr@tnsp.org>
parents:
312
diff
changeset
|
479 if (($xres = $xmpOb->xpath("RDF/Description/description/li")) !== FALSE) |
|
d94b0ebe97c6
Add some commented out / unused example code in mgParseXMPData().
Matti Hamalainen <ccr@tnsp.org>
parents:
312
diff
changeset
|
480 $xmpData["description"] = implode(" ", array_map(function($xe) { return (string) $xe; }, $xres)); |
|
d94b0ebe97c6
Add some commented out / unused example code in mgParseXMPData().
Matti Hamalainen <ccr@tnsp.org>
parents:
312
diff
changeset
|
481 */ |
|
d94b0ebe97c6
Add some commented out / unused example code in mgParseXMPData().
Matti Hamalainen <ccr@tnsp.org>
parents:
312
diff
changeset
|
482 |
|
d94b0ebe97c6
Add some commented out / unused example code in mgParseXMPData().
Matti Hamalainen <ccr@tnsp.org>
parents:
312
diff
changeset
|
483 // What EXIF does NOT have are the keywords .. so grab them. |
|
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
484 if (($xres = $xmpOb->xpath("RDF/Description/subject/li")) !== FALSE) |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
485 { |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
486 $xmpData["keywords"] = array_map(function($xkw) { return (string) $xkw; }, $xres); |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
487 } |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
488 |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
489 return $xmpData; |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
490 } |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
491 |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
492 |
|
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
493 // |
| 0 | 494 // Converts one value (mainly from EXIF tag information) |
| 52 | 495 // by doing explicit type casting and special conversions. |
| 0 | 496 // |
| 497 function mgConvertExifData($val, $vtype) | |
| 498 { | |
| 499 switch ($vtype) | |
| 500 { | |
|
46
e58292065b01
Let arrays through mgConvertExifData() when the type is MG_STR without
Matti Hamalainen <ccr@tnsp.org>
parents:
45
diff
changeset
|
501 case MG_STR: return is_array($val) ? $val : (string) $val; |
| 0 | 502 case MG_INT: return intval($val); |
| 503 case MG_BOOL: return intval($val); | |
| 504 case MG_DVA: | |
|
223
438277861f51
Implement better interpretation of DVA values (exposure times, for example),
Matti Hamalainen <ccr@tnsp.org>
parents:
189
diff
changeset
|
505 if (sscanf($val, "%d/%d", $v1, $v2) == 2 && $v2 != 0 && $v1 != 0) |
| 0 | 506 { |
| 507 if ($v1 < $v2) | |
|
249
abcd21b01829
Use floating point formatting for certain DVA values.
Matti Hamalainen <ccr@tnsp.org>
parents:
223
diff
changeset
|
508 return sprintf("1/%1.1f", $v2 / $v1); |
| 0 | 509 else |
| 510 return sprintf("%1.1f", $v1 / $v2); | |
| 511 } | |
| 512 else | |
| 513 return $val; | |
| 514 | |
|
124
eac2cf04261a
Change how date timestamps are stored and handled. This breaks cache file
Matti Hamalainen <ccr@tnsp.org>
parents:
114
diff
changeset
|
515 case MG_DATE: |
|
276
be152168d945
Use DateTime objects instead of UNIX timestamp integers for MG_DATE values.
Matti Hamalainen <ccr@tnsp.org>
parents:
275
diff
changeset
|
516 return date_create_from_format("Y:m:d H:i:s", $val); |
|
124
eac2cf04261a
Change how date timestamps are stored and handled. This breaks cache file
Matti Hamalainen <ccr@tnsp.org>
parents:
114
diff
changeset
|
517 |
| 0 | 518 default: |
| 519 return $val; | |
| 520 } | |
| 521 } | |
| 522 | |
| 523 | |
| 524 // | |
| 525 // Conditionally copies one "field" from an associated array/hash to another. | |
| 526 // If destination is already SET, nothing will be done. If source does | |
| 527 // not exist (e.g. one or more of the keys do not exist in source array), | |
| 528 // a default value will be used, if provided. | |
| 529 // Source may have multi-depth keys, destination has one key. | |
| 530 // | |
| 531 function mgCopyEntryData(&$dst, $src, $vtype, $dkey, $skeys, $default = NULL) | |
| 532 { | |
| 533 // Is destination already set? | |
| 534 if (isset($dst[$dkey])) | |
| 535 return FALSE; | |
| 536 | |
| 537 // If input key is not array, change it into one | |
| 538 if (!is_array($skeys)) | |
| 539 $skeys = array($skeys); | |
| 540 | |
| 541 // Traverse input array by using consequent keys | |
| 542 $tmp = &$src; | |
| 543 foreach ($skeys as $skey) | |
| 544 { | |
| 545 if (!array_key_exists($skey, $tmp)) | |
| 546 { | |
| 547 // Key didn't exist, try for default | |
| 548 if ($default !== NULL) | |
| 549 $dst[$dkey] = $default; | |
| 550 return FALSE; | |
| 551 } | |
| 552 else | |
| 553 $tmp = &$tmp[$skey]; | |
| 554 } | |
| 555 | |
| 556 // Optionally convert the input value | |
| 557 $dst[$dkey] = mgConvertExifData($tmp, $vtype); | |
| 558 return TRUE; | |
| 559 } | |
| 560 | |
| 561 | |
| 562 // | |
| 563 // Attempt to get gallery album data from various sources. | |
| 564 // | |
| 565 function mgGetAlbumData($galBasePath, $galPath) | |
| 566 { | |
| 567 // Check path permissions | |
|
60
ef9f17280372
Use modern PHP array definition in some places.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
568 $galData = []; |
| 0 | 569 if (is_readable($galPath)) |
| 570 { | |
| 571 // First, try to read gallery/album info file | |
| 572 $filename = mgGetPath($galPath, "info_file"); | |
| 573 if ($filename !== FALSE && file_exists($filename)) | |
| 574 { | |
| 575 mgDebug("Reading INFOFILE: ".$filename."\n"); | |
| 576 if (($galData = parse_ini_file($filename, FALSE)) === FALSE) | |
|
60
ef9f17280372
Use modern PHP array definition in some places.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
577 $galData = []; |
| 0 | 578 } |
| 579 | |
| 580 // Read header file, if any, and we don't have "header" field set yet | |
| 581 $filename = mgGetPath($galPath, "header_file"); | |
| 582 if ($filename !== FALSE && file_exists($filename) && | |
| 583 !isset($galData["header"])) | |
| 584 { | |
| 585 mgDebug("Reading HEADERFILE: ".$filename."\n"); | |
| 586 $galData["header"] = file_get_contents($filename); | |
| 587 } | |
| 588 | |
| 589 // Check for alternate key/values for album title/caption | |
| 590 if (isset($galData["title"]) && !isset($galData["caption"])) | |
| 591 { | |
| 592 $galData["caption"] = $galData["title"]; | |
| 593 unset($galData["title"]); | |
| 594 } | |
| 595 } | |
| 596 else | |
| 597 $galData["hide"] = TRUE; | |
| 598 | |
| 599 // If caption is not set, use last path component for | |
| 600 // a fallback value in case we don't discover proper title | |
| 601 // from other sources we can't check here yet. | |
| 602 $path = explode("/", $galPath); | |
| 603 $galData["fallback_caption"] = ucfirst(str_replace("_", " ", end($path))); | |
| 604 | |
| 605 // Last, store the current gallery path | |
| 606 $len = strlen($galBasePath); | |
| 607 if ($len < strlen($galPath) && substr($galPath, 0, $len) == $galBasePath) | |
| 608 $galData["path"] = substr($galPath, $len); | |
| 609 else | |
| 610 $galData["path"] = ""; | |
| 611 | |
| 612 return $galData; | |
| 613 } | |
| 614 | |
| 615 | |
| 165 | 616 // |
| 617 // Parse a simple image captions file, with format of one entry per line. | |
| 618 // Lines starting with "# " are comments (note the whitespace), empty lines ignored. | |
| 619 // First continuous non-whitespace text is file/dirname, followed | |
| 620 // by caption text, which is separate with whitespace from the filename. | |
| 621 // Filenames starting with # will be made hidden entries. | |
| 622 // Filenames starging with % will hide contents. | |
| 623 // | |
| 0 | 624 function mgReadCaptionsFile($galBasePath, $galPath) |
| 625 { | |
|
60
ef9f17280372
Use modern PHP array definition in some places.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
626 $captions = []; |
| 0 | 627 $filename = mgGetPath($galPath, "captions_file"); |
| 628 if ($filename === FALSE || ($fp = @fopen($filename, "rb")) === FALSE) | |
| 629 return $captions; | |
| 630 | |
| 631 mgDebug("Reading CAPTIONS: ".$filename."\n"); | |
| 632 | |
| 633 // Read and parse data | |
| 634 while (!feof($fp)) | |
| 635 { | |
| 636 $str = trim(fgets($fp)); | |
| 637 // Ignore comments and empty lines | |
| 638 if ($str != "#" && $str != "") | |
| 639 { | |
|
11
0b097770061d
Improve content hiding functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
640 if (preg_match("/^([#%]?)\s*(\S+?)\s+(.+)$/", $str, $m)) |
| 45 | 641 $captions[$m[2]] = ["caption" => $m[3], "hide" => ($m[1] == "#"), "hide_contents" => ($m[1] == "%"), "used" => FALSE]; |
| 0 | 642 else |
|
11
0b097770061d
Improve content hiding functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
643 if (preg_match("/^([#%]?)\s*(\S+?)$/", $str, $m)) |
| 45 | 644 $captions[$m[2]] = ["hide" => ($m[1] == "#"), "hide_contents" => ($m[1] == "%"), "used" => FALSE]; |
| 0 | 645 } |
| 646 } | |
| 647 | |
| 648 fclose($fp); | |
| 649 return $captions; | |
| 650 } | |
| 651 | |
| 652 | |
| 165 | 653 // |
| 654 // Create directory with specified permissions | |
| 655 // | |
| 0 | 656 function mgMakeDir($path, $perm) |
| 657 { | |
| 658 if (!file_exists($path)) | |
| 659 { | |
| 660 if (mkdir($path, $perm, TRUE) === false) | |
| 661 return mgError("Could not create directory '".$path."'\n"); | |
| 662 } | |
| 663 return TRUE; | |
| 664 } | |
| 665 | |
| 666 | |
| 165 | 667 // |
| 668 // Print a simple yes/no prompt with given message | |
| 669 // and default value. | |
| 670 // | |
| 0 | 671 function mgYesNoPrompt($msg, $default = FALSE) |
| 672 { | |
| 673 echo $msg." [".($default ? "Y/n" : "y/N")."]? "; | |
| 674 $sprompt = strtolower(trim(fgets(STDIN))); | |
| 675 | |
|
166
d8387b48b08d
Improve yes/no prompt check.
Matti Hamalainen <ccr@tnsp.org>
parents:
165
diff
changeset
|
676 if ($sprompt == "") |
|
d8387b48b08d
Improve yes/no prompt check.
Matti Hamalainen <ccr@tnsp.org>
parents:
165
diff
changeset
|
677 return $default; |
| 0 | 678 else |
| 165 | 679 return $sprompt[0] == 'y'; |
| 0 | 680 } |
| 681 | |
| 682 | |
| 165 | 683 // |
| 182 | 684 // Delete given directory OR file, recursively |
| 165 | 685 // |
| 183 | 686 function mgDelete($path, $showFiles) |
| 0 | 687 { |
|
56
7384504d7b52
Do not prompt for deletion in cleanup if there are no files/directories to delete.
Matti Hamalainen <ccr@tnsp.org>
parents:
55
diff
changeset
|
688 global $flagDoDelete, $countDoDelete; |
| 0 | 689 if (is_dir($path)) |
| 690 { | |
| 691 if (($dirHandle = @opendir($path)) === FALSE) | |
| 692 return mgError("Could not read directory '".$path."'.\n"); | |
| 693 | |
| 694 while (($dirFile = @readdir($dirHandle)) !== FALSE) | |
| 695 { | |
| 696 if ($dirFile != "." && $dirFile != "..") | |
| 183 | 697 mgDelete($path."/".$dirFile, $showFiles); |
| 0 | 698 } |
| 183 | 699 |
| 0 | 700 closedir($dirHandle); |
| 701 | |
| 702 echo " - ".$path." [DIR]\n"; | |
|
62
3f60a5f5b4b3
Actually fix checking for files to be deleted to work.
Matti Hamalainen <ccr@tnsp.org>
parents:
61
diff
changeset
|
703 $countDoDelete++; |
| 0 | 704 if ($flagDoDelete) |
| 705 rmdir($path); | |
| 706 } | |
| 707 else | |
|
54
624c50e1b52d
Fix 'mgtool clean' to not attempt deleting files that do not exist.
Matti Hamalainen <ccr@tnsp.org>
parents:
53
diff
changeset
|
708 if (file_exists($path)) |
| 0 | 709 { |
| 183 | 710 if ($showFiles) |
| 0 | 711 echo " - ".$path."\n"; |
|
56
7384504d7b52
Do not prompt for deletion in cleanup if there are no files/directories to delete.
Matti Hamalainen <ccr@tnsp.org>
parents:
55
diff
changeset
|
712 |
|
62
3f60a5f5b4b3
Actually fix checking for files to be deleted to work.
Matti Hamalainen <ccr@tnsp.org>
parents:
61
diff
changeset
|
713 $countDoDelete++; |
| 0 | 714 if ($flagDoDelete) |
| 715 unlink($path); | |
| 716 } | |
| 717 } | |
| 718 | |
| 719 | |
|
256
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
720 function mgDeleteConditional($path, &$noDelete) |
|
255
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
721 { |
|
256
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
722 global $flagDoDelete, $countDoDelete; |
|
255
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
723 if (is_dir($path)) |
|
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
724 { |
|
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
725 if (($dirHandle = @opendir($path)) === FALSE) |
|
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
726 return mgError("Could not read directory '".$path."'.\n"); |
|
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
727 |
|
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
728 while (($dirFile = @readdir($dirHandle)) !== FALSE) |
|
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
729 { |
|
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
730 if ($dirFile != "." && $dirFile != "..") |
|
256
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
731 mgDeleteConditional($path."/".$dirFile, $noDelete); |
|
255
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
732 } |
|
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
733 |
|
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
734 closedir($dirHandle); |
|
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
735 |
|
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
736 if (!array_key_exists($path, $noDelete)) |
|
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
737 { |
|
256
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
738 $countDoDelete++; |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
739 if ($flagDoDelete) |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
740 rmdir($path); |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
741 else |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
742 echo "DEL DIR '".$path."'\n"; |
|
255
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
743 } |
|
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
744 } |
|
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
745 else |
|
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
746 if (file_exists($path) && !array_key_exists($path, $noDelete)) |
|
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
747 { |
|
256
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
748 $countDoDelete++; |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
749 if ($flagDoDelete) |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
750 unlink($path); |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
751 else |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
752 echo "DEL FILE '".$path."'\n"; |
|
255
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
753 } |
|
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
754 } |
|
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
755 |
|
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
756 |
| 165 | 757 // |
| 758 // Check if we have received the quit signal | |
| 759 // and if yes, quit cleanly now. | |
| 760 // | |
| 0 | 761 function mgCheckQuit($now = FALSE) |
| 762 { | |
| 763 global $flagQuit; | |
| 764 | |
| 765 // Dispatch pending signals | |
| 766 pcntl_signal_dispatch(); | |
| 767 | |
| 768 // Check result | |
| 769 if ($now && $flagQuit) | |
| 770 mgFatal("Quitting.\n"); | |
| 771 | |
| 772 return $flagQuit; | |
| 773 } | |
| 774 | |
| 775 | |
| 776 function mgNeedUpdate($entry, $field, $cvalue) | |
| 777 { | |
| 778 if (!array_key_exists($field, $entry)) | |
| 779 return TRUE; | |
| 80 | 780 |
| 0 | 781 return ($entry[$field] < $cvalue); |
| 782 } | |
| 783 | |
| 784 | |
|
30
f2c21a8b9071
Sort images in a folder by their capture timestamp.
Matti Hamalainen <ccr@tnsp.org>
parents:
29
diff
changeset
|
785 function mgSortFunc($a, $b) |
|
f2c21a8b9071
Sort images in a folder by their capture timestamp.
Matti Hamalainen <ccr@tnsp.org>
parents:
29
diff
changeset
|
786 { |
|
299
338bc2941976
For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have.
Matti Hamalainen <ccr@tnsp.org>
parents:
297
diff
changeset
|
787 if (isset($a["datetime"]) && is_object($a["datetime"]) && |
|
338bc2941976
For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have.
Matti Hamalainen <ccr@tnsp.org>
parents:
297
diff
changeset
|
788 isset($b["datetime"]) && is_object($b["datetime"])) |
|
338bc2941976
For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have.
Matti Hamalainen <ccr@tnsp.org>
parents:
297
diff
changeset
|
789 $cres = $b["datetime"]->getTimestamp() - $a["datetime"]->getTimestamp(); |
|
338bc2941976
For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have.
Matti Hamalainen <ccr@tnsp.org>
parents:
297
diff
changeset
|
790 else |
|
338bc2941976
For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have.
Matti Hamalainen <ccr@tnsp.org>
parents:
297
diff
changeset
|
791 if (isset($a["datetime"]) && is_object($a["datetime"]) && |
|
338bc2941976
For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have.
Matti Hamalainen <ccr@tnsp.org>
parents:
297
diff
changeset
|
792 isset($b["base"])) |
|
338bc2941976
For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have.
Matti Hamalainen <ccr@tnsp.org>
parents:
297
diff
changeset
|
793 $cres = -1; |
|
338bc2941976
For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have.
Matti Hamalainen <ccr@tnsp.org>
parents:
297
diff
changeset
|
794 else |
|
338bc2941976
For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have.
Matti Hamalainen <ccr@tnsp.org>
parents:
297
diff
changeset
|
795 if (isset($b["datetime"]) && is_object($b["datetime"]) && |
|
338bc2941976
For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have.
Matti Hamalainen <ccr@tnsp.org>
parents:
297
diff
changeset
|
796 isset($a["base"])) |
|
338bc2941976
For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have.
Matti Hamalainen <ccr@tnsp.org>
parents:
297
diff
changeset
|
797 $cres = 1; |
|
30
f2c21a8b9071
Sort images in a folder by their capture timestamp.
Matti Hamalainen <ccr@tnsp.org>
parents:
29
diff
changeset
|
798 else |
|
108
417cdd9f8864
Use image file base name for sorting if timestamps are not available.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
799 if (isset($a["base"]) && isset($b["base"])) |
|
299
338bc2941976
For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have.
Matti Hamalainen <ccr@tnsp.org>
parents:
297
diff
changeset
|
800 $cres = strcmp($b["base"], $a["base"]); |
|
108
417cdd9f8864
Use image file base name for sorting if timestamps are not available.
Matti Hamalainen <ccr@tnsp.org>
parents:
80
diff
changeset
|
801 else |
|
299
338bc2941976
For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have.
Matti Hamalainen <ccr@tnsp.org>
parents:
297
diff
changeset
|
802 $cres = 0; |
|
338bc2941976
For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have.
Matti Hamalainen <ccr@tnsp.org>
parents:
297
diff
changeset
|
803 |
|
338bc2941976
For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have.
Matti Hamalainen <ccr@tnsp.org>
parents:
297
diff
changeset
|
804 return $cres; |
|
30
f2c21a8b9071
Sort images in a folder by their capture timestamp.
Matti Hamalainen <ccr@tnsp.org>
parents:
29
diff
changeset
|
805 } |
|
f2c21a8b9071
Sort images in a folder by their capture timestamp.
Matti Hamalainen <ccr@tnsp.org>
parents:
29
diff
changeset
|
806 |
|
f2c21a8b9071
Sort images in a folder by their capture timestamp.
Matti Hamalainen <ccr@tnsp.org>
parents:
29
diff
changeset
|
807 |
|
292
418f932763f2
Backed out changeset 13a23b120e72
Matti Hamalainen <ccr@tnsp.org>
parents:
291
diff
changeset
|
808 function mgWriteGalleryCache($cacheFilename, &$gallery, &$entries, &$parentEntry) |
|
15
805f93962cf9
Factorize gallery cache file writing to a separate function.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
809 { |
|
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
810 global $galBackend, $db, $galExifConversions, $flagSQL; |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
811 |
|
15
805f93962cf9
Factorize gallery cache file writing to a separate function.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
812 // Store gallery cache for this directory |
|
60
ef9f17280372
Use modern PHP array definition in some places.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
813 $images = []; |
|
ef9f17280372
Use modern PHP array definition in some places.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
814 $albums = []; |
|
61
ee82f7c8d44c
Do not include hidden entries in the entry list.
Matti Hamalainen <ccr@tnsp.org>
parents:
60
diff
changeset
|
815 $output = []; |
|
60
ef9f17280372
Use modern PHP array definition in some places.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
816 |
|
64
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
817 // If we are hiding contents of an album, generate no data |
|
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
818 if (!$parentEntry["hide_contents"]) |
|
15
805f93962cf9
Factorize gallery cache file writing to a separate function.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
819 { |
|
64
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
820 foreach ($entries as $ename => &$edata) |
|
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
821 { |
|
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
822 if ($edata["hide"]) |
|
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
823 continue; |
|
15
805f93962cf9
Factorize gallery cache file writing to a separate function.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
824 |
|
64
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
825 unset($edata["hide"]); |
|
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
826 if ($edata["type"] == 0) |
|
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
827 $images[$ename] = &$edata; |
|
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
828 else |
|
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
829 $albums[$ename] = &$edata; |
|
61
ee82f7c8d44c
Do not include hidden entries in the entry list.
Matti Hamalainen <ccr@tnsp.org>
parents:
60
diff
changeset
|
830 |
|
64
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
831 $output[$ename] = &$edata; |
|
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
832 } |
|
30
f2c21a8b9071
Sort images in a folder by their capture timestamp.
Matti Hamalainen <ccr@tnsp.org>
parents:
29
diff
changeset
|
833 |
|
64
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
834 uasort($images, "mgSortFunc"); |
|
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
835 krsort($albums); |
|
15
805f93962cf9
Factorize gallery cache file writing to a separate function.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
836 |
|
64
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
837 // Choose gallery album image |
|
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
838 if (count($images) > 0) |
|
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
839 { |
|
292
418f932763f2
Backed out changeset 13a23b120e72
Matti Hamalainen <ccr@tnsp.org>
parents:
291
diff
changeset
|
840 if (isset($gallery["albumpic"]) && |
|
418f932763f2
Backed out changeset 13a23b120e72
Matti Hamalainen <ccr@tnsp.org>
parents:
291
diff
changeset
|
841 isset($images[$gallery["albumpic"]])) |
|
79
8d8b361a76af
Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
842 { |
|
292
418f932763f2
Backed out changeset 13a23b120e72
Matti Hamalainen <ccr@tnsp.org>
parents:
291
diff
changeset
|
843 $parentEntry["image"] = $gallery["albumpic"]; |
|
79
8d8b361a76af
Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
844 } |
|
8d8b361a76af
Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
845 else |
|
8d8b361a76af
Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
846 { |
|
8d8b361a76af
Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
847 end($images); |
|
8d8b361a76af
Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
848 $parentEntry["image"] = key($images); |
|
8d8b361a76af
Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
849 } |
|
64
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
850 } |
|
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
851 else |
|
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
852 { |
|
79
8d8b361a76af
Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
853 foreach ($albums as $aid => &$adata) |
|
8d8b361a76af
Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
854 if (isset($adata["image"])) |
|
8d8b361a76af
Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
855 { |
|
8d8b361a76af
Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
856 $parentEntry["image"] = &$adata; |
|
8d8b361a76af
Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
857 break; |
|
8d8b361a76af
Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
858 } |
|
64
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
859 } |
|
35
985596db0f01
Implement recursive depth album covers.
Matti Hamalainen <ccr@tnsp.org>
parents:
32
diff
changeset
|
860 } |
|
16
3491ab93630e
Add sub-gallery thumbnails to gallery cache data.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
861 |
|
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
862 if ($galBackend == "sql" && $flagSQL) |
|
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
863 { |
|
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
864 mgDBBeginTransaction(); |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
865 |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
866 if (($path_id = mgFetchSQLColumn(mgPrepareSQL("SELECT id FROM paths WHERE path=%s", $gallery["path"]))) === FALSE && |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
867 ($path_id = mgExecSQLInsert(mgPrepareSQL("INSERT INTO paths (path) VALUES (%s)", $gallery["path"]))) === FALSE) |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
868 mgFatal("SQL path select failed.\n"); |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
869 |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
870 foreach ($output as $entry => &$edata) |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
871 if ($edata["type"] == 0) |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
872 { |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
873 $ekeys = ["path_id", "filename"]; |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
874 $evals = [$path_id, mgDBGetSQLParam($db, "s", $entry)]; |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
875 $esets = []; |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
876 |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
877 foreach ($galExifConversions as $econv) |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
878 if ($econv[GEC_IS_UNIQUE]) |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
879 { |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
880 $ekey = $econv[GEC_NAME]; |
|
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
881 |
|
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
882 // Skip unset and special case(s) |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
883 if (!isset($esets[$ekey]) && isset($edata[$ekey])) |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
884 { |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
885 $esets[$ekey] = TRUE; |
|
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
886 |
|
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
887 switch ($econv[GEC_TYPE]) |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
888 { |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
889 case MG_DATE: $etype = "D"; break; |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
890 case MG_INT: $etype = "d"; break; |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
891 default: $etype = "s"; break; |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
892 } |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
893 |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
894 $ekeys[] = $ekey; |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
895 $evals[] = mgDBGetSQLParam($db, $etype, $edata[$ekey]); |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
896 } |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
897 } |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
898 |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
899 $sql = "INSERT INTO images (".implode(",", $ekeys).") VALUES (".implode(",", $evals).")"; |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
900 if (($image_id = mgExecSQLInsert($sql)) === FALSE) |
|
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
901 mgFatal("Failed.\n"); |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
902 |
|
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
903 // Special handling for non-unique fields |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
904 foreach ($galExifConversions as $econv) |
|
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
905 { |
|
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
906 $ekey = $econv[GEC_NAME]; |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
907 if (!$econv[GEC_IS_UNIQUE] && |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
908 array_key_exists($econv[GEC_NAME], $edata)) |
|
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
909 { |
|
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
910 if (is_array($edata[$ekey])) |
|
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
911 { |
|
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
912 foreach ($edata[$ekey] as $kw) |
|
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
913 { |
|
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
914 $sql = mgPrepareSQL("INSERT INTO metadata (field,data,status) VALUES (%s,%s,0) ON CONFLICT(data) DO UPDATE SET status=1", $ekey, $kw); |
|
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
915 if (($id = mgExecSQLInsert($sql)) === FALSE) |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
916 mgFatal("Failure!\n"); |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
917 |
|
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
918 $sql = mgPrepareSQL("INSERT INTO images_meta (image_id,meta_id) VALUES (%d,%d)", $image_id, $id); |
|
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
919 if (($id = mgExecSQL($sql)) === FALSE) |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
920 mgFatal("Failure!\n"); |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
921 } |
|
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
922 } |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
923 else |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
924 { |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
925 $sql = mgPrepareSQL("INSERT INTO metadata (field,data,status) VALUES (%s,%s,0) ON CONFLICT(data) DO UPDATE SET status=1", $ekey, $edata[$ekey]); |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
926 if (($id = mgExecSQLInsert($sql)) === FALSE) |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
927 mgFatal("Failure!\n"); |
|
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
928 |
|
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
929 $sql = mgPrepareSQL("INSERT INTO images_meta (image_id,meta_id) VALUES (%d,%d)", $image_id, $id); |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
930 if (($id = mgExecSQL($sql)) === FALSE) |
|
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
931 mgFatal("Failure!\n"); |
|
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
932 } |
|
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
933 |
|
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
934 } |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
935 } |
|
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
936 } |
|
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
937 |
|
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
938 mgDBCommitTransaction(); |
|
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
939 } |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
940 |
|
15
805f93962cf9
Factorize gallery cache file writing to a separate function.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
941 $str = |
| 271 | 942 "<?php\n". |
|
292
418f932763f2
Backed out changeset 13a23b120e72
Matti Hamalainen <ccr@tnsp.org>
parents:
291
diff
changeset
|
943 "\$galData = ".var_export($gallery, TRUE).";\n". |
|
15
805f93962cf9
Factorize gallery cache file writing to a separate function.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
944 "\$galAlbumsIndex = ".var_export(array_keys($albums), TRUE).";\n". |
|
805f93962cf9
Factorize gallery cache file writing to a separate function.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
945 "\$galImagesIndex = ".var_export(array_keys($images), TRUE).";\n". |
|
61
ee82f7c8d44c
Do not include hidden entries in the entry list.
Matti Hamalainen <ccr@tnsp.org>
parents:
60
diff
changeset
|
946 "\$galEntries = ".var_export($output, TRUE).";\n". |
|
15
805f93962cf9
Factorize gallery cache file writing to a separate function.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
947 "?>"; |
|
805f93962cf9
Factorize gallery cache file writing to a separate function.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
948 |
|
805f93962cf9
Factorize gallery cache file writing to a separate function.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
949 if (@file_put_contents($cacheFilename, $str, LOCK_EX) === FALSE) |
|
805f93962cf9
Factorize gallery cache file writing to a separate function.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
950 return mgError("Error writing '".$cacheFilename."'\n"); |
|
805f93962cf9
Factorize gallery cache file writing to a separate function.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
951 |
|
805f93962cf9
Factorize gallery cache file writing to a separate function.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
952 return TRUE; |
|
805f93962cf9
Factorize gallery cache file writing to a separate function.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
953 } |
|
805f93962cf9
Factorize gallery cache file writing to a separate function.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
954 |
|
16
3491ab93630e
Add sub-gallery thumbnails to gallery cache data.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
955 |
|
3491ab93630e
Add sub-gallery thumbnails to gallery cache data.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
956 function mgHandleDirectory($mode, $basepath, $path, &$parentData, &$parentEntry, $writeMode, $startAt) |
| 0 | 957 { |
|
185
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
958 global $galExifConversions, $galTNPath, $galMedPath, $galCleanFlags; |
| 0 | 959 |
| 960 // Get cache file path | |
| 961 if (($cacheFilename = mgGetPath($path, "cache_file")) === FALSE) | |
| 962 return mgError("Cache filename / path not set.\n"); | |
| 963 | |
| 964 mgCheckQuit(TRUE); | |
| 965 | |
| 966 // Read directory contents | |
|
60
ef9f17280372
Use modern PHP array definition in some places.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
967 $entries = []; |
| 0 | 968 if (($dirHandle = @opendir($path)) === FALSE) |
| 969 return mgError("Could not read directory '".$path."'.\n"); | |
| 970 | |
| 971 while (($dirFile = @readdir($dirHandle)) !== FALSE) | |
| 972 { | |
| 973 $realFile = $path."/".$dirFile; | |
| 974 if (is_dir($realFile)) | |
| 975 { | |
|
185
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
976 if ($dirFile[0] != "." && $dirFile != $galTNPath && $dirFile != $galMedPath) |
|
63
1c32ece9acde
Some residual array() => [] conversions.
Matti Hamalainen <ccr@tnsp.org>
parents:
62
diff
changeset
|
977 $entries[$dirFile] = ["type" => 1, "base" => $dirFile, "ext" => "", "mtime" => filemtime($realFile)]; |
| 0 | 978 } |
| 979 else | |
|
6
405a02586fc2
Fix handling of image files that have spaces in filename (regexp used \S,
Matti Hamalainen <ccr@tnsp.org>
parents:
1
diff
changeset
|
980 if (preg_match("/^([^\/]+)(".mgGetSetting("format_exts").")$/i", $dirFile, $dirMatch)) |
|
63
1c32ece9acde
Some residual array() => [] conversions.
Matti Hamalainen <ccr@tnsp.org>
parents:
62
diff
changeset
|
981 $entries[$dirFile] = ["type" => 0, "base" => $dirMatch[1], "ext" => $dirMatch[2], "mtime" => filemtime($realFile), "hide" => false]; |
| 0 | 982 } |
| 983 closedir($dirHandle); | |
| 984 | |
| 985 mgCheckQuit(); | |
| 986 | |
|
256
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
987 $tnPath = $path."/".$galTNPath; |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
988 $medPath = $path."/".$galMedPath; |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
989 $generatedFiles = []; |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
990 $generatedFiles[$tnPath] = 1; |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
991 $generatedFiles[$medPath] = 1; |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
992 |
| 0 | 993 // Cleanup mode |
| 994 if ($mode == GCMD_CLEAN) | |
| 995 { | |
|
293
486398fb60ea
Allow album-specific {tn,med}_{width,height,format} settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
292
diff
changeset
|
996 $gallery = mgGetAlbumData($basepath, $path); |
| 0 | 997 |
| 998 if ($writeMode) | |
| 999 { | |
| 1000 if ($galCleanFlags & GCLEAN_CACHES) | |
| 183 | 1001 mgDelete($cacheFilename, TRUE); |
| 0 | 1002 |
|
251
19dab8b0c340
Remove clean command suboptions 'thumbnails' and 'mediums' and replace them with 'images'.
Matti Hamalainen <ccr@tnsp.org>
parents:
250
diff
changeset
|
1003 if ($galCleanFlags & GCLEAN_IMAGES) |
|
19dab8b0c340
Remove clean command suboptions 'thumbnails' and 'mediums' and replace them with 'images'.
Matti Hamalainen <ccr@tnsp.org>
parents:
250
diff
changeset
|
1004 { |
| 183 | 1005 mgDelete($path."/".$galTNPath, FALSE); |
|
185
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1006 mgDelete($path."/".$galMedPath, FALSE); |
|
251
19dab8b0c340
Remove clean command suboptions 'thumbnails' and 'mediums' and replace them with 'images'.
Matti Hamalainen <ccr@tnsp.org>
parents:
250
diff
changeset
|
1007 } |
|
256
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1008 |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1009 if ($galCleanFlags & GCLEAN_TRASH) |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1010 { |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1011 foreach ($entries as $ename => &$edata) |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1012 { |
|
293
486398fb60ea
Allow album-specific {tn,med}_{width,height,format} settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
292
diff
changeset
|
1013 $medFilename = $medPath."/".$ename.".".mgGetAlbumSetting($gallery, "med_format"); |
|
486398fb60ea
Allow album-specific {tn,med}_{width,height,format} settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
292
diff
changeset
|
1014 $tnFilename = $tnPath."/".$ename.".".mgGetAlbumSetting($gallery, "tn_format"); |
|
256
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1015 $generatedFiles[$medFilename] = 1; |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1016 $generatedFiles[$tnFilename] = 1; |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1017 } |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1018 |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1019 // Delete any "trash" files from medium/thumbnail dirs |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1020 mgDeleteConditional($tnPath, $generatedFiles); |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1021 mgDeleteConditional($medPath, $generatedFiles); |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1022 } |
| 0 | 1023 } |
| 1024 } | |
| 1025 else | |
| 1026 // Update modes | |
| 1027 if ($mode == GCMD_UPDATE || $mode == GCMD_RESCAN) | |
| 1028 { | |
| 1029 // Load current cache file, if it exists | |
|
60
ef9f17280372
Use modern PHP array definition in some places.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
1030 $galEntries = []; |
| 0 | 1031 $cacheTime = -1; |
| 1032 if ($mode == GCMD_UPDATE && file_exists($cacheFilename)) | |
| 1033 { | |
| 1034 $cacheTime = filemtime($cacheFilename); | |
| 1035 @include $cacheFilename; | |
| 1036 } | |
| 1037 | |
| 1038 // Read caption data | |
| 1039 $captions = mgReadCaptionsFile($basepath, $path); | |
|
292
418f932763f2
Backed out changeset 13a23b120e72
Matti Hamalainen <ccr@tnsp.org>
parents:
291
diff
changeset
|
1040 $gallery = mgGetAlbumData($basepath, $path); |
| 0 | 1041 if ($parentData !== NULL && $parentEntry !== NULL) |
| 1042 { | |
|
292
418f932763f2
Backed out changeset 13a23b120e72
Matti Hamalainen <ccr@tnsp.org>
parents:
291
diff
changeset
|
1043 $gallery["parent"] = &$parentData; |
|
418f932763f2
Backed out changeset 13a23b120e72
Matti Hamalainen <ccr@tnsp.org>
parents:
291
diff
changeset
|
1044 mgCopyEntryData($gallery, $parentEntry, MG_STR, "caption", "caption"); |
| 0 | 1045 } |
| 1046 | |
| 1047 // Start actual processing | |
| 1048 $nentries = count($entries); | |
| 1049 $nentry = 0; | |
| 1050 echo $path." .. "; | |
| 1051 foreach ($entries as $ename => &$edata) | |
| 1052 { | |
| 1053 printf("\r%s (%1.1f%%) ..", $path, ($nentry * 100.0) / $nentries); | |
| 1054 | |
| 1055 $nentry++; | |
| 1056 $efilename = $path."/".$ename; | |
|
293
486398fb60ea
Allow album-specific {tn,med}_{width,height,format} settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
292
diff
changeset
|
1057 $medFilename = $medPath."/".$ename.".".mgGetAlbumSetting($gallery, "med_format"); |
|
486398fb60ea
Allow album-specific {tn,med}_{width,height,format} settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
292
diff
changeset
|
1058 $tnFilename = $tnPath."/".$ename.".".mgGetAlbumSetting($gallery, "tn_format"); |
|
256
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1059 $capFilename = $path."/".$edata["base"].".txt"; |
| 0 | 1060 |
| 1061 if (array_key_exists($ename, $galEntries)) | |
| 1062 $galEntry = &$galEntries[$ename]; | |
| 1063 else | |
|
63
1c32ece9acde
Some residual array() => [] conversions.
Matti Hamalainen <ccr@tnsp.org>
parents:
62
diff
changeset
|
1064 $galEntry = []; |
| 0 | 1065 |
|
57
29bb365e3ee2
Be more responsive when processing images, check for signals after each
Matti Hamalainen <ccr@tnsp.org>
parents:
56
diff
changeset
|
1066 mgCheckQuit(TRUE); |
| 0 | 1067 |
| 1068 // Update with captions file data, if any | |
| 1069 if (array_key_exists($ename, $captions)) | |
| 1070 { | |
| 1071 foreach ($captions[$ename] as $ckey => $cval) | |
| 1072 $edata[$ckey] = $cval; | |
| 1073 } | |
| 1074 | |
| 1075 // Handle entry based on type | |
| 1076 if ($edata["type"] == 0) | |
| 1077 { | |
| 1078 $updFlags = 0; | |
|
255
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
1079 |
| 0 | 1080 // Check what we need to update .. |
| 1081 if (!file_exists($medFilename) || filemtime($medFilename) < $edata["mtime"]) | |
| 1082 $updFlags |= GUPD_MED_IMAGE; | |
| 1083 | |
| 1084 if (!file_exists($tnFilename) || filemtime($tnFilename) < $edata["mtime"]) | |
| 1085 $updFlags |= GUPD_TN_IMAGE; | |
| 1086 | |
| 1087 if (mgNeedUpdate($galEntry, "mtime", $edata["mtime"])) | |
| 1088 $updFlags |= GUPD_EXIF_INFO; | |
| 1089 | |
| 1090 if (file_exists($capFilename) && | |
| 1091 mgNeedUpdate($galEntry, "mtime", filemtime($capFilename))) | |
| 1092 $updFlags |= GUPD_CAPTION; | |
| 1093 | |
|
311
8fd5c850f921
Minor cleanup to XMP/EXIF fetching.
Matti Hamalainen <ccr@tnsp.org>
parents:
310
diff
changeset
|
1094 // Check for EXIF and XMP info |
|
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
1095 if (($updFlags & GUPD_EXIF_INFO) && |
|
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
1096 ($res = mgReadEXIFAndXMPData($efilename, $exif, $xmp)) === TRUE) |
| 0 | 1097 { |
|
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
1098 if ($xmp !== FALSE) |
|
311
8fd5c850f921
Minor cleanup to XMP/EXIF fetching.
Matti Hamalainen <ccr@tnsp.org>
parents:
310
diff
changeset
|
1099 { |
|
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
1100 echo "@"; |
|
311
8fd5c850f921
Minor cleanup to XMP/EXIF fetching.
Matti Hamalainen <ccr@tnsp.org>
parents:
310
diff
changeset
|
1101 foreach ($galExifConversions as $conv) |
|
8fd5c850f921
Minor cleanup to XMP/EXIF fetching.
Matti Hamalainen <ccr@tnsp.org>
parents:
310
diff
changeset
|
1102 mgCopyEntryData($edata, $xmp, $conv[GEC_TYPE], $conv[GEC_NAME], $conv[GEC_FIELDS]); |
|
8fd5c850f921
Minor cleanup to XMP/EXIF fetching.
Matti Hamalainen <ccr@tnsp.org>
parents:
310
diff
changeset
|
1103 } |
|
8fd5c850f921
Minor cleanup to XMP/EXIF fetching.
Matti Hamalainen <ccr@tnsp.org>
parents:
310
diff
changeset
|
1104 |
|
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
1105 if ($exif !== FALSE) |
|
304
da150fe627b6
Collect dimension/size (width/height) information of thumbnail and medium images into the cache.
Matti Hamalainen <ccr@tnsp.org>
parents:
303
diff
changeset
|
1106 { |
|
da150fe627b6
Collect dimension/size (width/height) information of thumbnail and medium images into the cache.
Matti Hamalainen <ccr@tnsp.org>
parents:
303
diff
changeset
|
1107 echo "%"; |
|
da150fe627b6
Collect dimension/size (width/height) information of thumbnail and medium images into the cache.
Matti Hamalainen <ccr@tnsp.org>
parents:
303
diff
changeset
|
1108 foreach ($galExifConversions as $conv) |
|
da150fe627b6
Collect dimension/size (width/height) information of thumbnail and medium images into the cache.
Matti Hamalainen <ccr@tnsp.org>
parents:
303
diff
changeset
|
1109 mgCopyEntryData($edata, $exif, $conv[GEC_TYPE], $conv[GEC_NAME], $conv[GEC_FIELDS]); |
|
da150fe627b6
Collect dimension/size (width/height) information of thumbnail and medium images into the cache.
Matti Hamalainen <ccr@tnsp.org>
parents:
303
diff
changeset
|
1110 } |
| 0 | 1111 } |
| 1112 else | |
| 1113 { | |
| 1114 // Copy old data that is not yet in new | |
| 1115 echo "*"; | |
| 1116 foreach ($galEntry as $okey => $odata) | |
| 1117 { | |
| 1118 if (!array_key_exists($okey, $edata)) | |
| 1119 $edata[$okey] = $odata; | |
| 1120 } | |
| 1121 } | |
| 1122 | |
| 1123 // Generate thumbnails, etc. | |
| 1124 if ($updFlags & GUPD_IMAGES) | |
| 1125 { | |
| 1126 mgMakeDir($tnPath, 0755); | |
|
185
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1127 mgMakeDir($medPath, 0755); |
| 0 | 1128 |
| 1129 if ($updFlags & GUPD_MED_IMAGE) | |
| 1130 { | |
| 1131 echo "1"; | |
| 1132 mgConvertImage($efilename, $medFilename, | |
|
293
486398fb60ea
Allow album-specific {tn,med}_{width,height,format} settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
292
diff
changeset
|
1133 [mgGetAlbumSetting($gallery, "med_width"), mgGetAlbumSetting($gallery, "med_height")], |
|
486398fb60ea
Allow album-specific {tn,med}_{width,height,format} settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
292
diff
changeset
|
1134 mgGetAlbumSetting($gallery, "med_format"), mgGetAlbumSetting($gallery, "med_quality"), TRUE); |
| 0 | 1135 } |
| 1136 | |
| 1137 if ($updFlags & GUPD_TN_IMAGE) | |
| 1138 { | |
| 1139 echo "2"; | |
| 1140 mgConvertImage($efilename, $tnFilename, | |
|
293
486398fb60ea
Allow album-specific {tn,med}_{width,height,format} settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
292
diff
changeset
|
1141 [mgGetAlbumSetting($gallery, "tn_width"), mgGetAlbumSetting($gallery, "tn_height")], |
|
486398fb60ea
Allow album-specific {tn,med}_{width,height,format} settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
292
diff
changeset
|
1142 mgGetAlbumSetting($gallery, "tn_format"), mgGetAlbumSetting($gallery, "tn_quality"), TRUE); |
| 0 | 1143 } |
| 1144 } | |
| 1145 | |
| 1146 // Check for .txt caption file | |
| 1147 if ($updFlags & GUPD_CAPTION) | |
| 1148 { | |
| 1149 echo "?"; | |
| 1150 if (($tmpData = @file_get_contents($capFilename)) !== FALSE) | |
| 1151 $edata["caption"] = $tmpData; | |
| 1152 } | |
|
310
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1153 |
|
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1154 if ($updFlags & GUPD_EXIF_INFO) |
|
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1155 { |
|
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1156 // Get width/height information for thumbnails and mediums |
|
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1157 $edata["med"] = []; |
|
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1158 if (($info = getimagesize($medFilename)) !== FALSE && count($info) >= 2) |
|
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1159 { |
|
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1160 $edata["med"]["width"] = $info[0]; |
|
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1161 $edata["med"]["height"] = $info[1]; |
|
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1162 echo "+"; |
|
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1163 } |
|
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1164 else |
|
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1165 echo "-"; |
|
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1166 |
|
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1167 $edata["tn"] = []; |
|
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1168 if (($info = @getimagesize($tnFilename)) !== FALSE && count($info) > 0) |
|
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1169 { |
|
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1170 $edata["tn"]["width"] = $info[0]; |
|
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1171 $edata["tn"]["height"] = $info[1]; |
|
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1172 echo "+"; |
|
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1173 } |
|
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1174 else |
|
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1175 echo "-"; |
|
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1176 } |
| 0 | 1177 } |
| 1178 else | |
| 1179 if ($edata["type"] == 1) | |
| 1180 { | |
| 10 | 1181 // Set some of the album data here |
| 0 | 1182 $tmp = mgGetAlbumData($basepath, $efilename); |
| 1183 mgCopyEntryData($edata, $tmp, MG_STR, "caption", "caption"); | |
| 1184 mgCopyEntryData($edata, $tmp, MG_STR, "caption", "fallback_caption"); | |
| 1185 mgCopyEntryData($edata, $tmp, MG_STR, "caption", "title"); | |
| 1186 mgCopyEntryData($edata, $tmp, MG_BOOL, "hide", "hide", FALSE); | |
|
11
0b097770061d
Improve content hiding functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1187 mgCopyEntryData($edata, $tmp, MG_BOOL, "hide_contents", "hide_contents", FALSE); |
| 0 | 1188 } |
| 1189 } | |
| 1190 | |
| 1191 echo "\r".$path." ..... DONE\n"; | |
| 1192 | |
| 1193 mgCheckQuit(TRUE); | |
| 1194 } | |
| 1195 else | |
| 1196 mgFatal("Invalid work mode '".$mode."'.\n"); | |
| 1197 | |
| 1198 mgCheckQuit(TRUE); | |
| 1199 | |
| 1200 // Recurse to subdirectories | |
|
9
232086da1670
Fix generating of sub-album/dirs names without gallery.info to specify
Matti Hamalainen <ccr@tnsp.org>
parents:
6
diff
changeset
|
1201 foreach ($entries as $ename => &$edata) |
| 0 | 1202 if ($edata["type"] == 1) |
| 1203 { | |
| 1204 $epath = $path."/".$ename."/"; | |
| 1205 $newWriteMode = ($writeMode === FALSE && $epath == $startAt) || $writeMode; | |
| 1206 | |
|
292
418f932763f2
Backed out changeset 13a23b120e72
Matti Hamalainen <ccr@tnsp.org>
parents:
291
diff
changeset
|
1207 if (!mgHandleDirectory($mode, $basepath, $epath, $gallery, $edata, $newWriteMode, $startAt)) |
| 0 | 1208 return FALSE; |
| 1209 } | |
| 1210 | |
|
16
3491ab93630e
Add sub-gallery thumbnails to gallery cache data.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
1211 // Finish update modes |
|
3491ab93630e
Add sub-gallery thumbnails to gallery cache data.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
1212 if ($mode == GCMD_UPDATE || $mode == GCMD_RESCAN) |
|
3491ab93630e
Add sub-gallery thumbnails to gallery cache data.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
1213 { |
|
3491ab93630e
Add sub-gallery thumbnails to gallery cache data.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
1214 // Store gallery cache for this directory |
|
292
418f932763f2
Backed out changeset 13a23b120e72
Matti Hamalainen <ccr@tnsp.org>
parents:
291
diff
changeset
|
1215 if ($writeMode && !mgWriteGalleryCache($cacheFilename, $gallery, $entries, $parentEntry)) |
|
16
3491ab93630e
Add sub-gallery thumbnails to gallery cache data.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
1216 return FALSE; |
|
3491ab93630e
Add sub-gallery thumbnails to gallery cache data.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
1217 } |
|
3491ab93630e
Add sub-gallery thumbnails to gallery cache data.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
1218 |
| 0 | 1219 mgCheckQuit(TRUE); |
| 1220 | |
| 1221 return TRUE; | |
| 1222 } | |
| 1223 | |
| 1224 | |
| 1225 function mgSigHandler($signo) | |
| 1226 { | |
| 1227 global $flagQuit; | |
| 1228 switch ($signo) | |
| 1229 { | |
| 1230 case SIGTERM: | |
| 1231 mgFatal("Received SIGTERM.\n"); | |
| 1232 break; | |
| 1233 | |
| 1234 case SIGQUIT: | |
| 1235 case SIGINT: | |
| 1236 $flagQuit = TRUE; | |
| 1237 break; | |
| 1238 | |
| 1239 } | |
| 1240 } | |
| 1241 | |
| 1242 | |
|
185
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1243 function mgCheckMPath($path, $id) |
|
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1244 { |
|
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1245 if ($path."/" != mgGetSetting($id)) |
|
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1246 mgError("Invalid ".$id." '".mgGetSetting($id)."', using '".$path."'.\n"); |
|
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1247 |
|
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1248 if (strpos($path, "/") !== FALSE || $path == "") |
|
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1249 mgFatal("Invalid ".$id." '".$path."'.\n"); |
|
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1250 } |
|
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1251 |
|
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1252 |
| 0 | 1253 function mgProcessGalleries($cmd, $path) |
| 1254 { | |
|
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1255 global $galTNPath, $galMedPath, $galSQLTables, $flagSQL; |
| 0 | 1256 |
| 1257 // Check validity of some settings | |
| 1258 $galPath = mgGetSetting("base_path"); | |
| 1259 $galTNPath = mgCleanPath(TRUE, mgGetSetting("tn_path")); | |
|
185
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1260 $galMedPath = mgCleanPath(TRUE, mgGetSetting("med_path")); |
| 0 | 1261 |
|
185
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1262 mgCheckMPath($galTNPath, "tn_path"); |
|
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1263 mgCheckMPath($galMedPath, "med_path"); |
| 0 | 1264 |
| 1265 $parentData = $parentEntry = NULL; | |
| 1266 $writeMode = TRUE; | |
| 1267 $startAt = NULL; | |
| 1268 | |
| 1269 // Check for path argument | |
| 1270 if ($path !== FALSE) | |
| 1271 { | |
| 1272 // Check the given path, needs to be "under" the gallery path | |
| 1273 $cmp = mgCleanPath(TRUE, mgRealPath($galPath))."/"; | |
| 1274 $tmp = mgCleanPath(TRUE, mgRealPath($path))."/"; | |
| 1275 if (substr($tmp, 0, strlen($cmp)) != $cmp) | |
| 1276 mgFatal("Path '".$path."' ('".$tmp."') does not reside under '".$galPath."' ('".$cmp."')!\n"); | |
| 1277 | |
| 1278 // Check if we need to bootstrap | |
| 1279 if ($cmp != $tmp) | |
| 1280 { | |
| 1281 $bpath = mgCleanPath(TRUE, mgRealPath($tmp."../")); | |
| 1282 | |
| 1283 if ($cmd != GCMD_CLEAN) | |
| 1284 { | |
| 1285 $cacheFile = mgGetPath($bpath, "cache_file"); | |
| 1286 if (!file_exists($cacheFile)) | |
| 1287 mgFatal("Can't start working from '".$path."', parent '".$cacheFile."' does not exist!\n"); | |
| 1288 | |
| 1289 @include($cacheFile); | |
| 1290 if (!isset($galEntries) || !isset($galData)) | |
| 1291 mgFatal("Cache file '".$cacheFile."' is broken or stale.\n"); | |
| 1292 } | |
| 1293 | |
| 1294 $writeMode = FALSE; | |
| 1295 $startAt = $tmp; | |
| 1296 $path = $bpath; | |
| 1297 | |
| 1298 echo "Starting: '".$startAt."' inside '".$path."'.\n"; | |
| 1299 } | |
| 1300 else | |
| 1301 $path = $tmp; | |
| 1302 } | |
| 1303 else | |
| 1304 $path = $galPath; | |
| 1305 | |
| 1306 // Start working | |
| 1307 echo "Gallery path: '".$galPath."', starting at '".$path."' ...\n"; | |
|
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1308 |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1309 if (($cmd == GCMD_CLEAN || $cmd == GCMD_RESCAN) && $flagSQL) |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1310 { |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1311 foreach ($galSQLTables as $tname => $tdata) |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1312 { |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1313 if (mgExecSQL("DELETE FROM ".$tname) === FALSE) |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1314 mgFatal("Failed to purge table '".$tname."'.\n"); |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1315 } |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1316 } |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1317 |
| 0 | 1318 mgHandleDirectory($cmd, $galPath, $path, $parentData, $parentEntry, $writeMode, $startAt); |
| 1319 } | |
| 1320 | |
| 1321 | |
| 1322 function mgShowCopyright() | |
| 1323 { | |
| 1324 global $mgProgVersion, $mgProgCopyright, | |
| 1325 $mgProgInfo, $mgProgEmail; | |
| 1326 | |
| 1327 echo | |
| 184 | 1328 "MGTool ".$mgProgVersion." - MGallery management tool\n". |
| 1329 $mgProgInfo." ".$mgProgEmail."\n". | |
| 1330 "(C) Copyright ".$mgProgCopyright."\n"; | |
| 0 | 1331 } |
| 1332 | |
| 1333 | |
| 1334 function mgShowHelp() | |
| 1335 { | |
| 1336 global $argv; | |
| 1337 echo | |
| 1338 "Usage: ".basename($argv[0])." <command> [arguments]\n". | |
| 1339 "\n". | |
| 1340 " --help - Show this help.\n". | |
| 1341 " --version - Show version information.\n". | |
| 1342 "\n". | |
| 1343 " update [path]\n". | |
| 1344 " Update directories under <path> or all gallery dirs.\n". | |
| 1345 " Conditionally scans dirs for new or changed images and\n". | |
| 1346 " updates cache files as needed.\n". | |
| 1347 "\n". | |
| 1348 " rescan [path]\n". | |
| 1349 " Like 'update', but forces all cache files to be regenerated\n". | |
| 1350 " and EXIF/caption/etc information to be re-scanned even\n". | |
| 1351 " if the file timestamps do not justify re-scanning.\n". | |
| 1352 "\n". | |
|
256
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1353 " clean <option> [path]\n". |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1354 " all - Delete all generated files\n". |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1355 " images - Delete generated images (thumbnails/mediums)\n". |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1356 " caches - Delete mgallery data cache files\n". |
|
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1357 " trash - Delete any 'unmanaged' files inside thumbnail/medium dirs\n". |
| 0 | 1358 "\n". |
| 281 | 1359 " NOTICE! You usually probably want to use only the 'caches' and\n". |
|
308
b9530dda7ff0
Cosmetic fix in mgtool help.
Matti Hamalainen <ccr@tnsp.org>
parents:
306
diff
changeset
|
1360 " 'trash' options. Unless you know what you are doing, that is.\n". |
| 281 | 1361 "\n". |
|
159
b010c763a1fc
Document mgtool 'dump' command.
Matti Hamalainen <ccr@tnsp.org>
parents:
130
diff
changeset
|
1362 " config|dump\n". |
|
b010c763a1fc
Document mgtool 'dump' command.
Matti Hamalainen <ccr@tnsp.org>
parents:
130
diff
changeset
|
1363 " Display configuration values (with extra information) or\n". |
|
b010c763a1fc
Document mgtool 'dump' command.
Matti Hamalainen <ccr@tnsp.org>
parents:
130
diff
changeset
|
1364 " \"dump\" current configuration as is.\n". |
| 0 | 1365 "\n"; |
| 1366 } | |
| 1367 | |
| 1368 | |
| 1369 // | |
| 1370 // Main code starts | |
| 1371 // | |
| 1372 if (php_sapi_name() != "cli" || !empty($_SERVER["REMOTE_ADDR"])) | |
| 1373 { | |
| 1374 header("Status: 404 Not Found"); | |
| 1375 die(); | |
| 1376 } | |
| 1377 | |
| 1378 pcntl_signal(SIGTERM, "mgSigHandler"); | |
| 1379 pcntl_signal(SIGHUP, "mgSigHandler"); | |
| 1380 pcntl_signal(SIGQUIT, "mgSigHandler"); | |
| 1381 pcntl_signal(SIGINT, "mgSigHandler"); | |
| 1382 | |
| 265 | 1383 // Check for improperly configured PHP |
|
264
745af791367d
Move Imagick/Gmagick module check to script startup.
Matti Hamalainen <ccr@tnsp.org>
parents:
262
diff
changeset
|
1384 if (extension_loaded("imagick") && extension_loaded("gmagick")) |
|
745af791367d
Move Imagick/Gmagick module check to script startup.
Matti Hamalainen <ccr@tnsp.org>
parents:
262
diff
changeset
|
1385 { |
|
745af791367d
Move Imagick/Gmagick module check to script startup.
Matti Hamalainen <ccr@tnsp.org>
parents:
262
diff
changeset
|
1386 mgError("FATAL ERROR! Both ImageMagick AND GraphicsMagick modules enabled in PHP! This will cause problems! Refusing to work.\n"); |
|
745af791367d
Move Imagick/Gmagick module check to script startup.
Matti Hamalainen <ccr@tnsp.org>
parents:
262
diff
changeset
|
1387 exit(1); |
|
745af791367d
Move Imagick/Gmagick module check to script startup.
Matti Hamalainen <ccr@tnsp.org>
parents:
262
diff
changeset
|
1388 } |
|
745af791367d
Move Imagick/Gmagick module check to script startup.
Matti Hamalainen <ccr@tnsp.org>
parents:
262
diff
changeset
|
1389 else |
|
745af791367d
Move Imagick/Gmagick module check to script startup.
Matti Hamalainen <ccr@tnsp.org>
parents:
262
diff
changeset
|
1390 if (!extension_loaded("imagick") && !extension_loaded("gmagick")) |
|
745af791367d
Move Imagick/Gmagick module check to script startup.
Matti Hamalainen <ccr@tnsp.org>
parents:
262
diff
changeset
|
1391 { |
|
745af791367d
Move Imagick/Gmagick module check to script startup.
Matti Hamalainen <ccr@tnsp.org>
parents:
262
diff
changeset
|
1392 mgError("No ImageMagick OR GraphicsMagick module available in PHP!\n"); |
|
745af791367d
Move Imagick/Gmagick module check to script startup.
Matti Hamalainen <ccr@tnsp.org>
parents:
262
diff
changeset
|
1393 exit(1); |
|
745af791367d
Move Imagick/Gmagick module check to script startup.
Matti Hamalainen <ccr@tnsp.org>
parents:
262
diff
changeset
|
1394 } |
|
745af791367d
Move Imagick/Gmagick module check to script startup.
Matti Hamalainen <ccr@tnsp.org>
parents:
262
diff
changeset
|
1395 |
| 265 | 1396 // Check settings |
|
297
77f85b1f35f2
Improve configuration file handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
293
diff
changeset
|
1397 if (mgReadSettings($searchPaths) === FALSE) |
|
77f85b1f35f2
Improve configuration file handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
293
diff
changeset
|
1398 { |
|
77f85b1f35f2
Improve configuration file handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
293
diff
changeset
|
1399 die("MGallery is not configured, failed to find a configuration file.\n". |
|
77f85b1f35f2
Improve configuration file handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
293
diff
changeset
|
1400 "Attempted search paths:\n".implode("\n", $searchPaths)."\n"); |
|
77f85b1f35f2
Improve configuration file handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
293
diff
changeset
|
1401 } |
|
130
f825d644cf7a
Implement new config setting "timezone" for specifying the timezone used for date/timestamp interpretation.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
1402 |
| 265 | 1403 // Configure the timezone |
|
130
f825d644cf7a
Implement new config setting "timezone" for specifying the timezone used for date/timestamp interpretation.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
1404 if (($pageTimeZone = mgGetSetting("timezone")) !== NULL) |
|
f825d644cf7a
Implement new config setting "timezone" for specifying the timezone used for date/timestamp interpretation.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
1405 date_default_timezone_set($pageTimeZone); |
| 0 | 1406 |
|
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1407 // Check backend |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1408 if (($galBackend = mgGetSetting("backend")) === null) |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1409 die("MGallery backend mode not set.\n"); |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1410 |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1411 switch ($galBackend = strtolower($galBackend)) |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1412 { |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1413 case "sql": |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1414 // Connect to database |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1415 if (mgConnectSQLDB() === FALSE) |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1416 die("Could not open database connection.\n"); |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1417 |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1418 // Create SQL schema elements for metadata fields |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1419 $tmpSQL = []; |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1420 foreach ($galExifConversions as $econv) |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1421 if ($econv[GEC_IS_UNIQUE]) |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1422 { |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1423 switch ($econv[GEC_TYPE]) |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1424 { |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1425 case MG_STR: $etype = "VARCHAR(256)"; break; |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1426 case MG_INT: $etype = "INTEGER"; break; |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1427 case MG_DVA: $etype = "VARCHAR(32)"; break; |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1428 case MG_DATE: $etype = "DATETIME"; break; |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1429 } |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1430 |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1431 $tmpSQL[$econv[GEC_NAME]] = $etype; |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1432 } |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1433 |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1434 // Merge to base "images" table schema |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1435 foreach ($tmpSQL as $ekey => $etype) |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1436 $galSQLTables["images"][] = [$ekey, $etype]; |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1437 |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1438 // Check tables |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1439 foreach ($galSQLTables as $name => $schemaData) |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1440 { |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1441 $schema = mgDBGetTableSchema($db, $schemaData); |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1442 if (!mgDBCreateOneTable($db, $name, $schema)) |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1443 die("Failed to create SQL table '".$name."'.\n"); |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1444 } |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1445 break; |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1446 |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1447 case "php": |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1448 break; |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1449 |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1450 default: |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1451 die("Invalid MGallery backend mode '".$galBackend."'.\n"); |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1452 } |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1453 |
| 265 | 1454 |
| 1455 // Check for commandline arguments | |
| 0 | 1456 $cmd = mgCArgLC(1); |
| 1457 switch ($cmd) | |
| 1458 { | |
| 1459 case "--version": | |
| 1460 case "version": | |
| 1461 case "ver": | |
| 1462 mgShowCopyright(); | |
| 1463 break; | |
| 1464 | |
| 1465 case FALSE: | |
| 1466 // No arguments | |
| 1467 mgError("Nothing to do. Showing help:\n"); | |
| 1468 | |
| 1469 case "--help": | |
| 1470 case "help": | |
| 1471 if ($cmd !== FALSE) | |
| 1472 mgShowCopyright(); | |
| 1473 mgShowHelp(); | |
| 1474 break; | |
| 1475 | |
| 1476 case "update": case "up": case "upd": case "upda": | |
|
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1477 $farg = mgCArg(2); |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1478 if ($farg == "--sql") |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1479 { |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1480 $farg = FALSE; |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1481 $flagSQL = TRUE; |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1482 } |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1483 else |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1484 $flagSQL = mgCArg(3) == "--sql"; |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1485 |
|
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1486 mgProcessGalleries(GCMD_UPDATE, $farg); |
| 0 | 1487 break; |
| 1488 | |
| 1489 case "rescan": case "re": case "res": | |
| 1490 mgProcessGalleries(GCMD_RESCAN, mgCArg(2)); | |
| 1491 break; | |
| 1492 | |
| 1493 case "clean": case "cl": case "cle": | |
| 1494 $cmode = mgCArgLC(2, 2); | |
| 1495 switch ($cmode) | |
| 1496 { | |
| 1497 case "al": $galCleanFlags = GCLEAN_ALL; break; | |
| 1498 case "ca": $galCleanFlags = GCLEAN_CACHES; break; | |
|
251
19dab8b0c340
Remove clean command suboptions 'thumbnails' and 'mediums' and replace them with 'images'.
Matti Hamalainen <ccr@tnsp.org>
parents:
250
diff
changeset
|
1499 case "im": $galCleanFlags = GCLEAN_IMAGES; break; |
|
256
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1500 case "tr": $galCleanFlags = GCLEAN_TRASH; break; |
| 0 | 1501 case FALSE: |
| 1502 mgFatal("Cleaning requires a mode argument.\n"); | |
| 1503 | |
| 1504 default: | |
| 1505 mgFatal("Invalid clean mode '".mgCArg(2)."'.\n"); | |
| 1506 } | |
|
56
7384504d7b52
Do not prompt for deletion in cleanup if there are no files/directories to delete.
Matti Hamalainen <ccr@tnsp.org>
parents:
55
diff
changeset
|
1507 $countDoDelete = 0; |
| 0 | 1508 $flagDoDelete = FALSE; |
| 1509 mgProcessGalleries(GCMD_CLEAN, mgCArg(3)); | |
| 1510 echo "--\n"; | |
|
56
7384504d7b52
Do not prompt for deletion in cleanup if there are no files/directories to delete.
Matti Hamalainen <ccr@tnsp.org>
parents:
55
diff
changeset
|
1511 if ($countDoDelete == 0) |
|
7384504d7b52
Do not prompt for deletion in cleanup if there are no files/directories to delete.
Matti Hamalainen <ccr@tnsp.org>
parents:
55
diff
changeset
|
1512 { |
|
7384504d7b52
Do not prompt for deletion in cleanup if there are no files/directories to delete.
Matti Hamalainen <ccr@tnsp.org>
parents:
55
diff
changeset
|
1513 echo "Nothing to clean!\n"; |
|
7384504d7b52
Do not prompt for deletion in cleanup if there are no files/directories to delete.
Matti Hamalainen <ccr@tnsp.org>
parents:
55
diff
changeset
|
1514 } |
|
7384504d7b52
Do not prompt for deletion in cleanup if there are no files/directories to delete.
Matti Hamalainen <ccr@tnsp.org>
parents:
55
diff
changeset
|
1515 else |
| 0 | 1516 if (mgYesNoPrompt("Really delete the above files and directories?")) |
| 1517 { | |
|
25
c698618e6f67
Actually implement deletion.
Matti Hamalainen <ccr@tnsp.org>
parents:
16
diff
changeset
|
1518 echo "Deleting ...\n"; |
|
c698618e6f67
Actually implement deletion.
Matti Hamalainen <ccr@tnsp.org>
parents:
16
diff
changeset
|
1519 $flagDoDelete = TRUE; |
|
c698618e6f67
Actually implement deletion.
Matti Hamalainen <ccr@tnsp.org>
parents:
16
diff
changeset
|
1520 mgProcessGalleries(GCMD_CLEAN, mgCArg(3)); |
|
c698618e6f67
Actually implement deletion.
Matti Hamalainen <ccr@tnsp.org>
parents:
16
diff
changeset
|
1521 } |
|
c698618e6f67
Actually implement deletion.
Matti Hamalainen <ccr@tnsp.org>
parents:
16
diff
changeset
|
1522 else |
|
c698618e6f67
Actually implement deletion.
Matti Hamalainen <ccr@tnsp.org>
parents:
16
diff
changeset
|
1523 { |
|
c698618e6f67
Actually implement deletion.
Matti Hamalainen <ccr@tnsp.org>
parents:
16
diff
changeset
|
1524 echo "Okay, canceling operation.\n"; |
| 0 | 1525 } |
| 1526 break; | |
| 1527 | |
| 1528 case "config": | |
| 1529 case "dump": | |
| 1530 | |
| 1531 foreach ($mgDefaults as $key => $dval) | |
| 1532 { | |
| 1533 $sval = mgGetSetting($key); | |
| 26 | 1534 if ($cmd == "dump") |
| 1535 { | |
| 189 | 1536 printf("%-20s = %s\n", |
| 1537 $key, | |
| 1538 mgGetDValStr($dval, $sval)); | |
| 26 | 1539 } |
| 1540 else | |
| 1541 { | |
| 1542 printf("%-20s = %s%s\n", | |
| 1543 $key, | |
|
114
c803235bd0f9
Implement flag config option type.
Matti Hamalainen <ccr@tnsp.org>
parents:
111
diff
changeset
|
1544 mgGetDValStr($dval, $sval), |
|
c803235bd0f9
Implement flag config option type.
Matti Hamalainen <ccr@tnsp.org>
parents:
111
diff
changeset
|
1545 ($dval[1] !== NULL && $sval !== $dval[1]) ? " (default: ".mgGetDValStr($dval, $dval[1]).")" : ""); |
| 26 | 1546 } |
| 0 | 1547 } |
| 1548 break; | |
| 1549 | |
| 1550 default: | |
| 1551 mgError("Unknown option/command '".$cmd."'.\n"); | |
| 1552 break; | |
| 1553 } | |
| 1554 | |
| 1555 ?> |