Mercurial > hg > mgallery
annotate mgtool.php @ 342:4dd202fffdf7
Cosmetics.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Sun, 27 Aug 2023 01:45:44 +0300 |
parents | 9210052bb649 |
children | d6422e856ecd |
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> |
326 | 7 // (C) Copyright 2015-2022 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 ], |
341
9210052bb649
Actually extract XMP title field. Oops.
Matti Hamalainen <ccr@tnsp.org>
parents:
340
diff
changeset
|
55 [ MG_STR, "title" , "title" , TRUE ], |
45 | 56 ]; |
0 | 57 |
275 | 58 |
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
59 // |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
60 // SQL table schemas |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
61 // |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
62 $galSQLTables = |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
63 [ |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
64 "images" => [ |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
65 ["id" , "INTEGER", "PRIMARY KEY", "AUTOINCREMENT"], |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
66 ["path_id" , "INTEGER"], |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
67 ["filename" , "VARCHAR(64)"], |
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 |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
70 "paths" => [ |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
71 ["id" , "INTEGER", "PRIMARY KEY", "AUTOINCREMENT"], |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
72 ["path" , "VARCHAR(128)"], |
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 |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
75 "metadata" => [ |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
76 ["id" , "INTEGER", "PRIMARY KEY", "AUTOINCREMENT"], |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
77 ["field" , "VARCHAR(64)"], |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
78 ["data" , "VARCHAR(64)", "UNIQUE"], |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
79 ["status" , "INTEGER"], |
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 |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
82 "images_meta" => [ |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
83 ["image_id" , "INTEGER"], |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
84 ["meta_id" , "INTEGER"], |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
85 ], |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
86 ]; |
0 | 87 |
88 | |
89 // | |
90 // Convert and scale image file function, for generating | |
91 // 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
|
92 // PHP ImageMagick or GraphicsMagick bindings. |
0 | 93 // |
94 function mgConvertImage($inFilename, $outFilename, $outDim, $outFormat, $outQuality, $thumb) | |
95 { | |
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
96 if (extension_loaded("imagick")) |
0 | 97 { |
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
98 // 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
|
99 try |
0 | 100 { |
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
101 $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
|
102 } |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
103 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
|
104 { |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
105 return mgError("ImageMagick exception for file '".$inFilename."':\n".$e->getMessage()."\n"); |
0 | 106 } |
107 | |
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
108 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
|
109 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
|
110 |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
111 $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
|
112 $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
|
113 $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
|
114 $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
|
115 |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
116 if ($outDim !== FALSE) |
0 | 117 { |
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
118 // 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
|
119 $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
|
120 $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
|
121 |
301 | 122 // 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
|
123 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
|
124 { |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
125 $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
|
126 $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
|
127 $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
|
128 } |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
129 |
301 | 130 // 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
|
131 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
|
132 { |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
133 $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
|
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 |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
136 // 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
|
137 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
|
138 { |
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->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
|
140 $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
|
141 $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
|
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 |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
145 $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
|
146 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
|
147 { |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
148 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
|
149 $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
|
150 $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
|
151 break; |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
152 |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
153 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
|
154 $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
|
155 $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
|
156 break; |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
157 |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
158 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
|
159 return mgError("Unsupported MGallery med/tn format '".$outFormat."'.\n"); |
0 | 160 } |
161 | |
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
162 $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
|
163 |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
164 $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
|
165 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
|
166 $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
|
167 |
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->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
|
169 $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
|
170 } |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
171 else |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
172 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
|
173 { |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
174 // 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
|
175 try |
0 | 176 { |
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
177 $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
|
178 } |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
179 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
|
180 { |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
181 return mgError("GraphicsMagick exception for file '".$inFilename."':\n".$e->getMessage()."\n"); |
0 | 182 } |
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
183 |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
184 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
|
185 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
|
186 |
284 | 187 //$profiles = $img->getImageProfile("icc"); |
188 //$img->setImageDepth(16); | |
189 //$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
|
190 |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
191 if ($outDim !== FALSE) |
0 | 192 { |
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
193 // 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
|
194 $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
|
195 //$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
|
196 |
301 | 197 // 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
|
198 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
|
199 { |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
200 $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
|
201 $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
|
202 $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
|
203 } |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
204 |
301 | 205 // 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
|
206 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
|
207 { |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
208 $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
|
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 |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
211 // 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
|
212 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
|
213 { |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
214 $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
|
215 $img->cropImage($outDim[0], $outDim[1], 0, 0); |
07b2b271c12a
Some fixes to GraphicsMagick image conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
265
diff
changeset
|
216 $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
|
217 } |
0 | 218 } |
261
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
219 |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
220 $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
|
221 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
|
222 { |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
223 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
|
224 $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
|
225 $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
|
226 break; |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
227 |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
228 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
|
229 $img->setFormat("WEBP"); |
284 | 230 //$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
|
231 break; |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
232 |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
233 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
|
234 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
|
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 |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
237 $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
|
238 |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
239 $img->stripImage(); |
284 | 240 //if (!empty($profiles)) |
241 // $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
|
242 |
32c13f594e39
Add support for PHP GraphicsMagick bindings, though it kind of sucks due to
Matti Hamalainen <ccr@tnsp.org>
parents:
257
diff
changeset
|
243 $img->writeImage($outFilename); |
268
07b2b271c12a
Some fixes to GraphicsMagick image conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
265
diff
changeset
|
244 $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
|
245 } |
0 | 246 |
247 return TRUE; | |
248 } | |
249 | |
250 | |
251 // | |
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
252 // 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
|
253 // |
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
254 // 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
|
255 // |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
256 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
|
257 { |
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
258 $exif = FALSE; |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
259 $xmp = FALSE; |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
260 |
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
261 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
|
262 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
|
263 |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
264 $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
|
265 |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
266 // 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
|
267 $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
|
268 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
|
269 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
|
270 |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
271 $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
|
272 |
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
273 // 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
|
274 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
|
275 $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
|
276 $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
|
277 $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
|
278 { |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
279 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
|
280 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
|
281 |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
282 $done = 0; |
319
bf4115b6dc2a
Improve WebP parsing resiliency. feof($fh) does not return true when ftell() == filesize exactly.
Matti Hamalainen <ccr@tnsp.org>
parents:
317
diff
changeset
|
283 while (!feof($fh) && ftell($fh) < $fileData["size"] && $done < 2) |
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
284 { |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
285 // 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
|
286 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
|
287 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
|
288 |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
289 $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
|
290 |
320 | 291 mgDebug(sprintf("WebP chunk: '%c%c%c%c' (%02x %02x %02x %02x) size=%d\n", |
314
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"], |
320 | 294 $chunk["size"])); |
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
295 |
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
296 // 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
|
297 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
|
298 $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
|
299 { |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
300 // 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
|
301 // 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
|
302 // 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
|
303 // 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
|
304 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
|
305 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
|
306 |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
307 // 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
|
308 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
|
309 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
|
310 |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
311 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
|
312 { |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
313 fclose($tmpFile); |
338 | 314 return "Error writing WebP EXIF chunk to temporary file"; |
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
315 } |
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 // 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
|
318 $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
|
319 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
|
320 |
316
af5ce7bf7eeb
Fix EXIF FileSize field for WebP files.
Matti Hamalainen <ccr@tnsp.org>
parents:
315
diff
changeset
|
321 // We need to fix the FileSize data as size comes from the temp file |
af5ce7bf7eeb
Fix EXIF FileSize field for WebP files.
Matti Hamalainen <ccr@tnsp.org>
parents:
315
diff
changeset
|
322 if (is_array($exif)) |
af5ce7bf7eeb
Fix EXIF FileSize field for WebP files.
Matti Hamalainen <ccr@tnsp.org>
parents:
315
diff
changeset
|
323 { |
af5ce7bf7eeb
Fix EXIF FileSize field for WebP files.
Matti Hamalainen <ccr@tnsp.org>
parents:
315
diff
changeset
|
324 $exif["FileSize"] = $fileData["size"]; |
af5ce7bf7eeb
Fix EXIF FileSize field for WebP files.
Matti Hamalainen <ccr@tnsp.org>
parents:
315
diff
changeset
|
325 } |
af5ce7bf7eeb
Fix EXIF FileSize field for WebP files.
Matti Hamalainen <ccr@tnsp.org>
parents:
315
diff
changeset
|
326 |
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
327 $done++; |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
328 } |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
329 else |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
330 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
|
331 $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
|
332 { |
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
333 // 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
|
334 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
|
335 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
|
336 |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
337 $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
|
338 |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
339 $done++; |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
340 } |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
341 else |
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 // 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
|
344 if (fseek($fh, $chunk["size"], SEEK_CUR) < 0) |
334 | 345 return "File seek error in chunk data skip"; |
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
346 } |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
347 |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
348 // 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
|
349 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
|
350 { |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
351 if (fseek($fh, 1, SEEK_CUR) < 0) |
334 | 352 return "File seek error in chunk alignment skip"; |
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
353 } |
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
354 } |
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
355 |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
356 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
|
357 } |
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
358 else |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
359 { |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
360 // Other fileformats, e.g. JPEG, PNG, GIF, .. |
320 | 361 mgDebug("Falling back to generic XMP/EXIF read.\n"); |
314
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 // Read EXIF .. |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
364 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
|
365 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
|
366 |
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
367 $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
|
368 |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
369 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
|
370 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
|
371 |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
372 // 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
|
373 $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
|
374 $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
|
375 $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
|
376 |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
377 // 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
|
378 $buffer = ""; |
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
379 $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
|
380 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
|
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 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
|
383 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
|
384 |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
385 $buffer .= $tmp; |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
386 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
|
387 { |
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
388 $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
|
389 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
|
390 { |
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
391 $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
|
392 $xmpOK = TRUE; |
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
393 break; |
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
394 } |
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
395 } |
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
396 else |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
397 $buffer = ""; |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
398 } |
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
399 |
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
400 // 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
|
401 if ($xmpOK) |
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
402 { |
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
403 $xmpOK = FALSE; |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
404 $buffer2 = $buffer; |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
405 do |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
406 { |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
407 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
|
408 { |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
409 $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
|
410 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
|
411 { |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
412 $xmpOK = TRUE; |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
413 break; |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
414 } |
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 |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
417 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
|
418 { |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
419 $buffer2 .= $tmp; |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
420 $buffer .= $tmp; |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
421 } |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
422 else |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
423 { |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
424 $xmpOK = FALSE; |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
425 break; |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
426 } |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
427 } while (!$xmpOK); |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
428 |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
429 if ($xmpOK) |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
430 { |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
431 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
|
432 $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
|
433 else |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
434 $xmpOK = FALSE; |
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 } |
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
437 |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
438 $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
|
439 |
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
440 return TRUE; |
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
441 } |
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
442 } |
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
443 |
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
444 |
315
8a69e693e08c
Add (unused) helper function mgConvertAttribute().
Matti Hamalainen <ccr@tnsp.org>
parents:
314
diff
changeset
|
445 function mgConvertAttribute(&$dst, &$src, $dstName, $srcName) |
8a69e693e08c
Add (unused) helper function mgConvertAttribute().
Matti Hamalainen <ccr@tnsp.org>
parents:
314
diff
changeset
|
446 { |
8a69e693e08c
Add (unused) helper function mgConvertAttribute().
Matti Hamalainen <ccr@tnsp.org>
parents:
314
diff
changeset
|
447 if (isset($src[$srcName])) |
8a69e693e08c
Add (unused) helper function mgConvertAttribute().
Matti Hamalainen <ccr@tnsp.org>
parents:
314
diff
changeset
|
448 $dst[$dstName] = (string) $src[$srcName]; |
8a69e693e08c
Add (unused) helper function mgConvertAttribute().
Matti Hamalainen <ccr@tnsp.org>
parents:
314
diff
changeset
|
449 } |
8a69e693e08c
Add (unused) helper function mgConvertAttribute().
Matti Hamalainen <ccr@tnsp.org>
parents:
314
diff
changeset
|
450 |
8a69e693e08c
Add (unused) helper function mgConvertAttribute().
Matti Hamalainen <ccr@tnsp.org>
parents:
314
diff
changeset
|
451 |
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
452 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
|
453 { |
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
454 // 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
|
455 // 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
|
456 $xmpPatterns = |
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
457 [ |
312
326935332784
Remove <?xpacket ?> from the XMP, as SimpleXML can't parse it.
Matti Hamalainen <ccr@tnsp.org>
parents:
311
diff
changeset
|
458 "/<\?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
|
459 "/[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
|
460 "/\/[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
|
461 "/<\/?(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
|
462 ]; |
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
463 |
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
464 $xmpReplacements = |
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
465 [ |
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
466 "", |
312
326935332784
Remove <?xpacket ?> from the XMP, as SimpleXML can't parse it.
Matti Hamalainen <ccr@tnsp.org>
parents:
311
diff
changeset
|
467 "", |
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
468 "\/", |
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
469 "", |
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
470 ]; |
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
471 |
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
472 $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
|
473 |
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
474 // 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
|
475 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
|
476 return FALSE; |
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
477 |
301 | 478 // 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
|
479 $xmpData = []; |
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
480 |
313
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 // 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
|
483 // 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
|
484 // 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
|
485 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
|
486 { |
d94b0ebe97c6
Add some commented out / unused example code in mgParseXMPData().
Matti Hamalainen <ccr@tnsp.org>
parents:
312
diff
changeset
|
487 $tmp = $xres[0]->attributes(); |
d94b0ebe97c6
Add some commented out / unused example code in mgParseXMPData().
Matti Hamalainen <ccr@tnsp.org>
parents:
312
diff
changeset
|
488 mgConvertAttribute($xmpData, $tmp, "lensmodel", "Lens"); |
d94b0ebe97c6
Add some commented out / unused example code in mgParseXMPData().
Matti Hamalainen <ccr@tnsp.org>
parents:
312
diff
changeset
|
489 mgConvertAttribute($xmpData, $tmp, "datetime", "CreateDate"); |
d94b0ebe97c6
Add some commented out / unused example code in mgParseXMPData().
Matti Hamalainen <ccr@tnsp.org>
parents:
312
diff
changeset
|
490 } |
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
491 |
313
d94b0ebe97c6
Add some commented out / unused example code in mgParseXMPData().
Matti Hamalainen <ccr@tnsp.org>
parents:
312
diff
changeset
|
492 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
|
493 $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
|
494 */ |
d94b0ebe97c6
Add some commented out / unused example code in mgParseXMPData().
Matti Hamalainen <ccr@tnsp.org>
parents:
312
diff
changeset
|
495 |
d94b0ebe97c6
Add some commented out / unused example code in mgParseXMPData().
Matti Hamalainen <ccr@tnsp.org>
parents:
312
diff
changeset
|
496 // 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
|
497 if (($xres = $xmpOb->xpath("RDF/Description/subject/li")) !== FALSE) |
339
04868ed6aab2
Extract image title from XMP tags.
Matti Hamalainen <ccr@tnsp.org>
parents:
338
diff
changeset
|
498 $xmpData["keywords"] = array_map(function($xkw) { return (string) $xkw; }, $xres); |
04868ed6aab2
Extract image title from XMP tags.
Matti Hamalainen <ccr@tnsp.org>
parents:
338
diff
changeset
|
499 |
04868ed6aab2
Extract image title from XMP tags.
Matti Hamalainen <ccr@tnsp.org>
parents:
338
diff
changeset
|
500 // Get image title |
04868ed6aab2
Extract image title from XMP tags.
Matti Hamalainen <ccr@tnsp.org>
parents:
338
diff
changeset
|
501 if (($xres = $xmpOb->xpath("RDF/Description/title/li")) !== FALSE) |
04868ed6aab2
Extract image title from XMP tags.
Matti Hamalainen <ccr@tnsp.org>
parents:
338
diff
changeset
|
502 $xmpData["title"] = implode(" ", array_map(function($xe) { return (string) $xe; }, $xres)); |
279
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
503 |
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
504 return $xmpData; |
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
505 } |
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
506 |
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
507 |
54a54921426c
Add functions for extracting XMP information from files and parsing the XMP
Matti Hamalainen <ccr@tnsp.org>
parents:
277
diff
changeset
|
508 // |
0 | 509 // Converts one value (mainly from EXIF tag information) |
52 | 510 // by doing explicit type casting and special conversions. |
0 | 511 // |
512 function mgConvertExifData($val, $vtype) | |
513 { | |
514 switch ($vtype) | |
515 { | |
46
e58292065b01
Let arrays through mgConvertExifData() when the type is MG_STR without
Matti Hamalainen <ccr@tnsp.org>
parents:
45
diff
changeset
|
516 case MG_STR: return is_array($val) ? $val : (string) $val; |
0 | 517 case MG_INT: return intval($val); |
518 case MG_BOOL: return intval($val); | |
519 case MG_DVA: | |
223
438277861f51
Implement better interpretation of DVA values (exposure times, for example),
Matti Hamalainen <ccr@tnsp.org>
parents:
189
diff
changeset
|
520 if (sscanf($val, "%d/%d", $v1, $v2) == 2 && $v2 != 0 && $v1 != 0) |
0 | 521 { |
522 if ($v1 < $v2) | |
249
abcd21b01829
Use floating point formatting for certain DVA values.
Matti Hamalainen <ccr@tnsp.org>
parents:
223
diff
changeset
|
523 return sprintf("1/%1.1f", $v2 / $v1); |
0 | 524 else |
525 return sprintf("%1.1f", $v1 / $v2); | |
526 } | |
527 else | |
528 return $val; | |
529 | |
124
eac2cf04261a
Change how date timestamps are stored and handled. This breaks cache file
Matti Hamalainen <ccr@tnsp.org>
parents:
114
diff
changeset
|
530 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
|
531 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
|
532 |
0 | 533 default: |
534 return $val; | |
535 } | |
536 } | |
537 | |
538 | |
539 // | |
540 // Conditionally copies one "field" from an associated array/hash to another. | |
541 // If destination is already SET, nothing will be done. If source does | |
542 // not exist (e.g. one or more of the keys do not exist in source array), | |
543 // a default value will be used, if provided. | |
544 // Source may have multi-depth keys, destination has one key. | |
545 // | |
546 function mgCopyEntryData(&$dst, $src, $vtype, $dkey, $skeys, $default = NULL) | |
547 { | |
548 // Is destination already set? | |
549 if (isset($dst[$dkey])) | |
550 return FALSE; | |
551 | |
552 // If input key is not array, change it into one | |
553 if (!is_array($skeys)) | |
554 $skeys = array($skeys); | |
555 | |
556 // Traverse input array by using consequent keys | |
557 $tmp = &$src; | |
558 foreach ($skeys as $skey) | |
559 { | |
560 if (!array_key_exists($skey, $tmp)) | |
561 { | |
562 // Key didn't exist, try for default | |
563 if ($default !== NULL) | |
564 $dst[$dkey] = $default; | |
342 | 565 |
0 | 566 return FALSE; |
567 } | |
568 else | |
569 $tmp = &$tmp[$skey]; | |
570 } | |
571 | |
572 // Optionally convert the input value | |
573 $dst[$dkey] = mgConvertExifData($tmp, $vtype); | |
342 | 574 |
0 | 575 return TRUE; |
576 } | |
577 | |
578 | |
579 // | |
580 // Attempt to get gallery album data from various sources. | |
581 // | |
582 function mgGetAlbumData($galBasePath, $galPath) | |
583 { | |
584 // Check path permissions | |
60
ef9f17280372
Use modern PHP array definition in some places.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
585 $galData = []; |
0 | 586 if (is_readable($galPath)) |
587 { | |
588 // First, try to read gallery/album info file | |
589 $filename = mgGetPath($galPath, "info_file"); | |
590 if ($filename !== FALSE && file_exists($filename)) | |
591 { | |
592 mgDebug("Reading INFOFILE: ".$filename."\n"); | |
593 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
|
594 $galData = []; |
0 | 595 } |
596 | |
597 // Read header file, if any, and we don't have "header" field set yet | |
598 $filename = mgGetPath($galPath, "header_file"); | |
599 if ($filename !== FALSE && file_exists($filename) && | |
600 !isset($galData["header"])) | |
601 { | |
602 mgDebug("Reading HEADERFILE: ".$filename."\n"); | |
603 $galData["header"] = file_get_contents($filename); | |
604 } | |
605 | |
606 // Check for alternate key/values for album title/caption | |
607 if (isset($galData["title"]) && !isset($galData["caption"])) | |
608 { | |
609 $galData["caption"] = $galData["title"]; | |
610 unset($galData["title"]); | |
611 } | |
612 } | |
613 else | |
614 $galData["hide"] = TRUE; | |
615 | |
616 // If caption is not set, use last path component for | |
617 // a fallback value in case we don't discover proper title | |
618 // from other sources we can't check here yet. | |
619 $path = explode("/", $galPath); | |
620 $galData["fallback_caption"] = ucfirst(str_replace("_", " ", end($path))); | |
621 | |
622 // Last, store the current gallery path | |
623 $len = strlen($galBasePath); | |
624 if ($len < strlen($galPath) && substr($galPath, 0, $len) == $galBasePath) | |
625 $galData["path"] = substr($galPath, $len); | |
626 else | |
627 $galData["path"] = ""; | |
628 | |
629 return $galData; | |
630 } | |
631 | |
632 | |
165 | 633 // |
634 // Parse a simple image captions file, with format of one entry per line. | |
635 // Lines starting with "# " are comments (note the whitespace), empty lines ignored. | |
636 // First continuous non-whitespace text is file/dirname, followed | |
637 // by caption text, which is separate with whitespace from the filename. | |
638 // Filenames starting with # will be made hidden entries. | |
639 // Filenames starging with % will hide contents. | |
640 // | |
0 | 641 function mgReadCaptionsFile($galBasePath, $galPath) |
642 { | |
60
ef9f17280372
Use modern PHP array definition in some places.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
643 $captions = []; |
0 | 644 $filename = mgGetPath($galPath, "captions_file"); |
645 if ($filename === FALSE || ($fp = @fopen($filename, "rb")) === FALSE) | |
646 return $captions; | |
647 | |
648 mgDebug("Reading CAPTIONS: ".$filename."\n"); | |
649 | |
650 // Read and parse data | |
651 while (!feof($fp)) | |
652 { | |
653 $str = trim(fgets($fp)); | |
654 // Ignore comments and empty lines | |
655 if ($str != "#" && $str != "") | |
656 { | |
330
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
657 if (($hasData = preg_match("/^([#%]?)\s*(\S+?)\s+(.+)$/", $str, $m))) |
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
658 $captions[$m[2]] = ["caption" => $m[3]]; |
0 | 659 else |
330
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
660 $hasData = preg_match("/^([#%]?)\s*(\S+?)$/", $str, $m); |
334 | 661 |
330
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
662 if ($hasData) |
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
663 { |
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
664 $captions[$m[2]] = [ |
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
665 "hide" => ($m[1] == "#"), |
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
666 "hide_contents" => ($m[1] == "%"), |
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
667 ]; |
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
668 } |
0 | 669 } |
670 } | |
671 | |
672 fclose($fp); | |
673 return $captions; | |
674 } | |
675 | |
676 | |
165 | 677 // |
678 // Create directory with specified permissions | |
679 // | |
0 | 680 function mgMakeDir($path, $perm) |
681 { | |
682 if (!file_exists($path)) | |
683 { | |
684 if (mkdir($path, $perm, TRUE) === false) | |
685 return mgError("Could not create directory '".$path."'\n"); | |
686 } | |
687 return TRUE; | |
688 } | |
689 | |
690 | |
165 | 691 // |
692 // Print a simple yes/no prompt with given message | |
693 // and default value. | |
694 // | |
0 | 695 function mgYesNoPrompt($msg, $default = FALSE) |
696 { | |
697 echo $msg." [".($default ? "Y/n" : "y/N")."]? "; | |
698 $sprompt = strtolower(trim(fgets(STDIN))); | |
699 | |
166
d8387b48b08d
Improve yes/no prompt check.
Matti Hamalainen <ccr@tnsp.org>
parents:
165
diff
changeset
|
700 if ($sprompt == "") |
d8387b48b08d
Improve yes/no prompt check.
Matti Hamalainen <ccr@tnsp.org>
parents:
165
diff
changeset
|
701 return $default; |
0 | 702 else |
165 | 703 return $sprompt[0] == 'y'; |
0 | 704 } |
705 | |
706 | |
165 | 707 // |
182 | 708 // Delete given directory OR file, recursively |
165 | 709 // |
183 | 710 function mgDelete($path, $showFiles) |
0 | 711 { |
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 global $flagDoDelete, $countDoDelete; |
0 | 713 if (is_dir($path)) |
714 { | |
715 if (($dirHandle = @opendir($path)) === FALSE) | |
716 return mgError("Could not read directory '".$path."'.\n"); | |
717 | |
718 while (($dirFile = @readdir($dirHandle)) !== FALSE) | |
719 { | |
720 if ($dirFile != "." && $dirFile != "..") | |
183 | 721 mgDelete($path."/".$dirFile, $showFiles); |
0 | 722 } |
183 | 723 |
0 | 724 closedir($dirHandle); |
725 | |
726 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
|
727 $countDoDelete++; |
0 | 728 if ($flagDoDelete) |
729 rmdir($path); | |
730 } | |
731 else | |
54
624c50e1b52d
Fix 'mgtool clean' to not attempt deleting files that do not exist.
Matti Hamalainen <ccr@tnsp.org>
parents:
53
diff
changeset
|
732 if (file_exists($path)) |
0 | 733 { |
183 | 734 if ($showFiles) |
0 | 735 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
|
736 |
62
3f60a5f5b4b3
Actually fix checking for files to be deleted to work.
Matti Hamalainen <ccr@tnsp.org>
parents:
61
diff
changeset
|
737 $countDoDelete++; |
0 | 738 if ($flagDoDelete) |
739 unlink($path); | |
740 } | |
741 } | |
742 | |
743 | |
256
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
744 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
|
745 { |
256
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
746 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
|
747 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
|
748 { |
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
749 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
|
750 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
|
751 |
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
752 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
|
753 { |
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
754 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
|
755 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
|
756 } |
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
757 |
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
758 closedir($dirHandle); |
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
759 |
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
760 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
|
761 { |
256
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
762 $countDoDelete++; |
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
763 if ($flagDoDelete) |
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
764 rmdir($path); |
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
765 else |
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
766 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
|
767 } |
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
768 } |
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
769 else |
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
770 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
|
771 { |
256
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
772 $countDoDelete++; |
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
773 if ($flagDoDelete) |
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
774 unlink($path); |
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
775 else |
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
776 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
|
777 } |
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
778 } |
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
779 |
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
780 |
165 | 781 // |
782 // Check if we have received the quit signal | |
783 // and if yes, quit cleanly now. | |
784 // | |
0 | 785 function mgCheckQuit($now = FALSE) |
786 { | |
787 global $flagQuit; | |
788 | |
789 // Dispatch pending signals | |
790 pcntl_signal_dispatch(); | |
791 | |
792 // Check result | |
793 if ($now && $flagQuit) | |
794 mgFatal("Quitting.\n"); | |
795 | |
796 return $flagQuit; | |
797 } | |
798 | |
799 | |
800 function mgNeedUpdate($entry, $field, $cvalue) | |
801 { | |
802 if (!array_key_exists($field, $entry)) | |
803 return TRUE; | |
80 | 804 |
0 | 805 return ($entry[$field] < $cvalue); |
806 } | |
807 | |
808 | |
30
f2c21a8b9071
Sort images in a folder by their capture timestamp.
Matti Hamalainen <ccr@tnsp.org>
parents:
29
diff
changeset
|
809 function mgSortFunc($a, $b) |
f2c21a8b9071
Sort images in a folder by their capture timestamp.
Matti Hamalainen <ccr@tnsp.org>
parents:
29
diff
changeset
|
810 { |
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
|
811 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
|
812 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
|
813 $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
|
814 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
|
815 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
|
816 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
|
817 $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
|
818 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
|
819 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
|
820 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
|
821 $cres = 1; |
30
f2c21a8b9071
Sort images in a folder by their capture timestamp.
Matti Hamalainen <ccr@tnsp.org>
parents:
29
diff
changeset
|
822 else |
325
9a4297e59a40
Adjust sorting so that if timestamp difference is 0, compare names.
Matti Hamalainen <ccr@tnsp.org>
parents:
322
diff
changeset
|
823 $cres = 0; |
9a4297e59a40
Adjust sorting so that if timestamp difference is 0, compare names.
Matti Hamalainen <ccr@tnsp.org>
parents:
322
diff
changeset
|
824 |
9a4297e59a40
Adjust sorting so that if timestamp difference is 0, compare names.
Matti Hamalainen <ccr@tnsp.org>
parents:
322
diff
changeset
|
825 if ($cres == 0 && 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
|
826 $cres = strcmp($b["base"], $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
|
827 |
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
|
828 return $cres; |
30
f2c21a8b9071
Sort images in a folder by their capture timestamp.
Matti Hamalainen <ccr@tnsp.org>
parents:
29
diff
changeset
|
829 } |
f2c21a8b9071
Sort images in a folder by their capture timestamp.
Matti Hamalainen <ccr@tnsp.org>
parents:
29
diff
changeset
|
830 |
f2c21a8b9071
Sort images in a folder by their capture timestamp.
Matti Hamalainen <ccr@tnsp.org>
parents:
29
diff
changeset
|
831 |
292
418f932763f2
Backed out changeset 13a23b120e72
Matti Hamalainen <ccr@tnsp.org>
parents:
291
diff
changeset
|
832 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
|
833 { |
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
834 global $galBackend, $db, $galExifConversions, $flagSQL; |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
835 |
15
805f93962cf9
Factorize gallery cache file writing to a separate function.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
836 // 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
|
837 $images = []; |
ef9f17280372
Use modern PHP array definition in some places.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
838 $albums = []; |
61
ee82f7c8d44c
Do not include hidden entries in the entry list.
Matti Hamalainen <ccr@tnsp.org>
parents:
60
diff
changeset
|
839 $output = []; |
60
ef9f17280372
Use modern PHP array definition in some places.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
840 |
64
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
841 // If we are hiding contents of an album, generate no data |
337 | 842 if ($parentEntry === NULL || !$parentEntry["hide_contents"]) |
15
805f93962cf9
Factorize gallery cache file writing to a separate function.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
843 { |
64
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
844 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
|
845 { |
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
846 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
|
847 continue; |
15
805f93962cf9
Factorize gallery cache file writing to a separate function.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
848 |
64
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
849 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
|
850 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
|
851 $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
|
852 else |
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
853 $albums[$ename] = &$edata; |
61
ee82f7c8d44c
Do not include hidden entries in the entry list.
Matti Hamalainen <ccr@tnsp.org>
parents:
60
diff
changeset
|
854 |
64
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
855 $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
|
856 } |
30
f2c21a8b9071
Sort images in a folder by their capture timestamp.
Matti Hamalainen <ccr@tnsp.org>
parents:
29
diff
changeset
|
857 |
64
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
858 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
|
859 krsort($albums); |
15
805f93962cf9
Factorize gallery cache file writing to a separate function.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
860 |
317
d66caa602023
Add better checks for custom/user selected album cover image.
Matti Hamalainen <ccr@tnsp.org>
parents:
316
diff
changeset
|
861 // Choose gallery album cover image |
64
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
862 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
|
863 { |
317
d66caa602023
Add better checks for custom/user selected album cover image.
Matti Hamalainen <ccr@tnsp.org>
parents:
316
diff
changeset
|
864 // Is the cover image set in the album data? |
d66caa602023
Add better checks for custom/user selected album cover image.
Matti Hamalainen <ccr@tnsp.org>
parents:
316
diff
changeset
|
865 if (isset($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
|
866 { |
317
d66caa602023
Add better checks for custom/user selected album cover image.
Matti Hamalainen <ccr@tnsp.org>
parents:
316
diff
changeset
|
867 if (!isset($images[$gallery["albumpic"]])) |
330
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
868 return mgError("Album cover picture '".$gallery["albumpic"]."' set, but is not found in directory.\n"); |
317
d66caa602023
Add better checks for custom/user selected album cover image.
Matti Hamalainen <ccr@tnsp.org>
parents:
316
diff
changeset
|
869 else |
d66caa602023
Add better checks for custom/user selected album cover image.
Matti Hamalainen <ccr@tnsp.org>
parents:
316
diff
changeset
|
870 $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
|
871 } |
317
d66caa602023
Add better checks for custom/user selected album cover image.
Matti Hamalainen <ccr@tnsp.org>
parents:
316
diff
changeset
|
872 |
d66caa602023
Add better checks for custom/user selected album cover image.
Matti Hamalainen <ccr@tnsp.org>
parents:
316
diff
changeset
|
873 // Got anything? |
d66caa602023
Add better checks for custom/user selected album cover image.
Matti Hamalainen <ccr@tnsp.org>
parents:
316
diff
changeset
|
874 if (!isset($parentEntry["image"])) |
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
|
875 { |
317
d66caa602023
Add better checks for custom/user selected album cover image.
Matti Hamalainen <ccr@tnsp.org>
parents:
316
diff
changeset
|
876 // No, use the last image in the album |
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
|
877 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
|
878 $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
|
879 } |
64
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
880 } |
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
881 else |
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
882 { |
330
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
883 // Is the cover image set in the album data? |
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
884 if (isset($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
|
885 { |
330
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
886 if (!isset($albums[$gallery["albumpic"]])) |
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
887 { |
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
888 return mgError("Album cover picture '".$gallery["albumpic"]."' set, but subalbum not found.\n"); |
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
889 } |
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
890 |
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
891 $parentEntry["image"] = &$albums[$gallery["albumpic"]]; |
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
892 } |
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
893 else |
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
894 { |
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
895 foreach ($albums as $aid => &$adata) |
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
896 if (isset($adata["image"])) |
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
897 { |
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
898 $parentEntry["image"] = &$adata; |
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
899 break; |
c1de5571b59c
Improve album cover picture handling, perhaps.
Matti Hamalainen <ccr@tnsp.org>
parents:
326
diff
changeset
|
900 } |
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
|
901 } |
64
9a01e14b27ef
Implement hide_contents setting for galleries, which hides contents of an album.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
902 } |
35
985596db0f01
Implement recursive depth album covers.
Matti Hamalainen <ccr@tnsp.org>
parents:
32
diff
changeset
|
903 } |
16
3491ab93630e
Add sub-gallery thumbnails to gallery cache data.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
904 |
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
905 if ($galBackend == "sql" && $flagSQL) |
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
906 { |
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
907 mgDBBeginTransaction(); |
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
908 |
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
909 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
|
910 ($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
|
911 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
|
912 |
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
913 foreach ($output as $entry => &$edata) |
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
914 if ($edata["type"] == 0) |
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
915 { |
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
916 $ekeys = ["path_id", "filename"]; |
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
917 $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
|
918 $esets = []; |
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
919 |
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
920 foreach ($galExifConversions as $econv) |
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
921 if ($econv[GEC_IS_UNIQUE]) |
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 $ekey = $econv[GEC_NAME]; |
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
924 |
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
925 // 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
|
926 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
|
927 { |
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
928 $esets[$ekey] = TRUE; |
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
929 |
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
930 switch ($econv[GEC_TYPE]) |
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
931 { |
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
932 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
|
933 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
|
934 default: $etype = "s"; break; |
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
935 } |
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
936 |
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
937 $ekeys[] = $ekey; |
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
938 $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
|
939 } |
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
940 } |
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
941 |
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
942 $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
|
943 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
|
944 mgFatal("Failed.\n"); |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
945 |
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
946 // 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
|
947 foreach ($galExifConversions as $econv) |
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
948 { |
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
949 $ekey = $econv[GEC_NAME]; |
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
950 if (!$econv[GEC_IS_UNIQUE] && |
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
951 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
|
952 { |
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
953 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
|
954 { |
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
955 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
|
956 { |
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
957 $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
|
958 if (($id = mgExecSQLInsert($sql)) === FALSE) |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
959 mgFatal("Failure!\n"); |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
960 |
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
961 $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
|
962 if (($id = mgExecSQL($sql)) === FALSE) |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
963 mgFatal("Failure!\n"); |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
964 } |
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
965 } |
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
966 else |
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
967 { |
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
968 $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
|
969 if (($id = mgExecSQLInsert($sql)) === FALSE) |
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
970 mgFatal("Failure!\n"); |
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
971 |
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
972 $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
|
973 if (($id = mgExecSQL($sql)) === FALSE) |
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
974 mgFatal("Failure!\n"); |
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
975 } |
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
976 |
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
977 } |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
978 } |
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
979 } |
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
980 |
300
7bccb4204e6e
Cleanup indent and use if instead of switch/case.
Matti Hamalainen <ccr@tnsp.org>
parents:
299
diff
changeset
|
981 mgDBCommitTransaction(); |
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
982 } |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
983 |
15
805f93962cf9
Factorize gallery cache file writing to a separate function.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
984 $str = |
271 | 985 "<?php\n". |
292
418f932763f2
Backed out changeset 13a23b120e72
Matti Hamalainen <ccr@tnsp.org>
parents:
291
diff
changeset
|
986 "\$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
|
987 "\$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
|
988 "\$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
|
989 "\$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
|
990 "?>"; |
805f93962cf9
Factorize gallery cache file writing to a separate function.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
991 |
805f93962cf9
Factorize gallery cache file writing to a separate function.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
992 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
|
993 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
|
994 |
805f93962cf9
Factorize gallery cache file writing to a separate function.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
995 return TRUE; |
805f93962cf9
Factorize gallery cache file writing to a separate function.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
996 } |
805f93962cf9
Factorize gallery cache file writing to a separate function.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
997 |
16
3491ab93630e
Add sub-gallery thumbnails to gallery cache data.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
998 |
3491ab93630e
Add sub-gallery thumbnails to gallery cache data.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
999 function mgHandleDirectory($mode, $basepath, $path, &$parentData, &$parentEntry, $writeMode, $startAt) |
0 | 1000 { |
185
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1001 global $galExifConversions, $galTNPath, $galMedPath, $galCleanFlags; |
0 | 1002 |
1003 // Get cache file path | |
1004 if (($cacheFilename = mgGetPath($path, "cache_file")) === FALSE) | |
1005 return mgError("Cache filename / path not set.\n"); | |
1006 | |
1007 mgCheckQuit(TRUE); | |
1008 | |
1009 // Read directory contents | |
60
ef9f17280372
Use modern PHP array definition in some places.
Matti Hamalainen <ccr@tnsp.org>
parents:
57
diff
changeset
|
1010 $entries = []; |
0 | 1011 if (($dirHandle = @opendir($path)) === FALSE) |
1012 return mgError("Could not read directory '".$path."'.\n"); | |
1013 | |
1014 while (($dirFile = @readdir($dirHandle)) !== FALSE) | |
1015 { | |
1016 $realFile = $path."/".$dirFile; | |
1017 if (is_dir($realFile)) | |
1018 { | |
185
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1019 if ($dirFile[0] != "." && $dirFile != $galTNPath && $dirFile != $galMedPath) |
63
1c32ece9acde
Some residual array() => [] conversions.
Matti Hamalainen <ccr@tnsp.org>
parents:
62
diff
changeset
|
1020 $entries[$dirFile] = ["type" => 1, "base" => $dirFile, "ext" => "", "mtime" => filemtime($realFile)]; |
0 | 1021 } |
1022 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
|
1023 if (preg_match("/^([^\/]+)(".mgGetSetting("format_exts").")$/i", $dirFile, $dirMatch)) |
63
1c32ece9acde
Some residual array() => [] conversions.
Matti Hamalainen <ccr@tnsp.org>
parents:
62
diff
changeset
|
1024 $entries[$dirFile] = ["type" => 0, "base" => $dirMatch[1], "ext" => $dirMatch[2], "mtime" => filemtime($realFile), "hide" => false]; |
0 | 1025 } |
1026 closedir($dirHandle); | |
1027 | |
1028 mgCheckQuit(); | |
1029 | |
256
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1030 $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
|
1031 $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
|
1032 $generatedFiles = []; |
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1033 $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
|
1034 $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
|
1035 |
0 | 1036 // Cleanup mode |
1037 if ($mode == GCMD_CLEAN) | |
1038 { | |
293
486398fb60ea
Allow album-specific {tn,med}_{width,height,format} settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
292
diff
changeset
|
1039 $gallery = mgGetAlbumData($basepath, $path); |
0 | 1040 |
1041 if ($writeMode) | |
1042 { | |
1043 if ($galCleanFlags & GCLEAN_CACHES) | |
183 | 1044 mgDelete($cacheFilename, TRUE); |
0 | 1045 |
251
19dab8b0c340
Remove clean command suboptions 'thumbnails' and 'mediums' and replace them with 'images'.
Matti Hamalainen <ccr@tnsp.org>
parents:
250
diff
changeset
|
1046 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
|
1047 { |
183 | 1048 mgDelete($path."/".$galTNPath, FALSE); |
185
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1049 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
|
1050 } |
256
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1051 |
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1052 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
|
1053 { |
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1054 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
|
1055 { |
293
486398fb60ea
Allow album-specific {tn,med}_{width,height,format} settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
292
diff
changeset
|
1056 $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
|
1057 $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
|
1058 $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
|
1059 $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
|
1060 } |
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1061 |
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1062 // 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
|
1063 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
|
1064 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
|
1065 } |
0 | 1066 } |
1067 } | |
1068 else | |
1069 // Update modes | |
1070 if ($mode == GCMD_UPDATE || $mode == GCMD_RESCAN) | |
1071 { | |
1072 // 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
|
1073 $galEntries = []; |
0 | 1074 $cacheTime = -1; |
1075 if ($mode == GCMD_UPDATE && file_exists($cacheFilename)) | |
1076 { | |
1077 $cacheTime = filemtime($cacheFilename); | |
1078 @include $cacheFilename; | |
1079 } | |
1080 | |
1081 // Read caption data | |
1082 $captions = mgReadCaptionsFile($basepath, $path); | |
292
418f932763f2
Backed out changeset 13a23b120e72
Matti Hamalainen <ccr@tnsp.org>
parents:
291
diff
changeset
|
1083 $gallery = mgGetAlbumData($basepath, $path); |
0 | 1084 if ($parentData !== NULL && $parentEntry !== NULL) |
1085 { | |
292
418f932763f2
Backed out changeset 13a23b120e72
Matti Hamalainen <ccr@tnsp.org>
parents:
291
diff
changeset
|
1086 $gallery["parent"] = &$parentData; |
418f932763f2
Backed out changeset 13a23b120e72
Matti Hamalainen <ccr@tnsp.org>
parents:
291
diff
changeset
|
1087 mgCopyEntryData($gallery, $parentEntry, MG_STR, "caption", "caption"); |
0 | 1088 } |
1089 | |
1090 // Start actual processing | |
1091 $nentries = count($entries); | |
1092 $nentry = 0; | |
1093 echo $path." .. "; | |
1094 foreach ($entries as $ename => &$edata) | |
1095 { | |
1096 printf("\r%s (%1.1f%%) ..", $path, ($nentry * 100.0) / $nentries); | |
1097 | |
1098 $nentry++; | |
1099 $efilename = $path."/".$ename; | |
293
486398fb60ea
Allow album-specific {tn,med}_{width,height,format} settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
292
diff
changeset
|
1100 $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
|
1101 $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
|
1102 $capFilename = $path."/".$edata["base"].".txt"; |
0 | 1103 |
1104 if (array_key_exists($ename, $galEntries)) | |
1105 $galEntry = &$galEntries[$ename]; | |
1106 else | |
63
1c32ece9acde
Some residual array() => [] conversions.
Matti Hamalainen <ccr@tnsp.org>
parents:
62
diff
changeset
|
1107 $galEntry = []; |
0 | 1108 |
57
29bb365e3ee2
Be more responsive when processing images, check for signals after each
Matti Hamalainen <ccr@tnsp.org>
parents:
56
diff
changeset
|
1109 mgCheckQuit(TRUE); |
0 | 1110 |
1111 // Update with captions file data, if any | |
1112 if (array_key_exists($ename, $captions)) | |
1113 { | |
1114 foreach ($captions[$ename] as $ckey => $cval) | |
1115 $edata[$ckey] = $cval; | |
1116 } | |
1117 | |
1118 // Handle entry based on type | |
1119 if ($edata["type"] == 0) | |
1120 { | |
1121 $updFlags = 0; | |
255
d0bcc6c7fc66
Automatically clean any unnecessary "trash" from thumbnail and medium image directories.
Matti Hamalainen <ccr@tnsp.org>
parents:
253
diff
changeset
|
1122 |
0 | 1123 // Check what we need to update .. |
1124 if (!file_exists($medFilename) || filemtime($medFilename) < $edata["mtime"]) | |
1125 $updFlags |= GUPD_MED_IMAGE; | |
1126 | |
1127 if (!file_exists($tnFilename) || filemtime($tnFilename) < $edata["mtime"]) | |
1128 $updFlags |= GUPD_TN_IMAGE; | |
1129 | |
1130 if (mgNeedUpdate($galEntry, "mtime", $edata["mtime"])) | |
1131 $updFlags |= GUPD_EXIF_INFO; | |
1132 | |
1133 if (file_exists($capFilename) && | |
1134 mgNeedUpdate($galEntry, "mtime", filemtime($capFilename))) | |
1135 $updFlags |= GUPD_CAPTION; | |
1136 | |
311
8fd5c850f921
Minor cleanup to XMP/EXIF fetching.
Matti Hamalainen <ccr@tnsp.org>
parents:
310
diff
changeset
|
1137 // 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
|
1138 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
|
1139 ($res = mgReadEXIFAndXMPData($efilename, $exif, $xmp)) === TRUE) |
0 | 1140 { |
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
1141 if ($xmp !== FALSE) |
311
8fd5c850f921
Minor cleanup to XMP/EXIF fetching.
Matti Hamalainen <ccr@tnsp.org>
parents:
310
diff
changeset
|
1142 { |
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
1143 echo "@"; |
311
8fd5c850f921
Minor cleanup to XMP/EXIF fetching.
Matti Hamalainen <ccr@tnsp.org>
parents:
310
diff
changeset
|
1144 foreach ($galExifConversions as $conv) |
8fd5c850f921
Minor cleanup to XMP/EXIF fetching.
Matti Hamalainen <ccr@tnsp.org>
parents:
310
diff
changeset
|
1145 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
|
1146 } |
8fd5c850f921
Minor cleanup to XMP/EXIF fetching.
Matti Hamalainen <ccr@tnsp.org>
parents:
310
diff
changeset
|
1147 |
314
020d155a179d
Refactor EXIF handling and integrate it with XMP handling. With a disgusting
Matti Hamalainen <ccr@tnsp.org>
parents:
313
diff
changeset
|
1148 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
|
1149 { |
da150fe627b6
Collect dimension/size (width/height) information of thumbnail and medium images into the cache.
Matti Hamalainen <ccr@tnsp.org>
parents:
303
diff
changeset
|
1150 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
|
1151 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
|
1152 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
|
1153 } |
0 | 1154 } |
1155 else | |
1156 { | |
1157 // Copy old data that is not yet in new | |
1158 echo "*"; | |
1159 foreach ($galEntry as $okey => $odata) | |
1160 { | |
1161 if (!array_key_exists($okey, $edata)) | |
1162 $edata[$okey] = $odata; | |
1163 } | |
1164 } | |
1165 | |
1166 // Generate thumbnails, etc. | |
1167 if ($updFlags & GUPD_IMAGES) | |
1168 { | |
1169 mgMakeDir($tnPath, 0755); | |
185
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1170 mgMakeDir($medPath, 0755); |
0 | 1171 |
1172 if ($updFlags & GUPD_MED_IMAGE) | |
1173 { | |
1174 echo "1"; | |
1175 mgConvertImage($efilename, $medFilename, | |
293
486398fb60ea
Allow album-specific {tn,med}_{width,height,format} settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
292
diff
changeset
|
1176 [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
|
1177 mgGetAlbumSetting($gallery, "med_format"), mgGetAlbumSetting($gallery, "med_quality"), TRUE); |
0 | 1178 } |
1179 | |
1180 if ($updFlags & GUPD_TN_IMAGE) | |
1181 { | |
1182 echo "2"; | |
1183 mgConvertImage($efilename, $tnFilename, | |
293
486398fb60ea
Allow album-specific {tn,med}_{width,height,format} settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
292
diff
changeset
|
1184 [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
|
1185 mgGetAlbumSetting($gallery, "tn_format"), mgGetAlbumSetting($gallery, "tn_quality"), TRUE); |
0 | 1186 } |
1187 } | |
1188 | |
1189 // Check for .txt caption file | |
1190 if ($updFlags & GUPD_CAPTION) | |
1191 { | |
1192 echo "?"; | |
1193 if (($tmpData = @file_get_contents($capFilename)) !== FALSE) | |
1194 $edata["caption"] = $tmpData; | |
1195 } | |
310
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1196 |
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1197 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
|
1198 { |
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1199 // 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
|
1200 $edata["med"] = []; |
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1201 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
|
1202 { |
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1203 $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
|
1204 $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
|
1205 echo "+"; |
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1206 } |
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1207 else |
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1208 echo "-"; |
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1209 |
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1210 $edata["tn"] = []; |
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1211 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
|
1212 { |
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1213 $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
|
1214 $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
|
1215 echo "+"; |
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1216 } |
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1217 else |
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1218 echo "-"; |
b1fc8a908eac
Get med/tn image sizes after they have been generated.
Matti Hamalainen <ccr@tnsp.org>
parents:
308
diff
changeset
|
1219 } |
0 | 1220 } |
1221 else | |
1222 if ($edata["type"] == 1) | |
1223 { | |
10 | 1224 // Set some of the album data here |
0 | 1225 $tmp = mgGetAlbumData($basepath, $efilename); |
1226 mgCopyEntryData($edata, $tmp, MG_STR, "caption", "caption"); | |
1227 mgCopyEntryData($edata, $tmp, MG_STR, "caption", "fallback_caption"); | |
1228 mgCopyEntryData($edata, $tmp, MG_STR, "caption", "title"); | |
1229 mgCopyEntryData($edata, $tmp, MG_BOOL, "hide", "hide", FALSE); | |
11
0b097770061d
Improve content hiding functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1230 mgCopyEntryData($edata, $tmp, MG_BOOL, "hide_contents", "hide_contents", FALSE); |
0 | 1231 } |
1232 } | |
1233 | |
1234 echo "\r".$path." ..... DONE\n"; | |
1235 | |
1236 mgCheckQuit(TRUE); | |
1237 } | |
1238 else | |
1239 mgFatal("Invalid work mode '".$mode."'.\n"); | |
1240 | |
1241 mgCheckQuit(TRUE); | |
1242 | |
1243 // 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
|
1244 foreach ($entries as $ename => &$edata) |
0 | 1245 if ($edata["type"] == 1) |
1246 { | |
1247 $epath = $path."/".$ename."/"; | |
1248 $newWriteMode = ($writeMode === FALSE && $epath == $startAt) || $writeMode; | |
1249 | |
292
418f932763f2
Backed out changeset 13a23b120e72
Matti Hamalainen <ccr@tnsp.org>
parents:
291
diff
changeset
|
1250 if (!mgHandleDirectory($mode, $basepath, $epath, $gallery, $edata, $newWriteMode, $startAt)) |
0 | 1251 return FALSE; |
1252 } | |
1253 | |
16
3491ab93630e
Add sub-gallery thumbnails to gallery cache data.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
1254 // Finish update modes |
3491ab93630e
Add sub-gallery thumbnails to gallery cache data.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
1255 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
|
1256 { |
3491ab93630e
Add sub-gallery thumbnails to gallery cache data.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
1257 // Store gallery cache for this directory |
292
418f932763f2
Backed out changeset 13a23b120e72
Matti Hamalainen <ccr@tnsp.org>
parents:
291
diff
changeset
|
1258 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
|
1259 return FALSE; |
3491ab93630e
Add sub-gallery thumbnails to gallery cache data.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
1260 } |
3491ab93630e
Add sub-gallery thumbnails to gallery cache data.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
1261 |
0 | 1262 mgCheckQuit(TRUE); |
1263 | |
1264 return TRUE; | |
1265 } | |
1266 | |
1267 | |
1268 function mgSigHandler($signo) | |
1269 { | |
1270 global $flagQuit; | |
1271 switch ($signo) | |
1272 { | |
1273 case SIGTERM: | |
1274 mgFatal("Received SIGTERM.\n"); | |
1275 break; | |
1276 | |
1277 case SIGQUIT: | |
1278 case SIGINT: | |
1279 $flagQuit = TRUE; | |
1280 break; | |
1281 | |
1282 } | |
1283 } | |
1284 | |
1285 | |
185
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1286 function mgCheckMPath($path, $id) |
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1287 { |
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1288 if ($path."/" != mgGetSetting($id)) |
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1289 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
|
1290 |
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1291 if (strpos($path, "/") !== FALSE || $path == "") |
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1292 mgFatal("Invalid ".$id." '".$path."'.\n"); |
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1293 } |
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1294 |
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1295 |
0 | 1296 function mgProcessGalleries($cmd, $path) |
1297 { | |
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1298 global $galTNPath, $galMedPath, $galSQLTables, $flagSQL; |
0 | 1299 |
1300 // Check validity of some settings | |
1301 $galPath = mgGetSetting("base_path"); | |
1302 $galTNPath = mgCleanPath(TRUE, mgGetSetting("tn_path")); | |
185
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1303 $galMedPath = mgCleanPath(TRUE, mgGetSetting("med_path")); |
0 | 1304 |
185
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1305 mgCheckMPath($galTNPath, "tn_path"); |
cb7019690a73
Separate medium image and thumbnail directories / handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1306 mgCheckMPath($galMedPath, "med_path"); |
0 | 1307 |
1308 $parentData = $parentEntry = NULL; | |
1309 $writeMode = TRUE; | |
1310 $startAt = NULL; | |
1311 | |
1312 // Check for path argument | |
1313 if ($path !== FALSE) | |
1314 { | |
1315 // Check the given path, needs to be "under" the gallery path | |
1316 $cmp = mgCleanPath(TRUE, mgRealPath($galPath))."/"; | |
1317 $tmp = mgCleanPath(TRUE, mgRealPath($path))."/"; | |
1318 if (substr($tmp, 0, strlen($cmp)) != $cmp) | |
1319 mgFatal("Path '".$path."' ('".$tmp."') does not reside under '".$galPath."' ('".$cmp."')!\n"); | |
1320 | |
1321 // Check if we need to bootstrap | |
1322 if ($cmp != $tmp) | |
1323 { | |
1324 $bpath = mgCleanPath(TRUE, mgRealPath($tmp."../")); | |
1325 | |
1326 if ($cmd != GCMD_CLEAN) | |
1327 { | |
1328 $cacheFile = mgGetPath($bpath, "cache_file"); | |
1329 if (!file_exists($cacheFile)) | |
1330 mgFatal("Can't start working from '".$path."', parent '".$cacheFile."' does not exist!\n"); | |
1331 | |
1332 @include($cacheFile); | |
1333 if (!isset($galEntries) || !isset($galData)) | |
1334 mgFatal("Cache file '".$cacheFile."' is broken or stale.\n"); | |
1335 } | |
1336 | |
1337 $writeMode = FALSE; | |
1338 $startAt = $tmp; | |
1339 $path = $bpath; | |
1340 | |
1341 echo "Starting: '".$startAt."' inside '".$path."'.\n"; | |
1342 } | |
1343 else | |
1344 $path = $tmp; | |
1345 } | |
1346 else | |
1347 $path = $galPath; | |
1348 | |
1349 // Start working | |
1350 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
|
1351 |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1352 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
|
1353 { |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1354 foreach ($galSQLTables as $tname => $tdata) |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1355 { |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1356 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
|
1357 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
|
1358 } |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1359 } |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1360 |
0 | 1361 mgHandleDirectory($cmd, $galPath, $path, $parentData, $parentEntry, $writeMode, $startAt); |
1362 } | |
1363 | |
1364 | |
322
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1365 function mgGetDValStr($key, $mdata, $val, $format, $multi) |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1366 { |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1367 $vfmt = "%s"; |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1368 |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1369 switch ($mdata[0]) |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1370 { |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1371 case MG_STR_ARRAY: |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1372 if ($val === FALSE) |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1373 $val = []; |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1374 else |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1375 if (is_array($val) || is_string($val)) |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1376 { |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1377 $vfmt = "\"%s\""; |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1378 if (is_string($val)) |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1379 $val = [ $val ]; |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1380 } |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1381 else |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1382 $val = "ERROR1"; |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1383 break; |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1384 |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1385 case MG_STR: |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1386 case MG_STR_LC: |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1387 if (is_string($val)) |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1388 { |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1389 $vfmt = "\"%s\""; |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1390 if ($mdata[0] == MG_STR_LC) |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1391 $val = strtolower($val); |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1392 } |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1393 else |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1394 $val = "ERROR2"; |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1395 break; |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1396 |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1397 case MG_BOOL: |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1398 $val = $val ? "yes" : "no"; |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1399 break; |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1400 |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1401 case MG_FLAGS: |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1402 { |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1403 $mstr = []; |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1404 foreach ($mdata[2] as $vkey => $vval) |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1405 { |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1406 if ($val & $vval) |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1407 $mstr[] = $vkey; |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1408 } |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1409 |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1410 $val = "\"".implode(" | ", $mstr)."\""; |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1411 } |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1412 break; |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1413 |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1414 case MG_INT: |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1415 $val = (string) $val; |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1416 break; |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1417 |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1418 default: |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1419 $val = "ERROR"; |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1420 } |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1421 |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1422 if (!is_array($val)) |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1423 { |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1424 if ($val === NULL || $val === FALSE) |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1425 $val = []; |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1426 else |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1427 $val = [ $val ]; |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1428 } |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1429 |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1430 $res = (count($val) == 0) ? "# " : ""; |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1431 |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1432 if ($multi) |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1433 { |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1434 if (count($val) > 0) |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1435 { |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1436 foreach ($val as $vv) |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1437 $res .= sprintf($format, $key, sprintf($vfmt, $vv)); |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1438 } |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1439 else |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1440 $res .= sprintf($format, $key, ""); |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1441 } |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1442 else |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1443 { |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1444 $res .= sprintf($format, $key, |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1445 implode(", ", array_map(function($vv) use ($vfmt) { return sprintf($vfmt, $vv); }, $val))); |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1446 } |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1447 |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1448 return $res; |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1449 } |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1450 |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1451 |
0 | 1452 function mgShowCopyright() |
1453 { | |
1454 global $mgProgVersion, $mgProgCopyright, | |
1455 $mgProgInfo, $mgProgEmail; | |
1456 | |
1457 echo | |
184 | 1458 "MGTool ".$mgProgVersion." - MGallery management tool\n". |
1459 $mgProgInfo." ".$mgProgEmail."\n". | |
1460 "(C) Copyright ".$mgProgCopyright."\n"; | |
0 | 1461 } |
1462 | |
1463 | |
1464 function mgShowHelp() | |
1465 { | |
1466 global $argv; | |
1467 echo | |
1468 "Usage: ".basename($argv[0])." <command> [arguments]\n". | |
1469 "\n". | |
1470 " --help - Show this help.\n". | |
1471 " --version - Show version information.\n". | |
1472 "\n". | |
1473 " update [path]\n". | |
1474 " Update directories under <path> or all gallery dirs.\n". | |
1475 " Conditionally scans dirs for new or changed images and\n". | |
1476 " updates cache files as needed.\n". | |
1477 "\n". | |
1478 " rescan [path]\n". | |
1479 " Like 'update', but forces all cache files to be regenerated\n". | |
1480 " and EXIF/caption/etc information to be re-scanned even\n". | |
1481 " if the file timestamps do not justify re-scanning.\n". | |
1482 "\n". | |
256
6ad17bc3d1a6
Add 'trash' option to 'clean' command to clean up any unmanaged files
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
1483 " 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
|
1484 " 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
|
1485 " 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
|
1486 " 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
|
1487 " trash - Delete any 'unmanaged' files inside thumbnail/medium dirs\n". |
0 | 1488 "\n". |
281 | 1489 " 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
|
1490 " 'trash' options. Unless you know what you are doing, that is.\n". |
281 | 1491 "\n". |
159
b010c763a1fc
Document mgtool 'dump' command.
Matti Hamalainen <ccr@tnsp.org>
parents:
130
diff
changeset
|
1492 " config|dump\n". |
b010c763a1fc
Document mgtool 'dump' command.
Matti Hamalainen <ccr@tnsp.org>
parents:
130
diff
changeset
|
1493 " Display configuration values (with extra information) or\n". |
b010c763a1fc
Document mgtool 'dump' command.
Matti Hamalainen <ccr@tnsp.org>
parents:
130
diff
changeset
|
1494 " \"dump\" current configuration as is.\n". |
0 | 1495 "\n"; |
1496 } | |
1497 | |
1498 | |
1499 // | |
1500 // Main code starts | |
1501 // | |
1502 if (php_sapi_name() != "cli" || !empty($_SERVER["REMOTE_ADDR"])) | |
1503 { | |
1504 header("Status: 404 Not Found"); | |
1505 die(); | |
1506 } | |
1507 | |
1508 pcntl_signal(SIGTERM, "mgSigHandler"); | |
1509 pcntl_signal(SIGHUP, "mgSigHandler"); | |
1510 pcntl_signal(SIGQUIT, "mgSigHandler"); | |
1511 pcntl_signal(SIGINT, "mgSigHandler"); | |
1512 | |
265 | 1513 // Check for improperly configured PHP |
264
745af791367d
Move Imagick/Gmagick module check to script startup.
Matti Hamalainen <ccr@tnsp.org>
parents:
262
diff
changeset
|
1514 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
|
1515 { |
745af791367d
Move Imagick/Gmagick module check to script startup.
Matti Hamalainen <ccr@tnsp.org>
parents:
262
diff
changeset
|
1516 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
|
1517 exit(1); |
745af791367d
Move Imagick/Gmagick module check to script startup.
Matti Hamalainen <ccr@tnsp.org>
parents:
262
diff
changeset
|
1518 } |
745af791367d
Move Imagick/Gmagick module check to script startup.
Matti Hamalainen <ccr@tnsp.org>
parents:
262
diff
changeset
|
1519 else |
745af791367d
Move Imagick/Gmagick module check to script startup.
Matti Hamalainen <ccr@tnsp.org>
parents:
262
diff
changeset
|
1520 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
|
1521 { |
745af791367d
Move Imagick/Gmagick module check to script startup.
Matti Hamalainen <ccr@tnsp.org>
parents:
262
diff
changeset
|
1522 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
|
1523 exit(1); |
745af791367d
Move Imagick/Gmagick module check to script startup.
Matti Hamalainen <ccr@tnsp.org>
parents:
262
diff
changeset
|
1524 } |
745af791367d
Move Imagick/Gmagick module check to script startup.
Matti Hamalainen <ccr@tnsp.org>
parents:
262
diff
changeset
|
1525 |
265 | 1526 // Check settings |
297
77f85b1f35f2
Improve configuration file handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
293
diff
changeset
|
1527 if (mgReadSettings($searchPaths) === FALSE) |
77f85b1f35f2
Improve configuration file handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
293
diff
changeset
|
1528 { |
77f85b1f35f2
Improve configuration file handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
293
diff
changeset
|
1529 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
|
1530 "Attempted search paths:\n".implode("\n", $searchPaths)."\n"); |
77f85b1f35f2
Improve configuration file handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
293
diff
changeset
|
1531 } |
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
|
1532 |
265 | 1533 // 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
|
1534 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
|
1535 date_default_timezone_set($pageTimeZone); |
0 | 1536 |
290
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1537 // Check backend |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1538 if (($galBackend = mgGetSetting("backend")) === null) |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1539 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
|
1540 |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1541 switch ($galBackend = strtolower($galBackend)) |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1542 { |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1543 case "sql": |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1544 // Connect to database |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1545 if (mgConnectSQLDB() === FALSE) |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1546 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
|
1547 |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1548 // 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
|
1549 $tmpSQL = []; |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1550 foreach ($galExifConversions as $econv) |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1551 if ($econv[GEC_IS_UNIQUE]) |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1552 { |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1553 switch ($econv[GEC_TYPE]) |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1554 { |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1555 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
|
1556 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
|
1557 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
|
1558 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
|
1559 } |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1560 |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1561 $tmpSQL[$econv[GEC_NAME]] = $etype; |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1562 } |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1563 |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1564 // 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
|
1565 foreach ($tmpSQL as $ekey => $etype) |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1566 $galSQLTables["images"][] = [$ekey, $etype]; |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1567 |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1568 // Check tables |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1569 foreach ($galSQLTables as $name => $schemaData) |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1570 { |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1571 $schema = mgDBGetTableSchema($db, $schemaData); |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1572 if (!mgDBCreateOneTable($db, $name, $schema)) |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1573 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
|
1574 } |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1575 break; |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1576 |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1577 case "php": |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1578 break; |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1579 |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1580 default: |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1581 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
|
1582 } |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1583 |
265 | 1584 |
1585 // Check for commandline arguments | |
0 | 1586 $cmd = mgCArgLC(1); |
1587 switch ($cmd) | |
1588 { | |
340
67e5bf30ee9b
Add undocumented 'metatest' command to mgtool, for testing metadata
Matti Hamalainen <ccr@tnsp.org>
parents:
339
diff
changeset
|
1589 case "metatest": |
67e5bf30ee9b
Add undocumented 'metatest' command to mgtool, for testing metadata
Matti Hamalainen <ccr@tnsp.org>
parents:
339
diff
changeset
|
1590 // Test metadata extraction from given image file |
67e5bf30ee9b
Add undocumented 'metatest' command to mgtool, for testing metadata
Matti Hamalainen <ccr@tnsp.org>
parents:
339
diff
changeset
|
1591 $efilename = mgCArg(2); |
67e5bf30ee9b
Add undocumented 'metatest' command to mgtool, for testing metadata
Matti Hamalainen <ccr@tnsp.org>
parents:
339
diff
changeset
|
1592 if ($efilename === FALSE) |
67e5bf30ee9b
Add undocumented 'metatest' command to mgtool, for testing metadata
Matti Hamalainen <ccr@tnsp.org>
parents:
339
diff
changeset
|
1593 { |
67e5bf30ee9b
Add undocumented 'metatest' command to mgtool, for testing metadata
Matti Hamalainen <ccr@tnsp.org>
parents:
339
diff
changeset
|
1594 mgFatal("No filename given.\n"); |
67e5bf30ee9b
Add undocumented 'metatest' command to mgtool, for testing metadata
Matti Hamalainen <ccr@tnsp.org>
parents:
339
diff
changeset
|
1595 } |
67e5bf30ee9b
Add undocumented 'metatest' command to mgtool, for testing metadata
Matti Hamalainen <ccr@tnsp.org>
parents:
339
diff
changeset
|
1596 |
67e5bf30ee9b
Add undocumented 'metatest' command to mgtool, for testing metadata
Matti Hamalainen <ccr@tnsp.org>
parents:
339
diff
changeset
|
1597 if (($res = mgReadEXIFAndXMPData($efilename, $exif, $xmp)) === TRUE) |
67e5bf30ee9b
Add undocumented 'metatest' command to mgtool, for testing metadata
Matti Hamalainen <ccr@tnsp.org>
parents:
339
diff
changeset
|
1598 { |
67e5bf30ee9b
Add undocumented 'metatest' command to mgtool, for testing metadata
Matti Hamalainen <ccr@tnsp.org>
parents:
339
diff
changeset
|
1599 if ($exif !== FALSE) |
67e5bf30ee9b
Add undocumented 'metatest' command to mgtool, for testing metadata
Matti Hamalainen <ccr@tnsp.org>
parents:
339
diff
changeset
|
1600 print_r($exif); |
67e5bf30ee9b
Add undocumented 'metatest' command to mgtool, for testing metadata
Matti Hamalainen <ccr@tnsp.org>
parents:
339
diff
changeset
|
1601 else |
67e5bf30ee9b
Add undocumented 'metatest' command to mgtool, for testing metadata
Matti Hamalainen <ccr@tnsp.org>
parents:
339
diff
changeset
|
1602 echo "No EXIF data found.\n"; |
67e5bf30ee9b
Add undocumented 'metatest' command to mgtool, for testing metadata
Matti Hamalainen <ccr@tnsp.org>
parents:
339
diff
changeset
|
1603 |
67e5bf30ee9b
Add undocumented 'metatest' command to mgtool, for testing metadata
Matti Hamalainen <ccr@tnsp.org>
parents:
339
diff
changeset
|
1604 if ($xmp !== FALSE) |
67e5bf30ee9b
Add undocumented 'metatest' command to mgtool, for testing metadata
Matti Hamalainen <ccr@tnsp.org>
parents:
339
diff
changeset
|
1605 print_r($xmp); |
67e5bf30ee9b
Add undocumented 'metatest' command to mgtool, for testing metadata
Matti Hamalainen <ccr@tnsp.org>
parents:
339
diff
changeset
|
1606 else |
67e5bf30ee9b
Add undocumented 'metatest' command to mgtool, for testing metadata
Matti Hamalainen <ccr@tnsp.org>
parents:
339
diff
changeset
|
1607 echo "No XMP data found.\n"; |
67e5bf30ee9b
Add undocumented 'metatest' command to mgtool, for testing metadata
Matti Hamalainen <ccr@tnsp.org>
parents:
339
diff
changeset
|
1608 } |
67e5bf30ee9b
Add undocumented 'metatest' command to mgtool, for testing metadata
Matti Hamalainen <ccr@tnsp.org>
parents:
339
diff
changeset
|
1609 else |
67e5bf30ee9b
Add undocumented 'metatest' command to mgtool, for testing metadata
Matti Hamalainen <ccr@tnsp.org>
parents:
339
diff
changeset
|
1610 mgFatal($res."\n"); |
67e5bf30ee9b
Add undocumented 'metatest' command to mgtool, for testing metadata
Matti Hamalainen <ccr@tnsp.org>
parents:
339
diff
changeset
|
1611 break; |
67e5bf30ee9b
Add undocumented 'metatest' command to mgtool, for testing metadata
Matti Hamalainen <ccr@tnsp.org>
parents:
339
diff
changeset
|
1612 |
0 | 1613 case "--version": |
1614 case "version": | |
1615 case "ver": | |
1616 mgShowCopyright(); | |
1617 break; | |
1618 | |
1619 case FALSE: | |
1620 // No arguments | |
1621 mgError("Nothing to do. Showing help:\n"); | |
1622 | |
1623 case "--help": | |
1624 case "help": | |
1625 if ($cmd !== FALSE) | |
1626 mgShowCopyright(); | |
1627 mgShowHelp(); | |
1628 break; | |
1629 | |
1630 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
|
1631 $farg = mgCArg(2); |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1632 if ($farg == "--sql") |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1633 { |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1634 $farg = FALSE; |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1635 $flagSQL = TRUE; |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1636 } |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1637 else |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1638 $flagSQL = mgCArg(3) == "--sql"; |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1639 |
19fbf800b1f7
Work on very early form of virtual gallery support.
Matti Hamalainen <ccr@tnsp.org>
parents:
286
diff
changeset
|
1640 mgProcessGalleries(GCMD_UPDATE, $farg); |
0 | 1641 break; |
1642 | |
1643 case "rescan": case "re": case "res": | |
1644 mgProcessGalleries(GCMD_RESCAN, mgCArg(2)); | |
1645 break; | |
1646 | |
1647 case "clean": case "cl": case "cle": | |
1648 $cmode = mgCArgLC(2, 2); | |
1649 switch ($cmode) | |
1650 { | |
1651 case "al": $galCleanFlags = GCLEAN_ALL; break; | |
1652 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
|
1653 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
|
1654 case "tr": $galCleanFlags = GCLEAN_TRASH; break; |
0 | 1655 case FALSE: |
1656 mgFatal("Cleaning requires a mode argument.\n"); | |
1657 | |
1658 default: | |
1659 mgFatal("Invalid clean mode '".mgCArg(2)."'.\n"); | |
1660 } | |
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
|
1661 $countDoDelete = 0; |
0 | 1662 $flagDoDelete = FALSE; |
1663 mgProcessGalleries(GCMD_CLEAN, mgCArg(3)); | |
1664 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
|
1665 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
|
1666 { |
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
|
1667 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
|
1668 } |
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
|
1669 else |
0 | 1670 if (mgYesNoPrompt("Really delete the above files and directories?")) |
1671 { | |
25
c698618e6f67
Actually implement deletion.
Matti Hamalainen <ccr@tnsp.org>
parents:
16
diff
changeset
|
1672 echo "Deleting ...\n"; |
c698618e6f67
Actually implement deletion.
Matti Hamalainen <ccr@tnsp.org>
parents:
16
diff
changeset
|
1673 $flagDoDelete = TRUE; |
c698618e6f67
Actually implement deletion.
Matti Hamalainen <ccr@tnsp.org>
parents:
16
diff
changeset
|
1674 mgProcessGalleries(GCMD_CLEAN, mgCArg(3)); |
c698618e6f67
Actually implement deletion.
Matti Hamalainen <ccr@tnsp.org>
parents:
16
diff
changeset
|
1675 } |
c698618e6f67
Actually implement deletion.
Matti Hamalainen <ccr@tnsp.org>
parents:
16
diff
changeset
|
1676 else |
c698618e6f67
Actually implement deletion.
Matti Hamalainen <ccr@tnsp.org>
parents:
16
diff
changeset
|
1677 { |
c698618e6f67
Actually implement deletion.
Matti Hamalainen <ccr@tnsp.org>
parents:
16
diff
changeset
|
1678 echo "Okay, canceling operation.\n"; |
0 | 1679 } |
1680 break; | |
1681 | |
1682 case "config": | |
1683 case "dump": | |
322
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1684 foreach ($mgDefaults as $ckey => $cdata) |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1685 { |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1686 $sval = mgGetSetting($ckey); |
0 | 1687 |
26 | 1688 if ($cmd == "dump") |
1689 { | |
322
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1690 echo mgGetDValStr($ckey, $cdata, $sval, "%1\$-15s = %2\$s\n", FALSE); |
26 | 1691 } |
1692 else | |
1693 { | |
322
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1694 echo mgGetDValStr($ckey, $cdata, $sval, "%1\$-15s = %2\$s", TRUE). |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1695 (($cdata[1] !== NULL && $sval !== $cdata[1]) ? |
2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
Matti Hamalainen <ccr@tnsp.org>
parents:
320
diff
changeset
|
1696 " (default: ".mgGetDValStr($ckey, $cdata, $cdata[1], "%2\$s", FALSE).")" : "")."\n"; |
26 | 1697 } |
0 | 1698 } |
1699 break; | |
1700 | |
1701 default: | |
1702 mgError("Unknown option/command '".$cmd."'.\n"); | |
1703 break; | |
1704 } | |
1705 | |
1706 ?> |