Use the page path and not the backing filename as the last resort in the default sort

This should:

1. Fix some (rare) tiebreaker issues when sorting pages from multiple content adapters.
2. Improve the sorting for pages without a backing file.
This commit is contained in:
Bjørn Erik Pedersen 2025-02-26 12:16:58 +01:00
parent 521911a576
commit c498d0fe1e
3 changed files with 28 additions and 4 deletions

View file

@ -90,14 +90,14 @@ var (
if w01 != w02 && w01 != -1 && w02 != -1 {
return w01 < w02
}
if p1.Weight() == p2.Weight() {
if p1.Date().Unix() == p2.Date().Unix() {
c := collatorStringCompare(func(p Page) string { return p.LinkTitle() }, p1, p2)
if c == 0 {
if p1.File() == nil || p2.File() == nil {
return p1.File() == nil
}
return compare.LessStrings(p1.File().Filename(), p2.File().Filename())
// This is the full normalized path, which will contain extension and any language code preserved,
// which is what we want for sorting.
return compare.LessStrings(p1.PathInfo().Path(), p2.PathInfo().Path())
}
return c < 0
}