Mercurial > hg > mgallery
comparison mgtool.php @ 292:418f932763f2
Backed out changeset 13a23b120e72
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Thu, 01 Aug 2019 15:11:12 +0300 |
parents | 13a23b120e72 |
children | 486398fb60ea |
comparison
equal
deleted
inserted
replaced
291:13a23b120e72 | 292:418f932763f2 |
---|---|
671 else | 671 else |
672 return 0; | 672 return 0; |
673 } | 673 } |
674 | 674 |
675 | 675 |
676 function mgWriteGalleryCache($cacheFilename, &$album, &$entries, &$parentEntry) | 676 function mgWriteGalleryCache($cacheFilename, &$gallery, &$entries, &$parentEntry) |
677 { | 677 { |
678 global $galBackend, $db, $galExifConversions, $flagSQL; | 678 global $galBackend, $db, $galExifConversions, $flagSQL; |
679 | 679 |
680 // Store gallery cache for this directory | 680 // Store gallery cache for this directory |
681 $images = []; | 681 $images = []; |
703 krsort($albums); | 703 krsort($albums); |
704 | 704 |
705 // Choose gallery album image | 705 // Choose gallery album image |
706 if (count($images) > 0) | 706 if (count($images) > 0) |
707 { | 707 { |
708 if (isset($album["albumpic"]) && | 708 if (isset($gallery["albumpic"]) && |
709 isset($images[$album["albumpic"]])) | 709 isset($images[$gallery["albumpic"]])) |
710 { | 710 { |
711 $parentEntry["image"] = $album["albumpic"]; | 711 $parentEntry["image"] = $gallery["albumpic"]; |
712 } | 712 } |
713 else | 713 else |
714 { | 714 { |
715 end($images); | 715 end($images); |
716 $parentEntry["image"] = key($images); | 716 $parentEntry["image"] = key($images); |
733 if (!$flagSQL) | 733 if (!$flagSQL) |
734 break; | 734 break; |
735 | 735 |
736 mgDBBeginTransaction(); | 736 mgDBBeginTransaction(); |
737 | 737 |
738 if (($path_id = mgFetchSQLColumn(mgPrepareSQL("SELECT id FROM paths WHERE path=%s", $album["path"]))) === FALSE && | 738 if (($path_id = mgFetchSQLColumn(mgPrepareSQL("SELECT id FROM paths WHERE path=%s", $gallery["path"]))) === FALSE && |
739 ($path_id = mgExecSQLInsert(mgPrepareSQL("INSERT INTO paths (path) VALUES (%s)", $album["path"]))) === FALSE) | 739 ($path_id = mgExecSQLInsert(mgPrepareSQL("INSERT INTO paths (path) VALUES (%s)", $gallery["path"]))) === FALSE) |
740 mgFatal("Failed.\n"); | 740 mgFatal("Failed.\n"); |
741 | 741 |
742 | 742 |
743 | 743 |
744 foreach ($output as $entry => &$edata) | 744 foreach ($output as $entry => &$edata) |
814 | 814 |
815 } | 815 } |
816 | 816 |
817 $str = | 817 $str = |
818 "<?php\n". | 818 "<?php\n". |
819 "\$galData = ".var_export($album, TRUE).";\n". | 819 "\$galData = ".var_export($gallery, TRUE).";\n". |
820 "\$galAlbumsIndex = ".var_export(array_keys($albums), TRUE).";\n". | 820 "\$galAlbumsIndex = ".var_export(array_keys($albums), TRUE).";\n". |
821 "\$galImagesIndex = ".var_export(array_keys($images), TRUE).";\n". | 821 "\$galImagesIndex = ".var_export(array_keys($images), TRUE).";\n". |
822 "\$galEntries = ".var_export($output, TRUE).";\n". | 822 "\$galEntries = ".var_export($output, TRUE).";\n". |
823 "?>"; | 823 "?>"; |
824 | 824 |
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 $album = []; | 872 $gallery = []; |
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); |
911 @include $cacheFilename; | 911 @include $cacheFilename; |
912 } | 912 } |
913 | 913 |
914 // Read caption data | 914 // Read caption data |
915 $captions = mgReadCaptionsFile($basepath, $path); | 915 $captions = mgReadCaptionsFile($basepath, $path); |
916 $album = mgGetAlbumData($basepath, $path); | 916 $gallery = mgGetAlbumData($basepath, $path); |
917 if ($parentData !== NULL && $parentEntry !== NULL) | 917 if ($parentData !== NULL && $parentEntry !== NULL) |
918 { | 918 { |
919 $album["parent"] = &$parentData; | 919 $gallery["parent"] = &$parentData; |
920 mgCopyEntryData($album, $parentEntry, MG_STR, "caption", "caption"); | 920 mgCopyEntryData($gallery, $parentEntry, MG_STR, "caption", "caption"); |
921 } | 921 } |
922 | 922 |
923 // Start actual processing | 923 // Start actual processing |
924 $nentries = count($entries); | 924 $nentries = count($entries); |
925 $nentry = 0; | 925 $nentry = 0; |
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.".".mgGetAlbumSetting($album, "med_format"); | 933 $medFilename = $medPath."/".$ename.".".mgGetSetting("med_format"); |
934 $tnFilename = $tnPath."/".$ename.".".mgGetAlbumSetting($album, "tn_format"); | 934 $tnFilename = $tnPath."/".$ename.".".mgGetSetting("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 |
1054 if ($edata["type"] == 1) | 1054 if ($edata["type"] == 1) |
1055 { | 1055 { |
1056 $epath = $path."/".$ename."/"; | 1056 $epath = $path."/".$ename."/"; |
1057 $newWriteMode = ($writeMode === FALSE && $epath == $startAt) || $writeMode; | 1057 $newWriteMode = ($writeMode === FALSE && $epath == $startAt) || $writeMode; |
1058 | 1058 |
1059 if (!mgHandleDirectory($mode, $basepath, $epath, $album, $edata, $newWriteMode, $startAt)) | 1059 if (!mgHandleDirectory($mode, $basepath, $epath, $gallery, $edata, $newWriteMode, $startAt)) |
1060 return FALSE; | 1060 return FALSE; |
1061 } | 1061 } |
1062 | 1062 |
1063 // Finish update modes | 1063 // Finish update modes |
1064 if ($mode == GCMD_UPDATE || $mode == GCMD_RESCAN) | 1064 if ($mode == GCMD_UPDATE || $mode == GCMD_RESCAN) |
1065 { | 1065 { |
1066 // Store gallery cache for this directory | 1066 // Store gallery cache for this directory |
1067 if ($writeMode && !mgWriteGalleryCache($cacheFilename, $album, $entries, $parentEntry)) | 1067 if ($writeMode && !mgWriteGalleryCache($cacheFilename, $gallery, $entries, $parentEntry)) |
1068 return FALSE; | 1068 return FALSE; |
1069 } | 1069 } |
1070 | 1070 |
1071 mgCheckQuit(TRUE); | 1071 mgCheckQuit(TRUE); |
1072 | 1072 |