Changeset 974

Timestamp:

10/31/07 22:23:27 (6 years ago)

Author:

tokuhirom

Message:

lang/perl/mobirc: ImplicitUnicode?++

Location:

lang/perl/mobirc/trunk/mobirc

Files:

• Makefile.PL (modified) (1 diff)
• lib/Mobirc/ConfigLoader.pm (modified) (1 diff)
• lib/Mobirc/HTTPD/Controller.pm (modified) (1 diff)
• lib/Mobirc/Util.pm (modified) (1 diff)
• mobirc (modified) (1 diff)

lang/perl/mobirc/trunk/mobirc/Makefile.PL

@@ -31 +31 @@
 requires 'Storable';
 requires 'List::MoreUtils';
+requires 'Template::Provider::Encoding';
 
 build_requires 'Test::More';

lang/perl/mobirc/trunk/mobirc/lib/Mobirc/ConfigLoader.pm

@@ -121 +121 @@
     }
     else {
-        # TODO: local $YAML::Syck::ImplicitUnicode = 1;
+        local $YAML::Syck::ImplicitUnicode = 1;
         $config = YAML::Syck::LoadFile($stuff);
     }

lang/perl/mobirc/trunk/mobirc/lib/Mobirc/HTTPD/Controller.pm

@@ -249 +249 @@
     DEBUG "rendering done";
 
-    my $content = encode( _get_charset($c), $out);
-    $content = _html_filter($c, $content);
+    my $content = encode($c->{config}->{httpd}->{charset}, $out);
 
     # change content type for docomo

lang/perl/mobirc/trunk/mobirc/lib/Mobirc/Util.pm

@@ -94 +94 @@
     # update keyword buffer.
     if ($row->{class} eq 'notice' || $row->{class} eq 'public') {
-        # FIXME: shoud use local $YAML::Syck::ImplicitUnicode = 1;
-        if (any { index($row->{msg}, $_) != -1 } map { decode('utf8', $_) } @{$config->{global}->{keywords} || []}) {
+        if (any { index($row->{msg}, $_) != -1 } @{$config->{global}->{keywords} || []}) {
             push @{$heap->{keyword_buffer}}, $row;
             if ( @{$heap->{keyword_buffer}} > $config->{httpd}->{lines}) {

lang/perl/mobirc/trunk/mobirc/mobirc

@@ -40 +40 @@
 DEBUG "load config: $conffname";
 my $config = Mobirc::ConfigLoader->load($conffname);
+
+# set default vars.
+$config->{irc}->{ping_delay} ||= 30;
+$config->{irc}->{reconnect_delay} ||= 10;
+$config->{httpd}->{charset} ||= 'cp932';
+$config->{httpd}->{root} ||= decode('utf8', '/');
+$config->{httpd}->{echo} ||= true;
+$config->{global}->{assets_dir} ||= File::Spec->catfile($FindBin::Bin, 'assets');
+$config->{httpd}->{cookie_expires} ||= '+3d';
+$config->{httpd}->{content_type} ||= 'text/html; charset=Shift_JIS';
 
 # daemonize