X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=events.pm;h=c072df6bbdeaf78882210bd85e4e0ef60cb31be3;hb=c8306c98c670199a94e4f84b6147c5d858c47902;hp=61cb5fd03f5aed66a18a60687b12565f98530243;hpb=a2e7c8da6bdc68a40831bf92c091dac1cbcbeac6;p=ikiwiki%2Fevents.git diff --git a/events.pm b/events.pm index 61cb5fd..c072df6 100644 --- a/events.pm +++ b/events.pm @@ -155,11 +155,15 @@ sub date_of_page ($%) { my $dir = IkiWiki::dirname($page); my ($year, $month, $day, $hour, $hour_begin, $hour_end) = $dir =~ m{ - .*/ - (\d+)/ - (01|02|03|04|05|06|07|08|09|10|11|12)/ - (01|02|03|04|05|06|07|08|09|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31)/ - (([0-2][0-9]h[0-5][0-9])(-[0-2][0-9]h[0-5][0-9])?)? + .*? + /(\d+) + (?:/(01|02|03|04|05|06|07|08|09|10|11|12) + (?:/(01|02|03|04|05|06|07|08|09|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31) + (?:/(([0-2][0-9]h[0-5][0-9]) + (?:-([0-2][0-9]h[0-5][0-9]))?) + )? + )? + )? $ }x; my $r = @@ -174,13 +178,13 @@ sub date_of_page ($%) { return $r; } sub event_of_page ($%) { - my ($event, %params) = @_; + my ($event, $date, %params) = @_; my $title = exists $pagestate{$event}{meta}{title} ? $pagestate{$event}{meta}{title} : pagetitle(IkiWiki::basename($event)); my $hour - = date_of_page($event)->{hour}; + = $date->{hour}; my $link = htmllink ( $params{page} @@ -198,7 +202,8 @@ sub event_of_page ($%) { (keys %{$IkiWiki::typedlinks{$event}{tag}})); @tags = map { - my $tag = $_; + my $besttag = bestlink($params{page}, $_); + my $tag = (length $besttag > 0 ? $besttag : $_); my $title = exists $pagestate{$tag}{meta}{title} ? $pagestate{$tag}{meta}{title} @@ -207,7 +212,7 @@ sub event_of_page ($%) { = htmllink ( $params{page} , $params{destpage} - , '/'.$tag + , (length $besttag == 0 and defined $config{tag_new} ? $config{tag_new} : '').'/'.$tag , linktext => $title , noimageinline => 1 , title => $title ); @@ -223,6 +228,8 @@ sub event_of_page ($%) { $base =~ s/[^a-zA-Z0-9-]/_/g; return { hour => $hour + , page => $event + , date => $date , link => $link , tags => \@tags , base => $base }; @@ -235,16 +242,20 @@ sub events_of_pages ($%) { foreach my $page (@$pages) { my $date = date_of_page($page); if (defined $date->{hour}) { - push @hour_events, $page; + push @hour_events, {page=>$page, date=>$date}; } else { - push @day_events, $page; + push @day_events, {page=>$page, date=>$date}; } } return - map {event_of_page($_, %params)} - ( (sort {lc $pagedir->($a) cmp lc $pagedir->($b)} @day_events) - , (sort {lc $pagedir->($a) cmp lc $pagedir->($b)} @hour_events) ); + map {event_of_page($_->{page}, $_->{date}, %params)} + ( (sort {lc IkiWiki::basename($a->{page}) cmp lc IkiWiki::basename($b->{page})} @day_events) + , (sort { + my $r = $a->{date}->{hour} cmp $b->{date}->{hour}; + if ($r) { $r } + else { IkiWiki::basename($a->{page}) cmp IkiWiki::basename($b->{page}) } + } @hour_events) ); } sub event_html ($$%) { my ($date, $format, %params) = @_; @@ -408,15 +419,9 @@ sub preprocess_month (@) { # NOTE: add presence dependencies to update calendar when pages are added/removed ); - # NOTE: sort the pages by days of the month - my %days = map {($_=>[])} (1 .. $last_day); - foreach my $page (@pages) { - my $page_ctime = DateTime->from_epoch - ( epoch => $IkiWiki::pagectime{$page} - , time_zone => 'local' - , locale => $config{locale} - ); - push @{$days{$page_ctime->day()}}, $page; + my %events_by_day = map {($_=>[])} (1 .. $last_day); + foreach my $event (events_of_pages(\@pages, %params)) { + push @{$events_by_day{$event->{date}->{day}}}, $event; } my $t='