diff options
author | Yorhel <git@yorhel.nl> | 2019-11-14 13:26:03 +0100 |
---|---|---|
committer | Yorhel <git@yorhel.nl> | 2019-11-14 13:31:15 +0100 |
commit | 389fe32c24adce3277548892b5d636c40ac35bc4 (patch) | |
tree | b739ac49edbe9670b64d310676a32310a6f69440 /lib/VNDB | |
parent | 06bacb61526f3945520dd344821d2aa7b85a5f43 (diff) |
v2rw: Convert staff pages
This is where the ExtLink module comes in handy: generating the revision
comparison thing is much easier now. Did find and fix a bunch of issues
with the new revision box generator code, but that was to be expected, I
hadn't tested that code well yet and this is its first more demanding
use.
Rest of this is a pretty direct rewrite, nothing too special.
Diffstat (limited to 'lib/VNDB')
-rw-r--r-- | lib/VNDB/DB/Staff.pm | 81 | ||||
-rw-r--r-- | lib/VNDB/ExtLinks.pm | 12 | ||||
-rw-r--r-- | lib/VNDB/Handler/Staff.pm | 165 | ||||
-rw-r--r-- | lib/VNDB/Util/CommonHTML.pm | 1 |
4 files changed, 14 insertions, 245 deletions
diff --git a/lib/VNDB/DB/Staff.pm b/lib/VNDB/DB/Staff.pm index 87dbef43..5a393dbb 100644 --- a/lib/VNDB/DB/Staff.pm +++ b/lib/VNDB/DB/Staff.pm @@ -5,10 +5,9 @@ use strict; use warnings; use Exporter 'import'; -our @EXPORT = qw|dbStaffGet dbStaffGetRev|; +our @EXPORT = qw|dbStaffGet |; # options: results, page, id, aid, search, exact, truename, role, gender -# what: extended changes roles aliases sub dbStaffGet { my $self = shift; my %o = ( @@ -57,7 +56,6 @@ sub dbStaffGet { ); my $select = 's.id, sa.aid, sa.name, sa.original, s.gender, s.lang'; - $select .= ', s.desc, s.l_wp, s.l_site, s.l_twitter, s.l_anidb, s.l_wikidata, s.l_pixiv, s.hidden, s.locked' if $o{what} =~ /extended/; my($order, @order) = ('sa.name'); if($o{sort} && $o{sort} eq 'search') { @@ -74,83 +72,8 @@ sub dbStaffGet { $select, \%where, @order ); - return _enrich($self, $r, $np, 0, $o{what}); -} - - -sub dbStaffGetRev { - my $self = shift; - my %o = (what => '', @_); - - $o{rev} ||= $self->dbRow('SELECT MAX(rev) AS rev FROM changes WHERE type = \'s\' AND itemid = ?', $o{id})->{rev}; - - my $select = 'c.itemid AS id, sa.aid, sa.name, sa.original, s.gender, s.lang'; - $select .= ', extract(\'epoch\' from c.added) as added, c.comments, c.rev, c.ihid, c.ilock, '.VNWeb::DB::sql_user(); - $select .= ', c.id AS cid, NOT EXISTS(SELECT 1 FROM changes c2 WHERE c2.type = c.type AND c2.itemid = c.itemid AND c2.rev = c.rev+1) AS lastrev'; - $select .= ', s.desc, s.l_wp, s.l_site, s.l_twitter, s.l_anidb, s.l_wikidata, s.l_pixiv, so.hidden, so.locked' if $o{what} =~ /extended/; - - my $r = $self->dbAll(q| - SELECT !s - FROM changes c - JOIN staff so ON so.id = c.itemid - JOIN staff_hist s ON s.chid = c.id - JOIN staff_alias_hist sa ON sa.chid = c.id AND s.aid = sa.aid - JOIN users u ON u.id = c.requester - WHERE c.type = 's' AND c.itemid = ? AND c.rev = ?|, - $select, $o{id}, $o{rev} - ); - - return _enrich($self, $r, 0, 1, $o{what}); -} - - -sub _enrich { - my($self, $r, $np, $rev, $what) = @_; - - # Role info is linked to VN revisions, so is independent of the selected staff revision - if(@$r && $what =~ /roles/) { - my %r = map { - $_->{roles} = []; - $_->{cast} = []; - ($_->{id}, $_); - } @$r; - - push @{$r{ delete $_->{id} }{roles}}, $_ for (@{$self->dbAll(q| - SELECT sa.id, sa.aid, v.id AS vid, sa.name, sa.original, v.c_released, v.title, v.original AS t_original, vs.role, vs.note - FROM vn_staff vs - JOIN vn v ON v.id = vs.id - JOIN staff_alias sa ON vs.aid = sa.aid - WHERE sa.id IN(!l) AND NOT v.hidden - ORDER BY v.c_released ASC, v.title ASC, vs.role ASC|, [ keys %r ] - )}); - push @{$r{ delete $_->{id} }{cast}}, $_ for (@{$self->dbAll(q| - SELECT sa.id, sa.aid, v.id AS vid, sa.name, sa.original, v.c_released, v.title, v.original AS t_original, c.id AS cid, c.name AS c_name, c.original AS c_original, vs.note - FROM vn_seiyuu vs - JOIN vn v ON v.id = vs.id - JOIN chars c ON c.id = vs.cid - JOIN staff_alias sa ON vs.aid = sa.aid - WHERE sa.id IN(!l) AND NOT v.hidden - ORDER BY v.c_released ASC, v.title ASC|, [ keys %r ] - )}); - } - - if(@$r && $what =~ /aliases/) { - my ($col, $hist, $colname) = $rev ? ('cid', '_hist', 'chid') : ('id', '', 'id'); - my %r = map { - $_->{aliases} = []; - ($_->{$col}, $_); - } @$r; - - push @{$r{ delete $_->{xid} }{aliases}}, $_ for (@{$self->dbAll(" - SELECT s.$colname AS xid, sa.aid, sa.name, sa.original - FROM staff_alias$hist sa - JOIN staff$hist s ON s.$colname = sa.$colname - WHERE s.$colname IN(!l) AND s.aid <> sa.aid - ORDER BY sa.name ASC", [ keys %r ] - )}); - } - return wantarray ? ($r, $np) : $r; } + 1; diff --git a/lib/VNDB/ExtLinks.pm b/lib/VNDB/ExtLinks.pm index 8e9bdf72..2280285a 100644 --- a/lib/VNDB/ExtLinks.pm +++ b/lib/VNDB/ExtLinks.pm @@ -5,7 +5,7 @@ use warnings; use VNDB::Config; use Exporter 'import'; -our @EXPORT = ('enrich_extlinks'); +our @EXPORT = ('enrich_extlinks', 'revision_extlinks'); # column name in wikidata table => \%info @@ -225,4 +225,14 @@ sub enrich_extlinks { } +# Returns a list of @fields for use in VNWeb::HTML::revision_() +sub revision_extlinks { + my($type) = @_; + map { + my($f, $p) = ($_, $LINKS{$type}{$_}); + [ $f, $p->{label}, fmt => sub { TUWF::XML::a_ href => sprintf($p->{fmt}, $_), $_; }, empty => 0 ] + } sort keys $LINKS{$type}->%* +} + + 1; diff --git a/lib/VNDB/Handler/Staff.pm b/lib/VNDB/Handler/Staff.pm index 7da42e8d..adab2be8 100644 --- a/lib/VNDB/Handler/Staff.pm +++ b/lib/VNDB/Handler/Staff.pm @@ -3,180 +3,17 @@ package VNDB::Handler::Staff; use strict; use warnings; -use TUWF qw(:html :xml uri_escape xml_escape); +use TUWF qw(:html :xml uri_escape); use VNDB::Func; use VNDB::Types; -use VNDB::ExtLinks; use List::Util qw(first); TUWF::register( - qr{s([1-9]\d*)(?:\.([1-9]\d*))?} => \&page, qr{s/([a-z0]|all)} => \&list, qr{xml/staff\.xml} => \&staffxml, ); -sub page { - my($self, $id, $rev) = @_; - - my $method = $rev ? 'dbStaffGetRev' : 'dbStaffGet'; - my $s = $self->$method( - id => $id, - what => 'extended aliases roles', - $rev ? ( rev => $rev ) : () - )->[0]; - return $self->resNotFound if !$s->{id}; - enrich_extlinks s => $s; - - my $metadata = { - 'og:title' => $s->{name}, - 'og:description' => bb2text $s->{desc}, - }; - - $self->htmlHeader(title => $s->{name}, noindex => $rev, metadata => $metadata); - $self->htmlMainTabs('s', $s) if $id; - return if $self->htmlHiddenMessage('s', $s); - - if($rev) { - my $prev = $rev && $rev > 1 && $self->dbStaffGetRev(id => $id, rev => $rev-1, what => 'extended aliases')->[0]; - $self->htmlRevision('s', $prev, $s, - [ name => 'Name (romaji)', diff => 1 ], - [ original => 'Original name', diff => 1 ], - [ gender => 'Gender', serialize => sub { $GENDER{$_[0]} } ], - [ lang => 'Language', serialize => sub { "$_[0] ($LANGUAGE{$_[0]})" } ], - [ l_site => 'Official page', diff => 1 ], - [ l_wp => 'Wikipedia link', htmlize => sub { $_[0] ? sprintf '<a href="http://en.wikipedia.org/wiki/%s">%1$s</a>', xml_escape $_[0] : '[empty]' }], - [ l_wikidata=> 'Wikidata ID', htmlize => sub { $_[0] ? sprintf '<a href="https://www.wikidata.org/wiki/Q%d">Q%1$d</a>', $_[0] : '[empty]' } ], - [ l_twitter => 'Twitter account', diff => 1 ], - [ l_anidb => 'AniDB creator ID', serialize => sub { $_[0] // '' } ], - [ l_pixiv => 'Pixiv', htmlize => sub { $_[0] ? sprintf '<a href="https://www.pixiv.net/member.php?id=%d">%1$d</a>', $_[0] : '[empty]' } ], - [ desc => 'Description', diff => qr/[ ,\n\.]/ ], - [ aliases => 'Aliases', join => '<br />', split => sub { - map xml_escape(sprintf('%s%s', $_->{name}, $_->{original} ? ' ('.$_->{original}.')' : '')), @{$_[0]}; - }], - ); - } - - div class => 'mainbox staffpage'; - $self->htmlItemMessage('s', $s); - h1 $s->{name}; - h2 class => 'alttitle', lang => $s->{lang}, $s->{original} if $s->{original}; - - # info table - table class => 'stripe'; - thead; - Tr; - td colspan => 2; - b style => 'margin-right: 10px', $s->{name}; - b class => 'grayedout', style => 'margin-right: 10px', lang => $s->{lang}, $s->{original} if $s->{original}; - cssicon "gen $s->{gender}", $GENDER{$s->{gender}} if $s->{gender} ne 'unknown'; - end; - end; - end; - Tr; - td class => 'key', 'Language'; - td $LANGUAGE{$s->{lang}}; - end; - if(@{$s->{aliases}}) { - Tr; - td class => 'key', @{$s->{aliases}} == 1 ? 'Alias' : 'Aliases'; - td; - table class => 'aliases'; - for my $alias (@{$s->{aliases}}) { - Tr class => 'nostripe'; - td $alias->{original} ? () : (colspan => 2), class => 'key'; - txt $alias->{name}; - end; - td lang => $s->{lang}, $alias->{original} if $alias->{original}; - end; - } - end; - end; - end; - } - if($s->{extlinks}->@*) { - Tr; - td class => 'key', 'Links'; - td; - for($s->{extlinks}->@*) { - a href => $_->[1], $_->[0]; - br if $_ != $s->{extlinks}[$#{$s->{extlinks}}]; - } - end; - end; - } - end 'table'; - - # description - p class => 'description'; - lit bb2html $s->{desc}, 0, 1; - end; - end; - - _roles($self, $s); - _cast($self, $s); - $self->htmlFooter; -} - - -sub _roles { - my($self, $s) = @_; - return if !@{$s->{roles}}; - - h1 class => 'boxtitle', 'Credits'; - $self->htmlBrowse( - items => $s->{roles}, - class => 'staffroles', - header => [ - [ 'Title' ], - [ 'Released' ], - [ 'Role' ], - [ 'As' ], - [ 'Note' ], - ], - row => sub { - my($r, $n, $l) = @_; - Tr; - td class => 'tc1'; a href => "/v$l->{vid}", title => $l->{t_original}||$l->{title}, shorten $l->{title}, 60; end; - td class => 'tc2'; lit fmtdatestr $l->{c_released}; end; - td class => 'tc3', $CREDIT_TYPE{$l->{role}}; - td class => 'tc4', title => $l->{original}||$l->{name}, $l->{name}; - td class => 'tc5', $l->{note}; - end; - }, - ); -} - - -sub _cast { - my($self, $s) = @_; - return if !@{$s->{cast}}; - - h1 class => 'boxtitle', sprintf 'Voiced characters (%d)', scalar @{$s->{cast}}; - $self->htmlBrowse( - items => $s->{cast}, - class => 'staffroles', - header => [ - [ 'Title' ], - [ 'Released' ], - [ 'Cast' ], - [ 'As' ], - [ 'Note' ], - ], - row => sub { - my($r, $n, $l) = @_; - Tr; - td class => 'tc1'; a href => "/v$l->{vid}", title => $l->{t_original}||$l->{title}, shorten $l->{title}, 60; end; - td class => 'tc2'; lit fmtdatestr $l->{c_released}; end; - td class => 'tc3'; a href => "/c$l->{cid}", title => $l->{c_original}, $l->{c_name}; end; - td class => 'tc4', title => $l->{original}||$l->{name}, $l->{name}; - td class => 'tc5', $l->{note}; - end; - }, - ); -} - - sub list { my ($self, $char) = @_; diff --git a/lib/VNDB/Util/CommonHTML.pm b/lib/VNDB/Util/CommonHTML.pm index b56a7c74..c6986c1c 100644 --- a/lib/VNDB/Util/CommonHTML.pm +++ b/lib/VNDB/Util/CommonHTML.pm @@ -116,7 +116,6 @@ sub htmlHiddenMessage { my $editsum = $type eq 'v' ? $self->dbVNGetRev(id => $obj->{id})->[0]{comments} : $type eq 'r' ? $self->dbReleaseGetRev(id => $obj->{id})->[0]{comments} : $type eq 'c' ? $self->dbCharGetRev(id => $obj->{id})->[0]{comments} - : $type eq 's' ? $self->dbStaffGetRev(id => $obj->{id})->[0]{comments} : $self->dbProducerGetRev(id => $obj->{id})->[0]{comments}; div class => 'mainbox'; h1 $obj->{title}||$obj->{name}; |