Changeset 19672 for websites

Timestamp:

09/21/08 16:55:54 (2 months ago)

Author:

drry

Message:

• Ustream のリニューアルに対応しました。
  

Location:

websites/ustreamer

Files:

• channel2json.cgi (modified) (2 diffs)
• css/ustreamer.css (modified) (1 diff)
• js/ustreamer.js (modified) (8 diffs)
• onairstatus2json.cgi (modified) (2 diffs)

websites/ustreamer/channel2json.cgi

@@ -25 +25 @@
 
 my %scraper = (
-    'usc' => qr{<p(?:\s[^>]*)?><a(?:\s[^>]*?)?\shref="/(\d+)\.usc"}o,
-    'irc' => qr{chat_so\.addVariable\('channel', '#([^']*?)'\);}o
+    'usc' => qr{viewer_so\.addVariable\('cid', '(\d+)}o,
+    'irc' => qr{chat_so\.addVariable\('channel', '#([^']+)}o
 );
 
@@ -77 +77 @@
     my $json = JSON::Syck::Dump($obj);
     if(defined (my $p = $q->param('callback'))){
-        $json = "$p($json);" if($p =~ /[a-zA-Z0-9\.\_\[\]]/);
+        $json = "$p($json);" if($p =~ /[a-zA-Z0-9._\[\]]/);
     }
     print $json;

websites/ustreamer/css/ustreamer.css

@@ -1 @@
-A { text-decoration: none; }
+A { text-decoration: none }
 body,form,input,textarea { font-size: 14px }
-.container { float:left; margin: 2px }
-.caption { font-size: 28px; font-falimy: sans-serif; text-align: center; margin: 0; padding: 0 }
-.selector { float: left; border: solid 1px #ccc; margin: 1px; padding: 2px; cursor: pointer;}
-img.status-icon { vertical-align: middle; margin: 0px 2px; }
+.container { float: left; margin: 2px }
+.caption { font-size: 28px; font-family: sans-serif; text-align: center; margin: 0; padding: 0 }
+.selector { float: left; border: 1px solid #ccc; margin: 1px; padding: 2px; cursor: pointer }
+img.status-icon { vertical-align: middle; margin: 0px 2px }

websites/ustreamer/js/ustreamer.js

@@ -1 +1 @@
 var api_hostname = document.location.hostname;
-// var ustreamer_dir = '/ustreamer';
+//var ustreamer_dir = '/ustreamer';
 var path_to_api = 'http://' + api_hostname + ustreamer_dir + '/channel2json.cgi';
 var path_to_onair_api = 'http://' + api_hostname + ustreamer_dir + '/onairstatus2json.cgi';
-// var default_channels = 'amn,shi3z-show,knnkandas-show';
+//var default_channels = 'amn,shi3z-show,knnkandas-show';
 var withIRC = false;
 var current_width = 300;
@@ -34 +34 @@
 
 function loadBuddies() {
-  for (i = 0; i < buddies.length; i++) {
+  for (var i = 0; i < buddies.length; i++) {
     addNewSelector(buddies[i]);
     if (i < init_load_limit) {
@@ -98 +98 @@
     container.id = "buddy-" + buddy.id;
     if (use_innerhtml) {
-      container.innerHTML = ['<embed ', ' width="', current_width, '"', ' height="', current_width * 163 / 200, '"', ' src="http://www.ustream.tv/', buddy.id, '.usc"', ' type="application/x-shockwave-flash"', ' title="', buddy.name, '"/>'].join("");
+      container.innerHTML = ['<embed ', ' width="', current_width, '"', ' height="', current_width * 163 / 200, '"', ' src="http://www.ustream.tv/flash/live/', buddy.id, '"', ' type="application/x-shockwave-flash"', ' title="', buddy.name, '"/>'].join("");
     }
     else {
@@ -104 +104 @@
       el.width = current_width;
       el.height = current_width * 163 / 200;
-      el.src = "http://www.ustream.tv/" + buddy.id + ".usc";
+      el.src = "http://www.ustream.tv/flash/live/" + buddy.id;
       el.type = "application/x-shockwave-flash";
       el.wmode = "transparent";
@@ -150 +150 @@
 function resizeEmbed(width) {
   var embeds = document.getElementsByTagName('embed');
-  for (i = 0; i < embeds.length; i++) {
+  for (var i = 0; i < embeds.length; i++) {
     embeds[i].style.width = width + "px";
     embeds[i].style.height = width * 163 / 200 + "px";
@@ -239 +239 @@
     done : function (args) {
       if (typeof args == "object") {
-        for (i = 0; i < checkbuddies.length; i++) {
+        for (var i = 0; i < checkbuddies.length; i++) {
           buddy = checkbuddies[i];
           if (args[buddy.name]) {
@@ -268 +268 @@
   };
   new Ten.JSONP(api, callback, 'done');
-  //   } while(buddies_temp.length > 0);
+  //  } while(buddies_temp.length > 0);
 }
 
@@ -338 +338 @@
   var ticker = document.getElementById("ticker");
   var entryContent = entryContents[count];
-  channelURLs = entryContent.match(/http:\/\/(?:www\.)?ustream\.tv\/channel\/([\w-]+)/);
+  channelURLs = entryContent.match(/http:\/\/(?:www\.)?ustream\.tv\/channel\/([-\w]+)/);
   if (channelURLs) {
     channelURL = channelURLs[0];

websites/ustreamer/onairstatus2json.cgi

@@ -84 +84 @@
     return undef unless $res->is_success;
     my $content = $res->content;
-    $content =~m{<a href="/([^"]*?)"><strong>};
+    $content =~m{<a href="/([^"]+)"><strong>};
     return $1 ? $1 : undef;
 }
@@ -96 +96 @@
     my $json = JSON::Syck::Dump($obj);
     if(defined (my $p = $q->param('callback'))){
-        $json = "$p($json);" if($p =~ /[a-zA-Z0-9\.\_\[\]]/);
+        $json = "$p($json);" if($p =~ /[a-zA-Z0-9._\[\]]/);
     }
     print $json;