duckduckgo
/
zeroclickinfo-goodies
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Timer: Changed query_raw to query_lc (#4165) 

* Timer: Changed query_raw to query_lc
* also fixes #4188 (regression from ambiguous triggers)

* Updated regex and also solve issue #4188

* Added one more test case
master
Shivam Shukla 2017-05-19 02:24:35 +05:30 committed by Matthew Ramina
parent 03c20c1587
commit 9ca979f198
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/DDG/Goodie/Timer.pm
View File

@ -87,7 +87,7 @@ sub build_result {
handle remainder => sub {
my $qry = $_;
my $raw = lc($req->query_raw);
my $raw = $req->query_lc;
my $trgx = join('|', @triggers);
my $nonStrpTrgx = join('|', @nonStrippedTriggers);
my $ambTrgx = join('|', @ambigousTriggers);
@ -109,7 +109,7 @@ handle remainder => sub {
# When ambigous words are present in triggers then it should not
# invoke Timer IA.
if($raw =~ /^\s*$ambTrgx\s*$/i){
if($raw =~ /^($ambTrgx)$/){
return;
}
# When the query is empty and we know that the trigger word matches
@ -125,7 +125,7 @@ handle remainder => sub {
# <startTriggers> <trigger> <beautifierTriggers> <specific time> ------------- begin timer online 10 minutes
# <startTriggers> <trigger> <beautifierTriggers> <joiners> <specific time> --- set timer online for 10 min
$raw =~ s/^\s*(\b(\s*($btfrTrigStart)\s*)\b){1,$btfrTrigSize}\s*//;
$raw =~ s/\s*($btfrTrgx)\s*$//;
$raw =~ s/($btfrTrgx)$//;
# Parse the raw query to remove common terms. This allows us to
# catch the more specific queries and handle them. We also strip
@ -148,7 +148,7 @@ handle remainder => sub {
# <specific time> <trigger> <beautifierTriggers> ------------------------------ 10 minute countdown timer online
# <startTriggers> <beautifierTriggers> <trigger> <specific time> ------------- online countdown alarm 10 minutes
# <beautifierTriggers> <trigger> <joiners> <specific time> -------------------- online timer with 10 min
$raw =~ s/\s*($btfrTrgx\s*)?(\b(\s*($trgx)\s*)\b)($btfrTrgx)?\s*($joinTrgx)?\s*//ig;
$raw =~ s/($btfrTrgx\s*)?(\b(\s*($trgx)\s*)\b)($btfrTrgx)?\s*($joinTrgx)?//ig;
if($raw eq '') {
return build_result($req);

1
t/Timer.t
View File

@ -101,6 +101,7 @@ ddg_goodie_test(
'10 minutes' => build_test('600'),
'20 mins' => build_test('1200'),
'timer 20 minutes' => build_test('1200'),
'timer 60 minutes' => build_test('3600'),
# Should not trigger
'start 30 minutes for timer' => undef,
'run with timer' => undef,