Changeset 7436 for websites/ustreamer

Timestamp:

03/04/08 00:26:51 (5 years ago)

Author:

drry

Message:

websites/ustreamer/channel2json.cgi
websites/ustreamer/onairstatus2json.cgi
websites/ustreamer/index.html
websites/ustreamer/js/ustreamer.js:

• www.ustream.tv が優先になったようなので追随して変更をしました。
  

Location:

websites/ustreamer

Files:

• channel2json.cgi (modified) (4 diffs)
• index.html (modified) (1 diff)
• js/ustreamer.js (modified) (7 diffs)
• onairstatus2json.cgi (modified) (4 diffs)

websites/ustreamer/channel2json.cgi

@@ -25 +25 @@
 
 my %scraper = (
-    'usc' => qr{src="http://ustream\.tv/([^"]*?)\.usc"}o,
+    'usc' => qr{src="http://(?:www\.)?ustream\.tv/([^"]*?)\.usc"}o,
     'irc' => qr{chat_so\.addVariable\('channel', '#([^']*?)'\);}o
 );
@@ -38 +38 @@
 
 my %result = map {
-    $_ => channel2any($_, $mode) 
+    $_ => channel2any($_, $mode)
 } map {
-    $_ =~ s{http://(?:www\.)?ustream.tv/channel/}{}; $_ 
+    $_ =~ s{http://(?:www\.)?ustream.tv/channel/}{}; $_
 } @channels;
 
@@ -57 +57 @@
     my $ua = LWP::UserAgent->new;
     $ua->agent('ustream2json/0.01');
-    
+
     my $res = URI::Fetch->fetch(
         $url,
@@ -72 +72 @@
     my ($q, $obj) = @_;
     print $q->header(
-        "-type" => "text/javascript",
+        "-type" => "application/json",
         "-charset" => 'utf-8'
     );

websites/ustreamer/index.html

@@ -47 +47 @@
 <div style="clear: both;"></div>
 
-<form onsubmit="if (this.url.value) { addBuddyFromURL('http://ustream.tv/channel/'+this.url.value) } return false">
-add Channel: http://ustream.tv/channel/<input size="30" name="url" value="" type="text" onfocus="this.select()"> <input value="add" type="submit">
+<form onsubmit="if (this.url.value) { addBuddyFromURL('http://www.ustream.tv/channel/'+this.url.value) } return false">
+add Channel: http://www.ustream.tv/channel/<input size="30" name="url" value="" type="text" onfocus="this.select()"> <input value="add" type="submit">
 </form>
 <textarea id="linkcode" cols="30" rows="1" style="width:100%;height:1.5em;overflow:hidden" onfocus="this.select()"> </textarea>

websites/ustreamer/js/ustreamer.js

@@ -8 +8 @@
 var init_load_limit = 3;
 
-var use_innerhtml = (navigator.userAgent.match(/Safari/) || window.opera) ? true : false;
+var use_innerhtml = navigator.userAgent.indexOf("Safari") != -1 || window.opera;
 var buddies = [];
 var buddyEmbeds = [];
@@ -114 +114 @@
       // IRC
       if (use_innerhtml) {
-        container.innerHTML = ['<embed ', ' width="', current_width, '"', ' height="200"', ' type="application/x-shockwave-flash" ', ' flashvars="channel=#', buddy.name, '" ', ' src="http://ustream.tv/IrcClient.swf" ', ' title="', buddy.name, '"/>'].join("");
+        container.innerHTML = ['<embed ', ' width="', current_width, '"', ' height="200"', ' type="application/x-shockwave-flash" ', ' flashvars="channel=#', buddy.name, '" ', ' src="http://www.ustream.tv/IrcClient.swf" ', ' title="', buddy.name, '"/>'].join("");
       }
       else {
@@ -120 +120 @@
         el.width = current_width;
         el.height = 200;
-        el.src = "http://ustream.tv/IrcClient.swf";
+        el.src = "http://www.ustream.tv/IrcClient.swf";
         el.type = "application/x-shockwave-flash";
         el.wmode = "transparent";
@@ -130 +130 @@
     caption = document.createElement('div');
     caption.className = "caption";
-    caption.innerHTML = "<a href='http://ustream.tv/watch/channel/" + buddy.id + "' target=_blank>" + buddy.name + '</a> ';
+    caption.innerHTML = "<a href='http://www.ustream.tv/watch/channel/" + buddy.id + "' target=_blank>" + buddy.name + '</a> ';
     container.appendChild(caption);
     return container;
@@ -158 +158 @@
 function addBuddyFromURL(url) {
   var api = path_to_api + '?channel_name=';
-  var channel_name = url.replace(/http:\/\/(www\.)?ustream.tv\/channel\//, "");
+  var channel_name = url.replace(/http:\/\/(?:www\.)?ustream\.tv\/channel\//, "");
   if (document.getElementsByName(channel_name)[0]) {
     return;
@@ -189 +189 @@
     addNewEmbed({ name : target.getAttribute("name"), id : id });
     if ( target.childNodes[0].alt.match(/^other-(.*)/)) {
-      addBuddyFromURL("http://ustream.tv/channel/" + RegExp.$1);
+      addBuddyFromURL("http://www.ustream.tv/channel/" + RegExp.$1);
     }
   }
@@ -338 +338 @@
   var ticker = document.getElementById("ticker");
   var entryContent = entryContents[count];
-  channelURLs = entryContent.match(/http:\/\/(www\.)?ustream.tv\/channel\/([0-9a-zA-Z_-]*)/);
+  channelURLs = entryContent.match(/http:\/\/(?:www\.)?ustream\.tv\/channel\/([0-9a-zA-Z_-]+)/);
   if (channelURLs) {
     channelURL = channelURLs[0];
-    channelName = channelURLs[2];
+    channelName = channelURLs[1];
   }
   message += entryContent.charAt(count++);

websites/ustreamer/onairstatus2json.cgi

@@ -36 +36 @@
 
 my %result = map {
-    $_ => onair($_) 
+    $_ => onair($_)
 } map {
-    $_=~s{http://www.ustream.tv/channel/}{}; $_ 
+    $_=~s{http://www.ustream.tv/channel/}{}; $_
 } @channels;
 
@@ -49 +49 @@
     my $ua = LWP::UserAgent->new;
     $ua->agent('onairstatus2json/0.01');
-    
+
     my $res = URI::Fetch->fetch(
         $url,
@@ -75 +75 @@
     my $ua = LWP::UserAgent->new;
     $ua->agent('onairstatus2json/0.01');
-    
+
     my $res = URI::Fetch->fetch(
         $url,
@@ -92 +92 @@
     my ($q, $obj) = @_;
     print $q->header(
-        "-type" => "text/javascript",
+        "-type" => "application/json",
         "-charset" => 'utf-8'
     );