Changeset 446

Timestamp:

10/16/07 01:34:11 (15 months ago)

Author:

ogawa

Message:

Add '--output' option to specify the output file.
Add '--compat-google-calendar' option to choose whether RRULE would be compatible with Google Calendar or not.
Support more complicated RRULEs. Thanks for Higuchi-san. (http://higuchi.com/item/394)

Location:

cybozu2ical/trunk

Files:

• cybozu2ical (modified) (8 diffs)
• lib/WWW/CybozuOffice6/Calendar.pm (modified) (1 diff)

cybozu2ical/trunk/cybozu2ical

@@ -7 +7 @@
 use lib 'lib';
 
-use YAML;
 use Encode qw/decode_utf8 encode/;
 use WWW::CybozuOffice6::Calendar;
@@ -20 +19 @@
 our $VERSION = '0.13';
 
+###
 ### TRICK (stop escaping for 'exdate' property)
+###
 *Data::ICal::Property::_value_as_string = sub {
     my $self = shift;
@@ -38 +39 @@
 
 };
-### END
-
-my %opt = (conf => 'config.yaml');
-GetOptions(\%opt, 'help', 'debug', 'conf=s') or pod2usage(2);
+
+###
+### Utility subroutines
+###
+sub to_icaldate {
+    my($dt, $is_full_day) = @_;
+    $is_full_day ?
+        $dt->ymd('') :
+        $dt->ymd('') . 'T' . $dt->hms('') . ($dt->time_zone->is_utc ? 'Z' : '');
+}
+
+sub encode_string {
+    my($enc, $text) = @_;
+    if ($enc eq 'ncr') {
+        $text =~ s/(\P{ASCII})/sprintf("&#%d;", ord($1))/eg;
+    } else {
+        $text = encode($enc, $text);
+    }
+    $text;
+}
+
+sub read_yaml {
+    my $file = shift;
+    my $yaml;
+    if (eval('require YAML::Tiny')) {
+        ($yaml) = YAML::Tiny::LoadFile($file);
+    } elsif (eval('require YAML')) {
+        ($yaml) = YAML::LoadFile($file);
+    }
+    if ($@) {
+        die "Faild to read yaml file: $@";
+    }
+    $yaml;
+}
+
+###
+### Main part
+###
+
+# Handle command-line options
+my %opt = (
+    conf                        => 'config.yaml',
+    'compat-google-calendar'    => 0,
+);
+GetOptions(\%opt,
+           'output=s',
+           'conf=s',
+           'compat-google-calendar',
+           'debug',
+           'help',
+       ) or pod2usage(2);
 pod2usage(1) if $opt{help};
 
-my $cfg = YAML::LoadFile($opt{conf});
-
+# Read configuration file
+my $cfg = read_yaml($opt{conf});
 my $time_zone = $cfg->{time_zone} || 'Asia/Tokyo';
 
+# Generate a root 'calendar' object
 my $vcalendar = Data::ICal->new();
 $vcalendar->add_properties(
@@ -57 +106 @@
 );
 
+# Obtain Cybozu Office 6 Calendar items
 my $cal = WWW::CybozuOffice6::Calendar->new(%$cfg);
+
+# For each items, generate an 'event entry' and append it to the calendar
 for my $item ($cal->get_items()) {
     my $vevent = Data::ICal::Entry::Event->new();
@@ -83 +135 @@
         my $freq = $item->frequency;
         my %rrules = $freq ne 'WEEKDAYS' ?
-            ( FREQ => $freq, WKST => 'SU' ) :
-            ( FREQ => 'WEEKLY', WKST => 'SU', BYDAY => 'MO,TU,WE,TH,FR' );
+            ( FREQ => $freq ) :
+            ( FREQ => 'WEEKLY', BYDAY => 'MO,TU,WE,TH,FR' );
+        if ($item->frequency_value =~ /^\d(SU|MO|TU|WE|TH|FR|SA)$/) {
+            $rrules{BYDAY} = $item->frequency_value;
+            $rrules{INTERVAL} = 1;
+        }
         $rrules{UNTIL} = to_icaldate($item->until, $item->is_full_day)
             if $item->until;
-        $args{rrule} = join ';', map { $_ . '=' . $rrules{$_} } keys %rrules;
+        $rrules{WKST} = 'SU'
+            if $opt{'compat-google-calendar'};
+
+        my @rrules;
+        for (qw(FREQ COUNT INTERVAL BYMONTH BYMONTHDAY WKST BYDAY UNTIL)) {
+            push @rrules, $_ . '=' . $rrules{$_}
+                if exists $rrules{$_};
+        }
+        $args{rrule} = join ';', @rrules;
 
         # exdate
         if ($item->exdates) {
-            my $exdate;
             if ($item->is_full_day) {
-                $exdate = join ',', map { to_icaldate($_, 1) } $item->exdates;
+                my $exdate = join ',', map { to_icaldate($_, 1) } $item->exdates;
                 $args{exdate} = [ $exdate, { VALUE => 'DATE' } ];
             } else {
-                $exdate = join ',', map { to_icaldate($_, 0) } $item->exdates;
+                my $exdate = join ',', map { to_icaldate($_, 0) } $item->exdates;
                 $args{exdate} = [ $exdate, { TZID => $time_zone } ];
             }
@@ -110 +173 @@
 }
 
+# Generate a 'timezone entry' and append it to the calendar
 my $vtimezone = Data::ICal::Entry::TimeZone->new();
 $vtimezone->add_properties(tzid => $time_zone);
 
-# probably we need to support the Daylight Saving Time
+# probably we need to support the Daylight Saving Time, but not yet supported.
 my $standard = Data::ICal::Entry::TimeZone::Standard->new();
-
 my $std = DateTime->new(year => 1970, month => 1, day => 1,
                         hour => 0, minute => 0, second => 0,
@@ -132 +195 @@
 $vcalendar->add_entry($vtimezone);
 
-print encode_($cfg->{output_encoding} || 'utf8', $vcalendar->as_string);
-
-sub to_icaldate {
-    my($dt, $is_full_day) = @_;
-    $is_full_day ?
-        $dt->ymd('') :
-        $dt->ymd('') . 'T' . $dt->hms('') . ($dt->time_zone->is_utc ? 'Z' : '');
-}
-
-sub encode_ {
-    my($enc, $text) = @_;
-    if ($enc eq 'ncr') {
-        $text =~ s/(\P{ASCII})/sprintf("&#%d;", ord($1))/eg;
-    } else {
-        $text = encode($enc, $text);
-    }
-    $text;
+# Outputs the calendar as a string
+my $text = encode_string($cfg->{output_encoding} || 'utf8', $vcalendar->as_string);
+if ($opt{output}) {
+    local *FH;
+    open FH, ">$opt{output}" or die "Failed to write $opt{output}";
+    print FH $text;
+    close FH;
+} else {
+    print $text;
 }
 
@@ -198 +253 @@
 =over 4
 
+=item --output /path/to/output.ics
+
+Specifies the output file.  By default, this application outputs to
+STDOUT.
+
 =item --conf /path/to/config.yaml
 
-Specifies the path to a configuration file. By default, C<config.yaml>
-in the current directory.
+Specifies the configuration file.  By default, C<config.yaml> in the
+current directory will be used.
+
+=item --compat-google-calendar
+
+To be compatible with Google Calendar.
+
+=item --debug
+
+Outputs Cybozu Office 6 CSV data as a COMMENT field of each events.
+It is just for debugging.
+
+=item --help
+
+Prints out this message.
 
 =back

cybozu2ical/trunk/lib/WWW/CybozuOffice6/Calendar.pm

@@ -87 +87 @@
                 $param{exdates} = \@exdates;
             }
+            my $freq = $param{freq};
+            if ($freq =~ /^[1-5]$/) {
+                $param{freq} = 'm';
+                my @week_str = ('SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA');
+                $param{freq_value} = $freq . $week_str[$param{freq_value}];
+            }
             $item = WWW::CybozuOffice6::Calendar::RecurrentEvent->new(%param);
         }