Implemented filFetchDB() and converted the VN/Release browser to use it

This will correctly handle fetching stuff from the database when
permanent filters are enabled.

This update also removes compatibility with some old VN browse URLs. The
old 'ti' and 'te' (tag include/exclude) query parameters are now
ignored, and searching for a language in the query string (e.g.
"q=English") won't enable the language filter.

2 files changed, 34 insertions, 57 deletions

diff --git a/lib/VNDB/Handler/Releases.pm b/lib/VNDB/Handler/Releases.pm
index 6163e1f2..9422a836 100644
--- a/lib/VNDB/Handler/Releases.pm
+++ b/lib/VNDB/Handler/Releases.pm
@@ -488,18 +488,14 @@ sub browse {
   );
   return 404 if $f->{_err};
 
-  my $fil = fil_parse $f->{fil}, qw|type patch freeware doujin date_before date_after minage lang olang resolution plat med voiced ani_story ani_ero|;
-  _fil_compat($self, $fil);
-  $f->{fil} = fil_serialize($fil);
-
-  my($list, $np) = !$f->{q} && !keys %$fil ? ([], 0) : $self->dbReleaseGet(
+  my %compat = _fil_compat($self);
+  my($list, $np) = !$f->{q} && !$f->{fil} && !keys %compat ? ([], 0) : $self->filFetchDB(release => $f->{fil}, \%compat, {
     sort => $f->{s}, reverse => $f->{o} eq 'd',
     page => $f->{p},
     results => 50,
     what => 'platforms',
     $f->{q} ? ( search => $f->{q} ) : (),
-    %$fil
-  );
+  });
 
   $self->htmlHeader(title => mt('_rbrowse_title'));
 
@@ -546,7 +542,7 @@ sub browse {
       end;
     },
   ) if @$list;
-  if(($f->{q} || keys %$fil) && !@$list) {
+  if(($f->{q} || $f->{fil}) && !@$list) {
     div class => 'mainbox';
      h1 mt '_rbrowse_noresults_title';
      div class => 'notice';
@@ -558,9 +554,10 @@ sub browse {
 }
 
 
-# provide compatibility with old filter URLs
+# provide compatibility with old URLs
 sub _fil_compat {
-  my($self, $fil) = @_;
+  my $self = shift;
+  my %c;
   my $f = $self->formValidate(
     { name => 'ln', required => 0, multi => 1, default => '', enum => $self->{languages} },
     { name => 'pl', required => 0, multi => 1, default => '', enum => $self->{platforms} },
@@ -575,18 +572,19 @@ sub _fil_compat {
     { 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 $_ >= 0 && ($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};
+  return () if $f->{_err};
+  $c{minage} = [ grep $_ >= 0 && ($f->{ma_m} ? $f->{ma_a} >= $_ : $f->{ma_a} <= $_), @{$self->{age_ratings}} ] if $f->{ma_a} || $f->{ma_m};
+  $c{date_after} = $f->{mi}  if $f->{mi};
+  $c{date_before} = $f->{ma} if $f->{ma} < 99990000;
+  $c{plat} = $f->{pl}        if $f->{pl}[0];
+  $c{lang} = $f->{ln}        if $f->{ln}[0];
+  $c{med} = $f->{me}         if $f->{me}[0];
+  $c{resolution} = $f->{re}  if $f->{re}[0];
+  $c{type} = $f->{tp}        if $f->{tp};
+  $c{patch} = $f->{pa} == 2 ? 0 : 1 if $f->{pa};
+  $c{freeware} = $f->{fw} == 2 ? 0 : 1 if $f->{fw};
+  $c{doujin} = $f->{do} == 2 ? 0 : 1 if $f->{do};
+  return %c;
 }
 
 
diff --git a/lib/VNDB/Handler/VNBrowse.pm b/lib/VNDB/Handler/VNBrowse.pm
index 25166717..15407076 100644
--- a/lib/VNDB/Handler/VNBrowse.pm
+++ b/lib/VNDB/Handler/VNBrowse.pm
@@ -25,32 +25,22 @@ sub list {
   );
   return 404 if $f->{_err};
   $f->{q} ||= $f->{sq};
-  my $fil = fil_parse $f->{fil}, qw|length hasani tag_inc tag_exc taginc tagexc tagspoil lang olang plat|;
-  _fil_compat($self, $fil);
+  my %compat = _fil_compat($self);
 
-  if($f->{q}) {
-    return $self->resRedirect('/'.$1.$2.(!$3 ? '' : $1 eq 'd' ? '#'.$3 : '.'.$3), 'temp')
-      if $f->{q} =~ /^([gvrptud])([0-9]+)(?:\.([0-9]+))?$/;
+  return $self->resRedirect('/'.$1.$2.(!$3 ? '' : $1 eq 'd' ? '#'.$3 : '.'.$3), 'temp')
+    if $f->{q} && $f->{q} =~ /^([gvrptud])([0-9]+)(?:\.([0-9]+))?$/;
 
-    # for URL compatibilty with older versions (ugly hack to get English strings)
-    my @lang;
-    $f->{q} =~ s/\s*$VNDB::L10N::en::Lexicon{"_lang_$_"}\s*//&&push @lang, $_ for (@{$self->{languages}});
-    $fil->{lang} = $fil->{lang} ? [ ref($fil->{lang}) ? @{$fil->{lang}} : $fil->{lang}, @lang ] : \@lang if @lang;
-  }
-  $f->{fil} = fil_serialize $fil;
-
-  $f->{s} = 'title' if !$fil->{tag_inc} && $f->{s} eq 'tagscore';
+  $f->{s} = 'title' if $f->{fil} !~ /tag_inc-/ && $f->{s} eq 'tagscore';
   $f->{o} = $f->{s} eq 'tagscore' ? 'd' : 'a' if !$f->{o};
 
-  my($list, $np) = $self->dbVNGet(
+  my($list, $np) = $self->filFetchDB(vn => $f->{fil}, \%compat, {
     what => 'rating',
     $char ne 'all' ? ( char => $char ) : (),
     $f->{q} ? ( search => $f->{q} ) : (),
     results => 50,
     page => $f->{p},
     sort => $f->{s}, reverse => $f->{o} eq 'd',
-    %$fil
-  );
+  });
 
   $self->resRedirect('/v'.$list->[0]{id}, 'temp')
     if $f->{q} && @$list == 1 && $f->{p} == 1;
@@ -74,35 +64,24 @@ sub list {
   end;
   end; # /form
 
-  $self->htmlBrowseVN($list, $f, $np, "/v/$char?q=$f->{q};fil=$f->{fil}", $fil->{tag_inc});
+  $self->htmlBrowseVN($list, $f, $np, "/v/$char?q=$f->{q};fil=$f->{fil}", $f->{fil} =~ /tag_inc-/);
   $self->htmlFooter;
 }
 
 
 sub _fil_compat {
-  my($self, $fil) = @_;
+  my $self = shift;
+  my %c;
   my $f = $self->formValidate(
     { name => 'ln', required => 0, multi => 1, enum => $self->{languages}, default => '' },
     { name => 'pl', required => 0, multi => 1, enum => $self->{platforms}, default => '' },
-    { name => 'ti', required => 0, default => '', maxlength => 200 },
-    { name => 'te', required => 0, default => '', maxlength => 200 },
     { name => 'sp', required => 0, default => $self->reqCookie($self->{cookie_prefix}.'tagspoil') =~ /^([0-2])$/ ? $1 : 0, enum => [0..2] },
   );
-  $fil->{lang}     //= $f->{ln} if $f->{ln}[0];
-  $fil->{plat}     //= $f->{pl} if $f->{pl}[0];
-  $fil->{taginc}   //= $f->{ti} if $f->{ti};
-  $fil->{tagexc}   //= $f->{te} if $f->{te};
-  $fil->{tagspoil} //= $f->{sp};
-
-  # older tag specification (by name rather than ID)
-  my $tagfind = sub {
-    return map {
-      my $i = $self->dbTagGet(name => $_)->[0];
-      $i && !$i->{meta} ? $i->{id} : ();
-    } grep $_, ref $_[0] ? @{$_[0]} : ($_[0]||'')
-  };
-  $fil->{tag_inc} //= [ $tagfind->(delete $fil->{taginc}) ] if $fil->{taginc};
-  $fil->{tag_exc} //= [ $tagfind->(delete $fil->{tagexc}) ] if $fil->{tagexc};
+  return () if $f->{_err};
+  $c{lang}     //= $f->{ln} if $f->{ln}[0];
+  $c{plat}     //= $f->{pl} if $f->{pl}[0];
+  $c{tagspoil} //= $f->{sp};
+  return %c;
 }