1 files changed, 20 insertions, 53 deletions

diff --git a/lib/VNDB/Handler/VNBrowse.pm b/lib/VNDB/Handler/VNBrowse.pm
index 8e30da99..8a63b79b 100644
--- a/lib/VNDB/Handler/VNBrowse.pm
+++ b/lib/VNDB/Handler/VNBrowse.pm
@@ -25,72 +25,40 @@ sub list {
   );
   return 404 if $f->{_err};
   $f->{q} ||= $f->{sq};
-  my $fil = fil_parse $f->{fil}, qw|length hasani taginc tagexc tagspoil lang olang plat|;
-  _fil_compat($self, $fil);
-
-  if($f->{q}) {
-    return $self->resRedirect('/'.$1.$2.(!$3 ? '' : $1 eq 'd' ? '#'.$3 : '.'.$3), 'temp')
-      if $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;
-
-  # TODO: this should be moved to dbVNGet() in order for savable VN filters to be useful
-  my @ignored;
-  my $tagfind = sub {
-    return map {
-      my $i = $self->dbTagGet(name => $_)->[0];
-      push @ignored, [$_, 0] if !$i;
-      push @ignored, [$_, 1] if $i && $i->{meta};
-      $i && !$i->{meta} ? $i->{id} : ();
-    } grep $_, ref $_[0] ? @{$_[0]} : ($_[0]||'')
-  };
-  my @ti = $tagfind->(delete $fil->{taginc});
-  my @te = $tagfind->(delete $fil->{tagexc});
-
-  $f->{s} = 'title' if !@ti && $f->{s} eq 'tagscore';
+  $f->{fil} = $self->authPref('filter_vn') if !grep $_ eq 'fil', $self->reqParam();
+  my %compat = _fil_compat($self);
+
+  return $self->resRedirect('/'.$1.$2.(!$3 ? '' : $1 eq 'd' ? '#'.$3 : '.'.$3), 'temp')
+    if $f->{q} && $f->{q} =~ /^([gvrptud])([0-9]+)(?:\.([0-9]+))?$/;
+
+  $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',
-    @ti ? (tags_include => [ delete $fil->{tagspoil}, \@ti ]) : (),
-    @te ? (tags_exclude => \@te) : (),
-    %$fil
-  );
+  });
 
   $self->resRedirect('/v'.$list->[0]{id}, 'temp')
     if $f->{q} && @$list == 1 && $f->{p} == 1;
 
   $self->htmlHeader(title => mt('_vnbrowse_title'), search => $f->{q});
 
+  my $quri = uri_escape($f->{q});
   form action => '/v/all', 'accept-charset' => 'UTF-8', method => 'get';
   div class => 'mainbox';
    h1 mt '_vnbrowse_title';
    $self->htmlSearchBox('v', $f->{q});
    p class => 'browseopts';
     for ('all', 'a'..'z', 0) {
-      a href => "/v/$_?q=$f->{q};fil=$f->{fil}", $_ eq $char ? (class => 'optselected') : (), $_ eq 'all' ? mt('_char_all') : $_ ? uc $_ : '#';
+      a href => "/v/$_?q=$quri;fil=$f->{fil}", $_ eq $char ? (class => 'optselected') : (), $_ eq 'all' ? mt('_char_all') : $_ ? uc $_ : '#';
     }
    end;
 
-   if(@ignored) {
-     div class => 'warning';
-      h2 mt '_vnbrowse_tagign_title';
-      ul;
-       li $_->[0].' ('.mt('_vnbrowse_tagign_'.($_->[1]?'meta':'notfound')).')' for @ignored;
-      end;
-     end;
-   }
-
    a id => 'filselect', href => '#v';
     lit '<i>&#9656;</i> '.mt('_rbrowse_filters').'<i></i>'; # TODO: it's not *r*browse
    end;
@@ -98,25 +66,24 @@ sub list {
   end;
   end; # /form
 
-  $self->htmlBrowseVN($list, $f, $np, "/v/$char?q=$f->{q};fil=$f->{fil}", scalar @ti);
-  $self->htmlFooter;
+  $self->htmlBrowseVN($list, $f, $np, "/v/$char?q=$quri;fil=$f->{fil}", $f->{fil} =~ /tag_inc-/);
+  $self->htmlFooter(prefs => ['filter_vn']);
 }
 
 
 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};
+  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;
 }