Quick hack to improve vCal output

[tpope-extra.git] / perl / schedproc

diff --git a/perl/schedproc b/perl/schedproc
index b3bd248f79d0ddd5399534c8ba83b56b2528e496..dc5df8cb38fca955a6094bfc125dec95efc66d6e 100755 (executable)
--- a/perl/schedproc
+++ b/perl/schedproc
@@ -73,7 +73,7 @@ if(!defined($opts{'format'}) && defined($opts{'out'})) {
     $opts{'format'} = $opts{'out'};
     $opts{'format'} =~ s/.*\.//;
     $opts{'format'} =~ s/^(.*\/|)\.?schedule$/mhc/;
-    undef $opts{'out'} if($opts{'out'} =~ /^(html|mhc|csv|cvs|xml|grades)$/);
+    undef $opts{'out'} if($opts{'out'} =~ /^(html|mhc|csv|vcs|xml|grades)$/);
 }
 
 $opts{'format'} ||= "";
@@ -87,6 +87,27 @@ sub generate_id {
     return $id;
 }
 
+sub first_class {
+    my %class = @_;
+    $class{'duration'} =~ /(\d\d\d\d)(\d\d)(\d\d)-(\d\d\d\d)(\d\d)(\d\d)/;
+    my $days = Delta_Days($1,$2,$3,$4,$5,$6);
+    my $firstday = Date::Calc->new($1,$2,$3);
+    my $lastday = Date::Calc->new($4,$5,$6);
+    my $today;
+    my @days=();
+    foreach(split(" ",$class{'days'})) {
+       push @days, Decode_Day_of_Week($_);
+    }
+    my @off = ();
+    @off = @{$class{'off'}} if ($class{'off'});
+    for($today = $firstday; $today < $lastday; $today++) {
+       next unless(grep($_ == Day_of_Week($today->date), @days));
+       next if(grep($_ == "$today", @off));
+       return $today;
+    }
+    return undef;
+}
+
 sub next_class {
     my %class = @_;
     $class{'duration'} =~ /(\d\d\d\d)(\d\d)(\d\d)-(\d\d\d\d)(\d\d)(\d\d)/;
@@ -165,6 +186,7 @@ sub read_fileurl {
 sub get_schedule {
     my $content = read_fileurl($opts{'schedule'});
     my $ref = XMLin($content, ForceArray => [ 'class', 'off' ], KeyAttr => "");
+    die "Could not load schedule.\n" unless $ref->{'class'};
     return @{$ref->{'class'}};
 }
 
@@ -174,21 +196,26 @@ sub get_grades {
     return $ref;
 }
 
-sub get_faculty_email {
-    my ($name, $email, $url);
-    if((-f ($opts{'faculty'}||"")) && ! %faculty) {
-       open INS,$opts{'faculty'} or die $!;
-       while($_ = <INS>) {
-           chomp;
+sub load_faculty {
+    my ($name, $email, $url, $content);
+    if(($opts{'faculty'}) && ! %faculty) {
+       $content = read_fileurl($opts{'faculty'});
+       foreach $_ (split("\n", $content)) {
            m/"([^"]*)",([^,]*),([^,]*)/; # "
            ($name, $email, $url) = ($1, $2, $3);
+           next unless ($name);
            $name =~ s/ [A-Z]\.//g;
            $name = lc $name;
            $name =~ s/\W//g;
-           $faculty{$name} = $email;
-           $facurul{$name} = $urll;
+           $faculty{$name} = $email if($email);
+           $facurl{$name} = $url if ($url);
        }
     }
+}
+
+sub get_faculty_email {
+    load_faculty();
+    my ($name);
     $name = shift;
     $name =~ s/ [A-Z]r?\.//g;
     $name = lc $name;
@@ -197,20 +224,8 @@ sub get_faculty_email {
 }
 
 sub get_faculty_url {
-    my ($name, $email, $url);
-    if((-f ($opts{'faculty'}||"")) && ! %faculty) {
-       open INS, $opts{'faculty'} or die $!;
-       while($_ = <INS>) {
-           chomp;
-           m/"([^"]*)",([^,]*),([^,]*)/; # "
-           ($name, $email, $url) = ($1, $2, $3);
-           $name =~ s/ [A-Z]\.//g;
-           $name = lc $name;
-           $name =~ s/\W//g;
-           $faculty{$name} = $email;
-           $facurl{$name} = $url;
-       }
-    }
+    load_faculty();
+    my ($name);
     $name = shift;
     $name =~ s/ [A-Z]r?\.//g;
     $name = lc $name;
@@ -368,8 +383,8 @@ sub do_vcalendar_schedule {
        print "DESCRIPTION:", $row->{'id'}, "\r\n";
        print "LOCATION:", $row->{'location'}, "\r\n";
        print "CATEGORIES:Education\r\n";
-       print "DTSTART:", $startdate."T".$starttime, "00\r\n";
-       print "DTEND:", $startdate."T".$stoptime, "00\r\n";
+       print "DTSTART:", first_class(%$row)."T".$starttime, "00\r\n";
+       print "DTEND:", first_class(%$row)."T".$stoptime, "00\r\n";
        print "RRULE:W1 ", $row->{'days'} . " $stopdate", "T000000\r\n";
        print("EXDATE:$day\r\n") if($day);
        print "ATTENDEE;ROLE=OWNER;STATUS=CONFIRMED:", $opts{'name'}, "\r\n" if(defined($opts{'name'}));