summaryrefslogtreecommitdiff
path: root/IkiWiki/Render.pm
AgeCommit message (Collapse)Author
2010-04-21Merge branch 'master' into autotagJoey Hess
Conflicts: IkiWiki/Plugin/tag.pm
2010-04-21fix false positive in link_types_changedJoey Hess
loadindex does not bother populating oldtypedlinks if there is no link type. However, the code in link_types_changed assumed that if oldtypedlinks is not defined, and typedlinks is, they must differ.
2010-04-21remember autofiles that were tried and failed to be addedJoey Hess
This way, if an autofile is registered for a file that already exists, it is remembered that it was tried, and it doesn't get recreated when removed.
2010-04-21remember autofiles alwaysJoey Hess
This fixes the problem that it did not remember if an autofile is deleted, unless a plugin happened to register the autofile at the same time. With the new code, we just never recreate an autofile more than once. Only downside is that the list of autofiles is never pruned either. And I don't really see a way to prune it.
2010-04-21bugfixesJoey Hess
2010-04-21remove verify_src_fileJoey Hess
Splitting out this function bothered me. It is conceptially similar to file_pruned, and yet also very specific to exactly the security needs of find_src_files. I liked that it got rid of duplicate code in the latter function. So instead, put a helper sub in that, which I think allows refactoring things more cleanly, and with less boilerplate. As to the needs of gen_autofile, I'm not convinced this needs to handle the same set of problems that verify_src_file did. So I sat down and wrote a custom validator for autofiles, which turned out to seem to just need three things: Make sure the candidate filename is not something that would be pruned; untaint the candidate filename; and make sure that srcdir doesn't already have something with its name. (Plus, of course, all the other checks that were already in gen_autofile.) (In passing, also fixed a bunch of bugs I had introduced in this branch.)
2010-04-20Merge branch 'master' into autotagJoey Hess
2010-04-20fix minor bug if a page's name is "0"Joey Hess
2010-04-19change wordingJoey Hess
This is more accurate when a file that is not a page is what is removed.
2010-04-19move message into if blockJoey Hess
2010-04-17move File::Find control back into its code blocksJoey Hess
Ok, this is longer, but features less scary action at a distance.
2010-04-17move decode_utf8 closer to reason for itJoey Hess
Filenames need to be decoded, as File::Find does not provide them in decoded form, but other callers of verify_src_file will be using utf8.
2010-04-17refactor autofilesJoey Hess
Made add_autofile take a generator function, and just register the autofile, for later possible creation. The testing is moved into Render, which allows cleaning up some stuff.
2010-04-17whitespaceJoey Hess
2010-04-17Merge remote branch 'davrieb/autotag' into autotagJoey Hess
Conflicts: IkiWiki.pm IkiWiki/Plugin/tag.pm
2010-04-16automatically run --gettime, and optimise it for gitJoey Hess
* Automatically run --gettime the first time ikiwiki is run on a given srcdir. * Optimise --gettime for git, so it's appropriatly screamingly fast. (This could be done for other backends too.) * However, --gettime for git no longer follows renames. * Use above to fix up timestamps on docwiki, as well as ensure that timestamps on basewiki files shipped in the deb are sane.
2010-04-16--gettime revampJoey Hess
* Rename --getctime to --gettime. (The old name still works for backwards compatability.) * --gettime now also looks up last modification time. * Add rcs_getmtime to plugin API; currently only implemented for git.
2010-04-04Fix some typos that would break Render during changed-link calculationSimon McVittie
2010-04-04implement typed links; add tagged_is_strict config optionSimon McVittie
2010-04-03Make sure deleted tag pages don't get recreated.David Riebenbauer
The reason to do this is basically a user interaction design decision. It is achieved by adding an entry, associated to the creating plugin, to %pagestate. To find out if files were deleted a new global hash %del_hash is %introduced.
2010-04-03Revert "Revert the effects of find_del_files() for (re)autoadded files."David Riebenbauer
This reverts commit 31680111f0062f07727d14fcf291c98978ad5a2f.
2010-03-28don't check $@ after pagespec_translateJoey Hess
pagespec_translate may set $@ if it fails to parse a pagespec, but due to memoization, this is not reliable. If a memoized call is repeated, and $@ is already set for some other reason previously, it will remain set through the call to pagespec_translate. Instead, just check if pagespec_translate returns undef.
2010-02-28Add new --clean option; this makes ikiwiki remove all built files in the ↵Joey Hess
destdir, as well as wrappers and the .ikiwiki directory.
2010-02-03fix bugs in `find_src_files()`.David Riebenbauer
Use `_` to avoid superfluous stat. Check for `defined $file`, instead of just `$file`. Add spaces after commas. Change return values of `verify_src_file()` to not return the tainted filename. Rename `$f` to `$file_untainted in `verify_src_file()`. $f changes to `$file` in `find_src_files()`. This attempts to fix commit f3abeac919c4736429bd3362af6edf51ede8e7fe. For discussion see <http://ikiwiki.info/todo/auto-create_tag_pages_according_to_a_template/>
2010-02-02Revert the effects of find_del_files() for (re)autoadded files.David Riebenbauer
This also means that if autoadded files are deleted they will just be recreated.
2010-02-02Process files from @autofiles in refresh().David Riebenbauer
To make automatically added files render they have to be added to the $files, $pages, $new, and $changed variables. After that scan() is called on them.
2010-02-02Code deduplication fin find_src_files()David Riebenbauer
This also has the advantage that I can use the resulting new function elsewhere.
2010-01-04fix actions accountingJoey Hess
2010-01-02Fix several places that did not properly handle capitalization of the ↵Joey Hess
discussionpage setting. Specifically, fixes discussion actions on discussion pages, and unbreaks the opendiscussion plugin.
2009-12-02fix inverted testJoey Hess
2009-11-30fix bestlink to not return just-deleted pagesJoey Hess
bestlink was looking at whether %links existed for a page in order to tell if the page exists, but just-deleted pages still have entries in there (for reasons it may be best not to explore). So bestlink would return just-deleted pages. Instead, make bestlink use %pagesources. Also, when finding a deleted page, %pagecase was not cleared of that page. This, again, made bestlink return just-deleted pages. Now that is cleared. Fixing bestlink exposed another issue though. The backlink calculation code uses bestlink. So when a page was deleted, no backlinks to it are found, and pages that really did backlink to it were not updated, and had broken links. To fix that, the code that actually removes deleted pages had to be split out from find_del_files, so it can run a bit later. It is run just after backlinks are calculated. This way, backlink calculation still sees the deleted pages, but everything afterwards does not. However, it does not address the original bug report that started this whole thing, [[bugs/bestlink_returns_deleted_pages]]. Because there bestlink is run in the needsbuild hook. And that happens before backlink calculation, and so bestlink still returns deleted pages then. Also in the scan hook. If bestlink needs to work consistently during those hooks, a more involved fix will be needed.
2009-11-08Moved the postscan hook to run on the raw html of a page, before the ↵Joey Hess
template is filled out. This improves the search plugin's indexing, since it will not include navigational elements from the page template or sidebar.
2009-10-21Fix a bug introduced in the last version that caused ikiwiki to skip all ↵Joey Hess
files if a sourcedir of "./" was specified.
2009-10-08Merge branch 'master' into dependency-typesJoey Hess
Conflicts: IkiWiki.pm IkiWiki/Render.pm debian/changelog
2009-10-08Optimize away most expensive file prune calls, when refreshingJoey Hess
Benchmarking refresh of a a wiki with 25 thousand pages showed file_pruned() using most of the time. But, when refreshing, ikiwiki already knows about nearly all the files. So we can skip calling file_pruned() for those it knows about. While tricky to do, this sped up a refresh (that otherwise does no work) by 10-50%.
2009-10-07fix backlink new change detection codeJoey Hess
2009-10-06typoJoey Hess
2009-10-06fix support of a single dependency that combines links and exists typesJoey Hess
This is very common, and the code has to test each type differently, since the list of candidates to test, as well as the test, will vary per type. Much happier with this code now.
2009-10-06fix handling of links+content dependencyJoey Hess
Such a dependency is unlikely, but can happen.
2009-10-06refactor 3Joey Hess
Only left one new global
2009-10-06refresh refactor 2Joey Hess
killed one global
2009-10-05split up refreshJoey Hess
I'd rather have the global variables than the 300 line function
2009-10-05new link change detection method and general code reworkJoey Hess
This new method for determining when links on pages have changed should be more efficient, since it avoids double calculation of the bestlinks. It also allows collecting data about the old links, before the scan pass, so the data is accurate when pages move around and bestlinks change. Also got some code back to a saner indent level.
2009-10-05make links dependencies fire if broken links changeJoey Hess
2009-10-05implement links dependenciesJoey Hess
Involved some code refactoring so that same code that detects link changes for backlinks updating can be used for link dependency checking. The nice thing is that link dep checking is thus comopletly free!
2009-10-05typosJoey Hess
2009-10-04rework dependency types codeJoey Hess
Simplify, change default content depends number to 1, change interface to make more sense.
2009-10-04Merge branch 'dependency-types' into transitive-dependenciesJoey Hess
Conflicts: IkiWiki/Render.pm
2009-10-03implement support for DEPEND_EXISTSJoey Hess
Preliminary support, anyway. If a dependency only includes DEPEND_EXISTS, then only changes that involved adding or deleting a page can trigger it. This is complicated by internal pages, since the code did not previously differentiate between add, delete, and change of internal pages. Now it tracks change separately from add+delete, so DEPEND_EXISTS pagespecs that actually match internal pages (which will probably be quite rare in practice) should work.
2009-10-02minor optimisationJoey Hess
As soon as a change happens, we know we will need to rescan all dependencies from the start, so bail out of the current scan partway to avoid doing redundant work. Only problem with this is that ikiwiki sometimes ends up printing out dependencies that, while correct, are not obvious. Before: building B, which depends on A building C, which depends on A building D, which depends on A After: building B, which depends on A building C, which depends on B building D, which depends on C