Changeset 15123

Timestamp:

07/03/08 22:45:07 (5 months ago)

Author:

drry

Message:

• Ustream のリニューアルを追随しました。
  

Location:

websites/ustreamer

Files:

• channel2json.cgi (modified) (1 diff)
• onairstatus2json.cgi (modified) (2 diffs)

websites/ustreamer/channel2json.cgi

@@ -25 +25 @@
 
 my %scraper = (
-    'usc' => qr{<p><a href="/(\d+)\.usc" target="_blank" }o,
+    'usc' => qr{<p(?:\s[^>]*)?><a(?:\s[^>]*?)?\shref="/(\d+)\.usc"}o,
     'irc' => qr{chat_so\.addVariable\('channel', '#([^']*?)'\);}o
 );

websites/ustreamer/onairstatus2json.cgi

@@ -1 +1 @@
 #!/usr/bin/env perl
 
-# 2007-07-28 v0.01
+# 2008-07-03 v0.2
 # License : Same as Perl
 # Sample : http://libelabo.jp/cgi-bin/onairstatus2json.cgi
@@ -59 +59 @@
     return undef unless $res->is_success;
     my $content = $res->content;
-    $content =~m{(<h4>.*live:</h4>)[^<]*?<h3><a href="/channel/([^"]*?)">};
-    my $onair = $1 ? 1 : 0 ;
-    my $onairch = $2 ? $2 : undef;
+    my $onair   = $content =~ m{<h2><a href="/channel/([^"]+)">Go to show page</a>} ? 1 : 0;
+    my $onairch = $1 ? $1 : undef;
     my %isonair = (
        "username" => $user,
-       "onair" => $onair,
-       "channel" => $onairch,
-                  );
+       "onair"    => $onair,
+       "channel"  => $onairch,
+    );
     return \%isonair;
 }