Changeset 447

Timestamp:

10/16/07 17:33:37 (11 months ago)

Author:

ogawa

Message:

Add --input-csv and --output-csv options.

Files:

• cybozu2ical/trunk/cybozu2ical (modified) (2 diffs)
• cybozu2ical/trunk/lib/WWW/CybozuOffice6/Calendar.pm (modified) (5 diffs)

cybozu2ical/trunk/cybozu2ical

@@ -88 +88 @@
-           'compat-google-calendar',
-           'debug',
+           'input-csv=s',
+           'output-csv=s',
-           'help',
-       ) or pod2usage(2);
@@ -108 +110 @@
-# Obtain Cybozu Office 6 Calendar items
-my $cal = WWW::CybozuOffice6::Calendar->new(%$cfg);
+
+if ($opt{'input-csv'}) {
+    $cal->read_from_csv_file($opt{'input-csv'})
+        or die "Failed to read CSV file: $opt{'input-csv'}";
+} else {
+    $cal->request()
+        or die "Failed to get Cybozu Office 6 Calendar";
+}
+
+# Output the calendar CSV for debugging
+if ($opt{'output-csv'}) {
+    local *FH;
+    open FH, ">$opt{'output-csv'}" or die "Failed to write $opt{'output-csv'}";
+    print FH "$_\n" for $cal->response;
+    close FH;
+}
-
-# For each items, generate an 'event entry' and append it to the calendar

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

@@ -35 +35 @@
-}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    die 'Failed to access Cybozu Office 6: ' . $res->status_line
-        unless $res->is_success;
@@ -45 +53 @@
-    from_to($content, $this->{input_encoding} || 'shiftjis', 'utf8');
-    my @lines = grep /^\d+,ts\.\d+,/, split(/\r?\n/, $content);
+    $this->{response} = \@lines;
+
+    scalar @lines ? \@lines : undef;
+}
+
+sub read_from_csv_file {
+    my $this = shift;
+    my ($file) = @_;
+    local *FH;
+    open FH, $file or die "Failed to read $file";
+    my @lines;
+    while (<FH>) {
+        chomp; push @lines, $_;
+    }
+    close(FH);
+    $this->{response} = \@lines;
+
+    scalar @lines ? \@lines : undef;
+}
+
+sub response {
+    my $res = $_[0]->{response} || {};
+    wantarray ? @$res : $res;
+}
+
+sub get_items {
+    my $this = shift;
-
-    my @items;
-    my $csv = Text::CSV_XS->new({ binary => 1 });
-@lines
+$this->response
-        $csv->parse($line)
-            or die 'Failed to parse CSV input';
@@ -103 +138 @@
-}
-
-sub _request {
-    my $this = shift;
-    $this->{ua}->post($this->{url} . '?page=SyncCalendar', {
-        _System    => 'login',
-        _Login     => 1,
-        csv        => 1,
-        notimecard => 1,
-        defined $this->{username} ? (_Account => $this->{username}) : (),
-        defined $this->{userid}   ? (_Id      => $this->{userid}  ) : (),
-        Password   => $this->{password} || '',
-    });
-}
-
-package WWW::CybozuOffice6::Calendar::Event;
-
@@ -268 +290 @@
-  );
-
+  # request calendar contents
+  $calendar->request();
+
-  # get list of items in the calendar
-  my @items = $calendar->get_items();
@@ -346 +371 @@
-Gets/sets the Cybozu Office 6 encoding.
-
+=item request()
+
+Requests to obtain the contents of Cybozu Office 6 Calendar.
+
+=item read_from_csv_file($filename)
+
+Instead of requesting Cybozu Office 6 server, reads from a local CSV file.
+
-=item get_items()
-