Changeset 11332 for websites/jwatch.jp

Timestamp:

05/10/08 10:34:39 (5 years ago)

Author:

lopnor

Message:

websites/jwatch.jp: little more htmls.

Location:

websites/jwatch.jp/trunk

Files:

• lib/JWatch/Controller/Root.pm (modified) (4 diffs)
• misc/load_schedule_from_jsgoal.pl (modified) (4 diffs)
• misc/update_game_from_jsgoal.pl (modified) (3 diffs)
• root/src/index.tt2 (modified) (1 diff)

websites/jwatch.jp/trunk/lib/JWatch/Controller/Root.pm

@@ -5 +5 @@
 use utf8;
 use base 'Catalyst::Controller';
+use DateTime;
 
 #
@@ -39 +40 @@
 
     my @list = $c->model('DBIC')->resultset('Event')->search(
-        {},
+        {
+            datetime => { 'LIKE' => DateTime->now(time_zone => 'local')->ymd .'%' }
+        },
         { 
-            rows => 40, 
+            rows => 10, 
             order_by => 'datetime desc',
             join => 'game',
@@ -64 +67 @@
         );
         my %score = map {( $_->clubid, $_->get_column('score') )} @score;
-        $event->{gamedesc} = join (' ',
-            $game->homeclub->shortname,
-            $score{$game->clubid_home} || '0',
-            '-',
-            $score{$game->clubid_away} || '0',
-            $game->awayclub->shortname,
-        );
+        $event->{score}->{home} = $score{$game->clubid_home};
+        $event->{score}->{away} = $score{$game->clubid_away};
         $event->{referee} = $game->officials({type => 'referee'})->next;
         $event->{referee}->{shortname} = (split('　', $event->{referee}->name))[0];
@@ -82 +80 @@
                 },{
                     order_by => 'serialno desc',
-                    rows => 1,
                 }
             )->name;
-            $event->{$player.'name'} = join ('',
-                '#',$event->$player,
-                (split('　', $name))[0]
-            );
+            $event->{$player."name"} = (split('　', $name))[0];
         }
     }
     $c->stash->{eventlist} = \@list;
+
+    my @gamelist = $c->model('DBIC')->resultset('Game')->search(
+        {
+            kickoff => { 'LIKE' => DateTime->now(time_zone => 'local')->ymd .'%' }
+        }
+    );
+    for my $g (@gamelist) {
+        $g->{referee} = $g->officials({type => 'referee'})->next;
+        $g->{referee} or next;
+        $g->{referee}->{shortname} = (split('　', $g->{referee}->name))[0];
+    }
+    $c->stash->{gamelist} = \@gamelist;
     $c->stash->{template} = 'index.tt2';
 

websites/jwatch.jp/trunk/misc/load_schedule_from_jsgoal.pl

@@ -6 +6 @@
 use FindBin;
 use Web::Scraper;
+use DateTime;
 use DateTime::Format::Strptime;
-use DateTime::Format::MySQL;
 use YAML;
 use URI;
@@ -21 +21 @@
 my $clubs = $schema->resultset('Club');
 my $games = $schema->resultset('Game');
+my $events = $schema->resultset('Event');
+
+my $gamecount = $games->search_literal(
+    'now() > kickoff and '.
+    'now() < date_add(kickoff, interval 3 hour)'
+);
+$gamecount > 0 or exit 0;
 
 my $baseurl = 'http://www.jsgoal.jp';
@@ -38 +45 @@
 )) {
     for my $game (@{$scraper->scrape(URI->new_abs($uri, $baseurl))}) {
-        $games->update_or_create($game);
+        my $found = $games->find({id => $game->{id}});
+        if ($found) {
+            if (! defined $found->score_home && defined $game->{score_home}) {
+                $events->create({
+                        gameid => $game->{id},
+                        type => 'end',
+                        datetime => DateTime->now(time_zone => 'Asia/Tokyo'),
+                    });
+            }
+            $found->update($game);
+        } else {
+            $games->create($game);
+        }
     }
 }
@@ -59 +78 @@
         result 'kickoff';
     }->scrape(URI->new_abs($gameurl, $baseurl));
-    $kickoff = DateTime::Format::MySQL->format_datetime(
-        $strp->parse_datetime($kickoff)
-    );
+    $kickoff = $strp->parse_datetime($kickoff);
     my $clubid_home = $clubs->find({shortname => $cell[1]->as_text})->id;
     my $clubid_away = $clubs->find({shortname => $cell[3]->as_text})->id;

websites/jwatch.jp/trunk/misc/update_game_from_jsgoal.pl

@@ -32 +32 @@
 my ($game,$gameid,$kickoff,$type,$playerhash);
 
-#for ($games->search_literal('now() > date_sub(kickoff, interval 2 hour) and now() < date_add(kickoff, interval 2 hour)')) {
-for ($games->search_literal('kickoff > date_sub(now(),interval 2 day) and kickoff < now()')) {
+for ($games->search_literal('now() > date_sub(kickoff, interval 3 hour) and now() < date_add(kickoff, interval 3 hour)')) {
     $game = $_;
-    $gameid = $game->gameid;
+    $gameid = $game->id;
     (my $gameid_short = $gameid) =~ s{\d{8}$}{};
     $kickoff = $game->kickoff;
@@ -52 +51 @@
             $game_officials->find_or_create($_);
         }
-#        $game_players->create($_) for @{$res->{players}};
-#        $game_officials->create($_) for @{$res->{officials}};
-        my $datetime = DateTime->from_epoch({epoch => $kickoff->epoch})->subtract(hours => 2);
+        my $datetime = DateTime->from_epoch({epoch => $kickoff->epoch})
+            ->subtract(hours => 2);
         $events->find_or_create({
                 gameid => $gameid,
                 type => 'member',
-                datetime => $DateTime::Format::MySQL->format_datetime($datetime);
+                datetime => $datetime,
             });
     }
@@ -164 +162 @@
     $type = ($cell[0]->as_text eq '主審') ? 'referee' : 'assistant';
     my $officialid = $officials->search_literal("replace(name, '　','') = ?", $cell[-1]->as_text)->next->officialid;
+    $officialid or return;
     return {
         gameid => $gameid,

websites/jwatch.jp/trunk/root/src/index.tt2

@@ +1 @@
+[% META title = 'Jリーグ速報！jwatch.jp' %]
 [% FOREACH e IN eventlist %]
-[% e.datetime %] [% e.gamedesc %] [% e.gametime %]分 
-[% IF e.type == 'goal' %][% e.club.shortname %][% e.player1name %]がゴール！
-[% ELSIF e.type == 'change' %][% e.club.shortname %] 選手交代 IN: [% e.player1name %] -> OUT: [% e.player2name %]
-[% ELSIF e.type == 'yellow' %][% e.referee.shortname %]が[% e.club.shortname %][% e.player1name %]にイエロー！
-[% ELSIF e.type == 'red' %][% e.referee.shortname %]が[% e.club.shortname %][% e.player1name %]にレッド！
+■ [% e.datetime.hms %] [% e.game.homeclub.shortname %] [% e.score.home || 0 %] - [% e.score.away || 0 %] [% e.game.awayclub.shortname %] [% e.gametime %]min. <br>
+　　[% IF e.type == 'goal' %]&#63671;[% e.club.shortname %][% e.player1name %]がゴール！
+[% ELSIF e.type == 'change' %][% e.club.shortname %]  OUT: [% e.player1name %] -> IN: [% e.player2name %]
+[% ELSIF e.type == 'yellow' %]<font color="yellow">■</font>[% e.referee.shortname %]が[% e.club.shortname %][% e.player1name %]にイエロー！
+[% ELSIF e.type == 'red' %]<font color="red">■</font>[% e.referee.shortname %]が[% e.club.shortname %][% e.player1name %]にレッド！
 [% ELSE %][% e.description %]に何かが！
 [% END %]<br>
 [% END %]
+<br>
+■ 今日の試合<br>
+[% FOREACH g IN gamelist %]
+[% g.homeclub.shortname %] vs [% g.awayclub.shortname %] [% g.referee.shortname %]<br>
+[% END %]