Changeset 32595

Timestamp:

04/19/09 00:05:21 (4 years ago)

Author:

daisuke

Message:

miscellaneous fix

Files:

• lang/perl/Morris/trunk/lib/Morris/CLI/LogUpload.pm (modified) (8 diffs)

lang/perl/Morris/trunk/lib/Morris/CLI/LogUpload.pm

@@ -2 +2 @@
 use utf8;
 use Moose;
+use Moose::Util::TypeConstraints;
 use MooseX::AttributeHelpers;
-use MooseX::Types::DateTime;
 use MooseX::Types::URI;
+use Config::Any;
 use DateTime;
+use DateTime::Format::Strptime;
 use DBI;
+use Encode qw(encode_utf8);
 use File::Temp;
 use Template;
+use Template::Stash::ForceUTF8;
 use WWW::Mechanize;
 
@@ -23 +27 @@
 );
 
+subtype 'Morris::CLI::ValueList'
+    => as 'ArrayRef'
+;
+coerce 'Morris::CLI::ValueList'
+    => from 'Str'
+    => via { [ $_ ] }
+;
 has connect_info => (
     is => 'rw',
-    isa => 'ArrayRef',
+    isa => 'Morris::CLI::ValueList',
     required => 1,
+    coerce => 1,
     auto_deref => 1,
 );
@@ -33 +45 @@
     metaclass => 'Collection::Array',
     is => 'ro',
-    isa => 'ArrayRef[Str]',
-    default => sub { +[] },
+    isa => 'Morris::CLI::ValueList',
+    coerce => 1,
     required => 1,
     provides => {
@@ -44 +56 @@
     is => 'rw',
     isa => 'Str',
-    coerce => 1,
+    required => 1,
+);
+
+has target => (
+    is => 'rw',
+    isa => 'Str',
+    trigger => sub {
+        my $date = DateTime::Format::Strptime->new(
+            pattern => '%Y-%m-%d',
+            time_zone => 'Asia/Tokyo'
+        )->parse_datetime($_[1] );
+        $date->set(hour => 6);
+        $_[0]->date( $date )
+    }
 );
 
 has date => (
-    is => 'ro',
+    is => 'rw',
     isa => 'DateTime',
-    coerce => 1,
     default => sub {
         DateTime->now(time_zone => 'Asia/Tokyo')
@@ -113 +137 @@
 sub _build_dbh {
     my $self = shift;
+    $self->{connect_info}->[3] = { RaiseError => 1, AutoCommit => 1 };
     DBI->connect($self->connect_info);
 }
@@ -119 +144 @@
     my ($self, $channel) = @_;
 
-    my $start = $self->date;
-
-    my $dbh = DBI->connect();
+    my $start = $self->date->clone;
+
+    my $dbh = $self->dbh;
 
     my $sth = $dbh->prepare("SELECT * FROM log WHERE channel = ? AND created_on >= ? AND created_on <= ?");
-    $sth->execute($channel, $start->epoch, $start->clone->add(day => 1)->epoch);
+    $sth->execute($channel, $start->epoch, $start->clone->add(days => 1)->epoch);
 
     my @messages;
-    while (my $h, $sth->fetchrow_hashref) {
+    while (my $h = $sth->fetchrow_hashref) {
         push @messages, $h;
+        $h->{message} =~ s/\|/\\|/g;
+        $h->{message} =~ s{((?:(?:https?):)(?://(?:[^\s/?#]*))(?:[^\s?#]*)(?:\?(?:[^\s#]*))?(?:#(?:.*))?)}{"$1":$1}g;
         $h->{created_on} = DateTime->from_epoch(epoch => $h->{created_on}, time_zone => 'Asia/Tokyo');
     }
-
-    my $tt = Template->new();
+    $sth->finish;
+    $dbh->disconnect;
+
+    return if !@messages;
+
+    my $tt = Template->new(
+        STASH => Template::Stash::ForceUTF8->new
+    );
     my %vars = (
         channel  => $channel,
@@ -141 +174 @@
     $tt->process(\*DATA, \%vars, \$output) or
         die $tt->error;
-
+    $output = encode_utf8($output);
+warn $output;
     my $ua = WWW::Mechanize->new();
     if ($self->basic_auth_username && $self->basic_auth_password ) {
@@ -157 +191 @@
 
     $ua->get($self->make_url( "/Log/" . $start->strftime('%Y-%m-%d') . ".edit" ));
+
     $ua->submit_form(
         form_number => 2,