Don't confuse old readers with Atom names in RSS.

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 20cb8a27c9e9ea544540f2521b1793be54be8a45..e313eb7755313ea051b14f43310168fb5750dd0e 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -647,6 +647,7 @@ sub genfeed ($$$$$@) {
        foreach my $p (@pages) {
                my $u=URI->new(encode_utf8(urlto($p, "", 1)));
                my $pcontent = absolute_urls(get_inline_content($p, $page), $url);
        foreach my $p (@pages) {
                my $u=URI->new(encode_utf8(urlto($p, "", 1)));
                my $pcontent = absolute_urls(get_inline_content($p, $page), $url);

+               my $fancy_enclosure_seen = 0;

 
                $itemtemplate->param(
                        title => pagetitle(basename($p)),
 
                $itemtemplate->param(
                        title => pagetitle(basename($p)),


@@ -668,17 +669,27 @@ sub genfeed ($$$$$@) {
                                $itemtemplate->param(mdate_822 => date_822($pagestate{$p}{meta}{updated}));
                                $itemtemplate->param(mdate_3339 => date_3339($pagestate{$p}{meta}{updated}));
                        }
                                $itemtemplate->param(mdate_822 => date_822($pagestate{$p}{meta}{updated}));
                                $itemtemplate->param(mdate_3339 => date_3339($pagestate{$p}{meta}{updated}));
                        }

+
+                       if (exists $pagestate{$p}{meta}{enclosure}) {
+                               my $absurl = $pagestate{$p}{meta}{enclosure};
+
+                               # XXX better way to compute relative to srcdir?
+                               my $file = $absurl;
+                               $file =~ s|^$config{url}/||;
+
+                               genenclosure($itemtemplate, $absurl, $file);
+                               $fancy_enclosure_seen = 1;
+                       }

                }
 
                my $file=$pagesources{$p};
                }
 
                my $file=$pagesources{$p};

-               my $type=pagetype($file);
-               if (defined $type) {
-                       $itemtemplate->param(content => $pcontent);
-               }
-               else {
+               unless ($fancy_enclosure_seen || defined(pagetype($file))) {

                        genenclosure($itemtemplate, $u, $file);
                        genenclosure($itemtemplate, $u, $file);

+                       $itemtemplate->param(simplepodcast => 1);

                }
 
                }
 

+               $itemtemplate->param(content => $pcontent);
+

                run_hooks(pagetemplate => sub {
                        shift->(page => $p, destpage => $page,
                                template => $itemtemplate);
                run_hooks(pagetemplate => sub {
                        shift->(page => $p, destpage => $page,
                                template => $itemtemplate);


@@ -699,6 +710,7 @@ sub genfeed ($$$$$@) {
                feeddesc => $feeddesc,
                guid => $guid,
                feeddate => date_3339($lasttime),
                feeddesc => $feeddesc,
                guid => $guid,
                feeddate => date_3339($lasttime),

+               feeddate_822 => date_822($lasttime),

                feedurl => $feedurl,
        );
        run_hooks(pagetemplate => sub {
                feedurl => $feedurl,
        );
        run_hooks(pagetemplate => sub {