]> cloud.milkyroute.net Git - dolphin.git/commit
fix(search): Correctly parse filename and/or content search
authorIsmael Asensio <isma.af@gmail.com>
Sat, 21 Dec 2019 18:14:17 +0000 (19:14 +0100)
committerIsmael Asensio <isma.af@gmail.com>
Sat, 21 Dec 2019 18:17:18 +0000 (19:17 +0100)
commit616d4e6bdd707ac819707263255809df576a8c2b
tree832f183210281c002423d7cac2ea1d649824ddac
parent8c386bdb4733fc12c5e8f411d59c79f97e412f9e
fix(search): Correctly parse filename and/or content search

Summary:
Currently, the search url parsing does not detect if the search is based on Content or Filename, and it just keeps the last selection which can be inconsistent with the actual search.

This patch add such detection, and since an advanced user can combine filename and content search (using the keyword `filename:`), now the parsing detects both items and handles the four possible cases:

| Content | Filename | Search text | Search type |
|---|---|------------------------|------------------|
| T | T | abc filename:"xyz"  | Content          |
| T | F | abc                           | Content          |
| F | T | xyz                           | Filename         |
| F | F |                                  | do not set       |

Depends on: D25260

Test Plan: `bin/dolphinquerytest`: Added new test cases for searches with content text and/or filename

Reviewers: elvisangelaccio, bruns, #dolphin

Reviewed By: elvisangelaccio, #dolphin

Subscribers: kfm-devel

Tags: #dolphin

Differential Revision: https://phabricator.kde.org/D25416
src/search/dolphinquery.cpp
src/search/dolphinquery.h
src/search/dolphinsearchbox.cpp
src/tests/dolphinquerytest.cpp