Implemented the server side of the new release filter selector

There's no validation of the filter string yet, and somehow I don't feel
like adding that; it's a lot of code and there's nothing to protect -
the values are inserted using parameters into a SELECT query, the worst
thing that could happen is the user receiving a 500.

Also, I've started using the perl '//=' operator, which was added in
5.10. This removes support for older perls.

2 files changed, 48 insertions, 40 deletions

diff --git a/lib/VNDB/Handler/Misc.pm b/lib/VNDB/Handler/Misc.pm
index 815f308f..1a2df93b 100644
--- a/lib/VNDB/Handler/Misc.pm
+++ b/lib/VNDB/Handler/Misc.pm
@@ -138,7 +138,7 @@ sub homepage {
     # Upcoming releases
     td;
      h1;
-      a href => strftime('/r?mi=%Y%m%d;o=a;s=released', gmtime), mt '_home_upcoming';
+      a href => strftime('/r?fil=date_after-%Y%m%d;o=a;s=released', gmtime), mt '_home_upcoming';
      end;
      my $upcoming = $self->dbReleaseGet(results => 10, unreleased => 1, what => 'platforms');
      ul;
@@ -158,7 +158,7 @@ sub homepage {
     # Just released
     td;
      h1;
-      a href => strftime('/r?ma=%Y%m%d;o=d;s=released', gmtime), mt '_home_justreleased';
+      a href => strftime('/r?fil=date_before-%Y%m%d;o=d;s=released', gmtime), mt '_home_justreleased';
      end;
      my $justrel = $self->dbReleaseGet(results => 10, sort => 'released', reverse => 1, unreleased => 0, what => 'platforms');
      ul;
diff --git a/lib/VNDB/Handler/Releases.pm b/lib/VNDB/Handler/Releases.pm
index 735491f2..63ea0922 100644
--- a/lib/VNDB/Handler/Releases.pm
+++ b/lib/VNDB/Handler/Releases.pm
@@ -485,51 +485,27 @@ sub browse {
 
   my $f = $self->formValidate(
     { name => 'p',  required => 0, default => 1, template => 'int' },
-    { name => 's',  required => 0, default => 'title', enum => [qw|released minage title|] },
     { name => 'o',  required => 0, default => 'a', enum => ['a', 'd'] },
     { name => 'q',  required => 0, default => '', maxlength => 500 },
-    { name => 'ln', required => 0, multi => 1, default => '', enum => $self->{languages} },
-    { name => 'pl', required => 0, multi => 1, default => '', enum => $self->{platforms} },
-    { name => 'me', required => 0, multi => 1, default => '', enum => [ keys %{$self->{media}} ] },
-    { name => 'tp', required => 0, default => '', enum => [ '', @{$self->{release_types}} ] },
-    { name => 'pa', required => 0, default => 0, enum => [ 0..2 ] },
-    { name => 'fw', required => 0, default => 0, enum => [ 0..2 ] },
-    { name => 'do', required => 0, default => 0, enum => [ 0..2 ] },
-    { name => 'ma_m', required => 0, default => 0, enum => [ 0, 1 ] },
-    { name => 'ma_a', required => 0, default => 0, enum => [ grep defined($_), @{$self->{age_ratings}} ] },
-    { name => 'mi', required => 0, default => 0, template => 'int' },
-    { name => 'ma', required => 0, default => 99999999, template => 'int' },
-    { name => 're', required => 0, multi => 1, default => 0, enum => [ 1..$#{$self->{resolutions}} ] },
+    { name => 's',  required => 0, default => 'title', enum => [qw|released minage title|] },
+    { name => 'fil',required => 0, default => '' },
   );
   return 404 if $f->{_err};
 
-  my @filters = (
-    $f->{mi} > 0 || $f->{ma} < 99990000 ? (date => [ $f->{mi}, $f->{ma} ]) : (),
-    $f->{q} ? (search => $f->{q}) : (),
-    $f->{pl}[0] ? (platforms => $f->{pl}) : (),
-    $f->{ln}[0] ? (languages => $f->{ln}) : (),
-    $f->{me}[0] ? (media => $f->{me}) : (),
-    $f->{re}[0] ? (resolutions => $f->{re} ) : (),
-    $f->{tp} ? (type => $f->{tp}) : (),
-    $f->{ma_a} || $f->{ma_m} ? (minage => [$f->{ma_m}, $f->{ma_a}]) : (),
-    $f->{pa} ? (patch => $f->{pa}) : (),
-    $f->{fw} ? (freeware => $f->{fw}) : (),
-    $f->{do} ? (doujin => $f->{do}) : (),
-  );
-  my($list, $np) = !@filters ? ([], 0) : $self->dbReleaseGet(
+  # TODO: validate the filter string?
+  my $fil = fil_parse $f->{fil};
+  _fil_compat($self, $fil);
+  $f->{fil} = fil_serialize($fil);
+
+  my($list, $np) = !$f->{q} && !keys %$fil ? ([], 0) : $self->dbReleaseGet(
     sort => $f->{s}, reverse => $f->{o} eq 'd',
     page => $f->{p},
     results => 50,
     what => 'platforms',
-    @filters,
+    $f->{q} ? ( search => $f->{q} ) : (),
+    %$fil
   );
 
-  my $url = "/r?tp=$f->{tp};pa=$f->{pa};ma_m=$f->{ma_m};ma_a=$f->{ma_a};q=$f->{q};mi=$f->{mi};ma=$f->{ma};do=$f->{do};fw=$f->{fw}";
-  $_&&($url .= ";ln=$_") for @{$f->{ln}};
-  $_&&($url .= ";pl=$_") for @{$f->{pl}};
-  $_&&($url .= ";re=$_") for @{$f->{re}};
-  $_&&($url .= ";me=$_") for @{$f->{me}};
-
   $self->htmlHeader(title => mt('_rbrowse_title'));
 
   form method => 'get', action => '/r', 'accept-charset' => 'UTF-8';
@@ -539,7 +515,7 @@ sub browse {
    a id => 'filselect', href => '#';
     lit '<i>&#9656;</i> '.mt('_rbrowse_filters').'<i></i>';
    end;
-   input type => 'hidden', class => 'hidden', name => 'fil', id => 'fil', value => '';
+   input type => 'hidden', class => 'hidden', name => 'fil', id => 'fil', value => $f->{fil};
   end;
 
   $self->htmlBrowse(
@@ -547,8 +523,8 @@ sub browse {
     items    => $list,
     options  => $f,
     nextpage => $np,
-    pageurl  => "$url;s=$f->{s};o=$f->{o}",
-    sorturl  => $url,
+    pageurl  => "/r?q=$f->{q};fil=$f->{fil};s=$f->{s};o=$f->{o}",
+    sorturl  => "/r?q=$f->{q};fil=$f->{fil}",
     header   => [
       [ mt('_rbrowse_col_released'), 'released' ],
       [ mt('_rbrowse_col_minage'),   'minage' ],
@@ -574,7 +550,7 @@ sub browse {
       end;
     },
   ) if @$list;
-  if(@filters && !@$list) {
+  if(($f->{q} || keys %$fil) && !@$list) {
     div class => 'mainbox';
      h1 mt '_rbrowse_noresults_title';
      div class => 'notice';
@@ -586,5 +562,37 @@ sub browse {
 }
 
 
+# provide compatibility with old filter URLs
+sub _fil_compat {
+  my($self, $fil) = @_;
+  my $f = $self->formValidate(
+    { name => 'ln', required => 0, multi => 1, default => '', enum => $self->{languages} },
+    { name => 'pl', required => 0, multi => 1, default => '', enum => $self->{platforms} },
+    { name => 'me', required => 0, multi => 1, default => '', enum => [ keys %{$self->{media}} ] },
+    { name => 'tp', required => 0, default => '', enum => [ '', @{$self->{release_types}} ] },
+    { name => 'pa', required => 0, default => 0, enum => [ 0..2 ] },
+    { name => 'fw', required => 0, default => 0, enum => [ 0..2 ] },
+    { name => 'do', required => 0, default => 0, enum => [ 0..2 ] },
+    { name => 'ma_m', required => 0, default => 0, enum => [ 0, 1 ] },
+    { name => 'ma_a', required => 0, default => 0, enum => [ grep defined($_), @{$self->{age_ratings}} ] },
+    { name => 'mi', required => 0, default => 0, template => 'int' },
+    { name => 'ma', required => 0, default => 99999999, template => 'int' },
+    { name => 're', required => 0, multi => 1, default => 0, enum => [ 1..$#{$self->{resolutions}} ] },
+  );
+  return if $f->{_err};
+  $fil->{minage} //= [ grep defined($_) && $f->{ma_m} ? $f->{ma_a} >= $_ : $f->{ma_a} <= $_, @{$self->{age_ratings}} ] if $f->{ma_a} || $f->{ma_m};
+  $fil->{date_after} //= $f->{mi}  if $f->{mi};
+  $fil->{date_before} //= $f->{ma} if $f->{ma} < 99990000;
+  $fil->{plat} //= $f->{pl}        if $f->{pl}[0];
+  $fil->{lang} //= $f->{ln}        if $f->{ln}[0];
+  $fil->{med} //= $f->{me}         if $f->{me}[0];
+  $fil->{resolution} //= $f->{re}  if $f->{re}[0];
+  $fil->{type} //= $f->{tp}        if $f->{tp};
+  $fil->{patch} //= $f->{pa} == 2 ? 0 : 1 if $f->{pa};
+  $fil->{freeware} //= $f->{fw} == 2 ? 0 : 1 if $f->{fw};
+  $fil->{doujin} //= $f->{do} == 2 ? 0 : 1 if $f->{do};
+}
+
+
 1;