inline: switch to use_pagespec

[git.ikiwiki.info.git] / IkiWiki / Plugin / inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index c9cbb9cb7112f2384a1f5e30016ae592009f571c..748e02df418370e10200e32428b649c5d86e75e6 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -196,40 +196,37 @@ sub preprocess_inline (@) {
                @list = map { bestlink($params{page}, $_) }
                        split ' ', $params{pagenames};
 
                @list = map { bestlink($params{page}, $_) }
                        split ' ', $params{pagenames};
 

-               $params{pages} = join(" or ", @list);
-       }
-       else {
-               @list = pagespec_match_list(
-                       [ grep { $_ ne $params{page} } keys %pagesources ],
-                       $params{pages}, location => $params{page});
-
-               if (exists $params{sort} && $params{sort} eq 'title') {
-                       @list=sort { pagetitle(basename($a)) cmp pagetitle(basename($b)) } @list;
+               if (yesno($params{reverse})) {
+                       @list=reverse(@list);

                }
                }

-               elsif (exists $params{sort} && $params{sort} eq 'title_natural') {
-                       eval q{use Sort::Naturally};
-                       if ($@) {
-                               error(gettext("Sort::Naturally needed for title_natural sort"));
-                       }
-                       @list=sort { Sort::Naturally::ncmp(pagetitle(basename($a)), pagetitle(basename($b))) } @list;
+
+               foreach my $p (@list) {
+                       add_depends($params{page}, $p, deptype($quick ? "presence" : "content"));

                }
                }

-               elsif (exists $params{sort} && $params{sort} eq 'mtime') {
-                       @list=sort { $pagemtime{$b} <=> $pagemtime{$a} } @list;
+       }
+       else {
+               my $num=0;
+               if ($params{show}) {
+                       $num=$params{show};

                }
                }

-               elsif (! exists $params{sort} || $params{sort} eq 'age') {
-                       @list=sort { $pagectime{$b} <=> $pagectime{$a} } @list;
+               if ($params{feedshow} && $num < $params{feedshow}) {
+                       $num=$params{feedshow};

                }
                }

-               else {
-                       error sprintf(gettext("unknown sort type %s"), $params{sort});
+               if ($params{skip}) {
+                       $num+=$params{skip};

                }
                }

-       }

 
 

-       if (yesno($params{reverse})) {
-               @list=reverse(@list);
+               @list = use_pagespec($params{page}, $params{pages},
+                       deptype => deptype($quick ? "presence" : "content"),
+                       limit => sub { $_[0] ne $params{page} },
+                       sort => exists $params{sort} ? $params{sort} : "age",
+                       reverse => yesno($params{reverse}),
+                       num => $num,
+               );

        }
 
        if (exists $params{skip}) {
        }
 
        if (exists $params{skip}) {

-               @list=@list[$params{skip} .. scalar @list - 1];
+               @list=@list[$params{skip} .. $#list];

        }
        
        my @feedlist;
        }
        
        my @feedlist;


@@ -247,16 +244,9 @@ sub preprocess_inline (@) {
                @list=@list[0..$params{show} - 1];
        }
 
                @list=@list[0..$params{show} - 1];
        }
 

-       add_depends($params{page}, $params{pages});
-       # Explicitly add all currently displayed pages as dependencies, so
-       # that if they are removed or otherwise changed, the inline will be
-       # sure to be updated.
-       foreach my $p ($#list >= $#feedlist ? @list : @feedlist) {
-               add_depends($params{page}, $p);
-       }
-       

        if ($feeds && exists $params{feedpages}) {
        if ($feeds && exists $params{feedpages}) {

-               @feedlist=pagespec_match_list(\@feedlist, $params{feedpages}, location => $params{page});
+               @feedlist = use_pagespec($params{page}, $params{feedpages},
+                       list => \@feedlist);

        }
 
        my ($feedbase, $feednum);
        }
 
        my ($feedbase, $feednum);