mplayer: link mpv subpage, distinguish metadata

diff --git a/mplayer.eng.inc.pl b/mplayer.eng.inc.pl
index 930fe97fd6013dc5e4bfea300222ddc4438a11c3..6c79fc9474ee93304835b8f5c933c2e02c5a3bb2 100644 (file)
--- a/mplayer.eng.inc.pl
+++ b/mplayer.eng.inc.pl
@@ -1,6 +1,13 @@
 use utf8;
 
 {
+title => 'MPlayer',
+intro => join("\n",
+       'Default interface controls for the original MPlayer v1.0 media player.',
+       'Mostly inherited by <a href="/mplayer/mpv">mpv</a>.',
+),
+keywords => [qw'mpv mplayer mplayer2 media player video audio'],
+
 key => {
        '[' => "slow down 10%",
        ']' => "speed up 10%",

diff --git a/mplayer.plp b/mplayer.plp
index 9e97d71837886f00bde14b35f4ded7342e0a9e45..30c72a9bab57434ccce535198eea80601059b4c0 100644 (file)
--- a/mplayer.plp
+++ b/mplayer.plp
@@ -1,17 +1,19 @@
 <(common.inc.plp)><:
 
-my $mode = $Request eq 'mpv' ? $Request : 'MPlayer';
-my $include = "\L$mode.eng";
+my $mode = lc($Request || 'mplayer');
+my $include = "$mode.eng";
+
+my $info = eval { Data($include) } || {};
+$mode = $info->{title} // $mode;
 
 Html({
        title => "\L$mode\E cheat sheet",
-       version => '1.2',
+       version => '1.3',
        description => [
                "Keyboard cheat sheet for the $mode media player,",
                "overviewing the default controls."
        ],
-       keywords => [qw'
-               mpv mplayer mplayer2 media player video audio
+       keywords => [@{ $info->{keywords} // [] }, qw'
                sheet cheat reference overview control shortkey keyboard
        '],
        stylesheet => [qw( light dark circus mono red )],
@@ -19,8 +21,13 @@ Html({
        data => ["$include.inc.pl"],
 });
 
+%{$info} or Abort(
+       "Requested keyboard <q>$mode</q> not available",
+       '404 request not found',
+);
+
 say "<h1>$mode cheat sheet</h1>";
-say '';
+say "<p>$_</p>" for $info->{intro} // ();
 
 use Shiar_Sheet::Keyboard 2.08;
 my $info = Data($include);

diff --git a/mpv.eng.inc.pl b/mpv.eng.inc.pl
index 804714147f0595590916094e931256977ebd83df..33c3a43f8ce0d2c4426a7b90fc0a6cb76b423171 100644 (file)
--- a/mpv.eng.inc.pl
+++ b/mpv.eng.inc.pl
@@ -3,6 +3,13 @@ use utf8;
 my $legacy = do 'mplayer.eng.inc.pl' or die $@;
 
 {
+title => 'mpv',
+intro => join("\n",
+       'Default interface controls for version 0.28 of the mpv media player.',
+       'Differences from the original <a href="/mplayer">MPlayer</a> are indicated.',
+),
+keywords => $legacy->{keywords},
+
 key => { %{ $legacy->{key} },
        ',' => "step backward<>s",
        'Q' => "save and quit",