Mercurial > hg > mgallery

comparison mgtool.php @ 293:486398fb60ea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow album-specific {tn,med}_{width,height,format} settings.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 01 Aug 2019 15:26:08 +0300
parents 418f932763f2
children 77f85b1f35f2
comparison
equal deleted inserted replaced
292:418f932763f2 293:486398fb60ea
867 $generatedFiles[$medPath] = 1; 867 $generatedFiles[$medPath] = 1;
868 868
869 // Cleanup mode 869 // Cleanup mode
870 if ($mode == GCMD_CLEAN) 870 if ($mode == GCMD_CLEAN)
871 { 871 {
872 $gallery = []; 872 $gallery = mgGetAlbumData($basepath, $path);
873 873
874 if ($writeMode) 874 if ($writeMode)
875 { 875 {
876 if ($galCleanFlags & GCLEAN_CACHES) 876 if ($galCleanFlags & GCLEAN_CACHES)
877 mgDelete($cacheFilename, TRUE); 877 mgDelete($cacheFilename, TRUE);
884 884
885 if ($galCleanFlags & GCLEAN_TRASH) 885 if ($galCleanFlags & GCLEAN_TRASH)
886 { 886 {
887 foreach ($entries as $ename => &$edata) 887 foreach ($entries as $ename => &$edata)
888 { 888 {
889 $medFilename = $medPath."/".$ename.".".mgGetSetting("med_format"); 889 $medFilename = $medPath."/".$ename.".".mgGetAlbumSetting($gallery, "med_format");
890 $tnFilename = $tnPath."/".$ename.".".mgGetSetting("tn_format"); 890 $tnFilename = $tnPath."/".$ename.".".mgGetAlbumSetting($gallery, "tn_format");
891 $generatedFiles[$medFilename] = 1; 891 $generatedFiles[$medFilename] = 1;
892 $generatedFiles[$tnFilename] = 1; 892 $generatedFiles[$tnFilename] = 1;
893 } 893 }
894 894
895 // Delete any "trash" files from medium/thumbnail dirs 895 // Delete any "trash" files from medium/thumbnail dirs
928 { 928 {
929 printf("\r%s (%1.1f%%) ..", $path, ($nentry * 100.0) / $nentries); 929 printf("\r%s (%1.1f%%) ..", $path, ($nentry * 100.0) / $nentries);
930 930
931 $nentry++; 931 $nentry++;
932 $efilename = $path."/".$ename; 932 $efilename = $path."/".$ename;
933 $medFilename = $medPath."/".$ename.".".mgGetSetting("med_format"); 933 $medFilename = $medPath."/".$ename.".".mgGetAlbumSetting($gallery, "med_format");
934 $tnFilename = $tnPath."/".$ename.".".mgGetSetting("tn_format"); 934 $tnFilename = $tnPath."/".$ename.".".mgGetAlbumSetting($gallery, "tn_format");
935 $capFilename = $path."/".$edata["base"].".txt"; 935 $capFilename = $path."/".$edata["base"].".txt";
936 936
937 if (array_key_exists($ename, $galEntries)) 937 if (array_key_exists($ename, $galEntries))
938 $galEntry = &$galEntries[$ename]; 938 $galEntry = &$galEntries[$ename];
939 else 939 else
1004 1004
1005 if ($updFlags & GUPD_MED_IMAGE) 1005 if ($updFlags & GUPD_MED_IMAGE)
1006 { 1006 {
1007 echo "1"; 1007 echo "1";
1008 mgConvertImage($efilename, $medFilename, 1008 mgConvertImage($efilename, $medFilename,
1009 [mgGetSetting("med_width"), mgGetSetting("med_height")], 1009 [mgGetAlbumSetting($gallery, "med_width"), mgGetAlbumSetting($gallery, "med_height")],
1010 mgGetSetting("med_format"), mgGetSetting("med_quality"), TRUE); 1010 mgGetAlbumSetting($gallery, "med_format"), mgGetAlbumSetting($gallery, "med_quality"), TRUE);
1011 } 1011 }
1012 1012
1013 if ($updFlags & GUPD_TN_IMAGE) 1013 if ($updFlags & GUPD_TN_IMAGE)
1014 { 1014 {
1015 echo "2"; 1015 echo "2";
1016 mgConvertImage($efilename, $tnFilename, 1016 mgConvertImage($efilename, $tnFilename,
1017 [mgGetSetting("tn_width"), mgGetSetting("tn_height")], 1017 [mgGetAlbumSetting($gallery, "tn_width"), mgGetAlbumSetting($gallery, "tn_height")],
1018 mgGetSetting("tn_format"), mgGetSetting("tn_quality"), TRUE); 1018 mgGetAlbumSetting($gallery, "tn_format"), mgGetAlbumSetting($gallery, "tn_quality"), TRUE);
1019 } 1019 }
1020 } 1020 }
1021 1021
1022 // Check for .txt caption file 1022 // Check for .txt caption file
1023 if ($updFlags & GUPD_CAPTION) 1023 if ($updFlags & GUPD_CAPTION)