Changeset 591

Timestamp:

10/21/07 21:49:58 (6 years ago)

Author:

otsune

Message:

websites/ustreamer/channel2json.cgi: refactoring regexp

Files:

• websites/ustreamer/channel2json.cgi (modified) (3 diffs)

websites/ustreamer/channel2json.cgi

@@ -25 +25 @@
 
 my %scraper = (
-    'usc' => 'src="http://ustream.tv/([^"]*?).usc"',
-    'irc' => 'name="channel" value="(\#[^,]*?)"',
+    'usc' => qr{src="http://ustream\.tv/([^"]*?)\.usc"}o,
+    'irc' => qr{name="channel" value="(\#[^,]*?)"}o,
 );
 
@@ -40 +40 @@
     $_ => channel2any($_, $mode) 
 } map {
-    $_ =~ s{http://www.ustream.tv/channel/}{}; $_ 
+    $_ =~ s{http://(?:www\.)?ustream.tv/channel/}{}; $_ 
 } @channels;
 
@@ -48 +48 @@
     my ($channel, $mode) = @_;
     my $content = channel_fetch($channel);
-    $content =~ m{ $scraper{$mode} };
+    $content =~ $scraper{$mode};
     return $1 ? $1 : undef;
 }