CHANGELOG.md

@@ -1,9 +1,4 @@
 # looqs: Release notes
-## 2022-07-30 - v0.5.1
-
-CHANGES:
-	- gui: Fix regression in implicit paths queries introduced in previous version
-
 ## 2022-07-29 - v0.5
 This release features multiple fixes and enhancements.
 

README.md

@@ -29,7 +29,7 @@ There is no need to write the long form of filters. There are also booleans avai
 The screenshots in this section may occasionally be slightly outdated, but they are usually recent enough to get an overall impression of the current state of the GUI.
 
 ## Current status
-Latest version: 2022-07-30, v0.5.1
+Latest version: 2022-07-29, v0.5
 
 Please see [Changelog](CHANGELOG.md) for a human readable list of changes.
 

gui/mainwindow.cpp

@@ -508,6 +508,7 @@ void MainWindow::lineEditReturnPressed()
 			LooqsQuery pathsQuery = tmpQuery;
 
 			this->contentSearchQuery = tmpQuery;
+			this->contentSearchQuery.setTokens({});
 
 			bool addContentSearch = false;
 			bool addPathSearch = false;
@@ -525,15 +526,17 @@ void MainWindow::lineEditReturnPressed()
 				return tokens;
 			};
 
-			/* An explicit search, no lone words. We just pass it on */
+			/* An explicit search, we just pass it on */
 			if(!(tmpQuery.getTokensMask() & TokenType::WORD))
 			{
 				if(tmpQuery.hasContentSearch())
 				{
+					this->contentSearchQuery.setTokens(createFinalTokens(TokenType::FILTER_CONTENT_CONTAINS));
 					addContentSearch = true;
 				}
 				else
 				{
+					this->contentSearchQuery.setTokens(createFinalTokens(TokenType::FILTER_PATH_CONTAINS));
 					addPathSearch = true;
 				}
 			}
@@ -548,7 +551,8 @@ void MainWindow::lineEditReturnPressed()
 			/* A content search and lone words, e. g. c:("to be or not") ebooks */
 			else if(tmpQuery.hasContentSearch() && (tmpQuery.getTokensMask() & TokenType::WORD))
 			{
-				this->contentSearchQuery = LooqsQuery::build(q, TokenType::FILTER_PATH_CONTAINS, false);
+				this->contentSearchQuery = tmpQuery;
+				this->contentSearchQuery.setTokens(createFinalTokens(TokenType::FILTER_PATH_CONTAINS));
 				addContentSearch = true;
 				addPathSearch = false;
 			}
@@ -556,7 +560,7 @@ void MainWindow::lineEditReturnPressed()
 			else if(!tmpQuery.hasPathSearch() && !tmpQuery.hasContentSearch())
 			{
 				this->contentSearchQuery.setTokens(createFinalTokens(TokenType::FILTER_CONTENT_CONTAINS));
-				pathsQuery = LooqsQuery::build(q, TokenType::FILTER_PATH_CONTAINS, false);
+				pathsQuery.setTokens(createFinalTokens(TokenType::FILTER_PATH_CONTAINS));
 				addContentSearch = true;
 				addPathSearch = true;
 			}
@@ -576,10 +580,6 @@ void MainWindow::lineEditReturnPressed()
 				}
 				results.append(searcher.search(this->contentSearchQuery));
 			}
-			else
-			{
-				this->contentSearchQuery.setTokens({});
-			}
 			return results;
 		});
 	searchWatcher.setFuture(searchFuture);