goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

show warning on invalid search terms GitHub issue #160

dbus-notify
Zlatin Balevsky 2022-08-07 14:18:55 +01:00
parent 14ff1e8597
commit 0b5bd87cdf
No known key found for this signature in database
GPG Key ID: A72832072D525E41
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy
View File

@ -165,15 +165,6 @@ class MainFrameController {
} }
def uuid = UUID.randomUUID() def uuid = UUID.randomUUID()
Map<String, Object> params = new HashMap<>()
params["search-terms"] = search
params["uuid"] = uuid.toString()
params["core"] = core
params["settings"] = view.settings
params["tab"] = tab
params["regex"] = regexSearch
def group = mvcGroup.createMVCGroup("SearchTab", uuid.toString(), params)
model.results[uuid.toString()] = group
def searchEvent def searchEvent
byte [] payload byte [] payload
@ -188,6 +179,11 @@ class MainFrameController {
payload = search.getBytes(StandardCharsets.UTF_8) payload = search.getBytes(StandardCharsets.UTF_8)
} else { } else {
terms = SplitPattern.termify(search) terms = SplitPattern.termify(search)
if (terms.length == 0) {
JOptionPane.showMessageDialog(null, trans("INVALID_SEARCH_TERM"),
trans("INVALID_SEARCH_TERM"), JOptionPane.WARNING_MESSAGE)
return
}
payload = String.join(" ", terms).getBytes(StandardCharsets.UTF_8) payload = String.join(" ", terms).getBytes(StandardCharsets.UTF_8)
} }
searchEvent = new SearchEvent(searchTerms : terms, uuid : uuid, oobInfohash: true, searchEvent = new SearchEvent(searchTerms : terms, uuid : uuid, oobInfohash: true,
@ -203,6 +199,15 @@ class MainFrameController {
replyTo: core.me.destination, receivedOn: core.me.destination, replyTo: core.me.destination, receivedOn: core.me.destination,
originator : core.me, sig : sig.data, queryTime : timestamp, sig2 : DataUtil.signUUID(uuid, timestamp, core.spk))) originator : core.me, sig : sig.data, queryTime : timestamp, sig2 : DataUtil.signUUID(uuid, timestamp, core.spk)))
Map<String, Object> params = new HashMap<>()
params["search-terms"] = search
params["uuid"] = uuid.toString()
params["core"] = core
params["settings"] = view.settings
params["tab"] = tab
params["regex"] = regexSearch
def group = mvcGroup.createMVCGroup("SearchTab", uuid.toString(), params)
model.results[uuid.toString()] = group
} }
void search(String infoHash, String tabTitle) { void search(String infoHash, String tabTitle) {

1
gui/griffon-app/i18n/messages.properties
View File

@ -109,6 +109,7 @@ ENTER_SEARCH=Enter search
SEARCH=Search SEARCH=Search
NOT_A_REGEX={0} is not a valid regular expression. NOT_A_REGEX={0} is not a valid regular expression.
NOT_A_REGEX_TITLE=Invalid regular expression NOT_A_REGEX_TITLE=Invalid regular expression
INVALID_SEARCH_TERM=Invalid search term
# Search pane # Search pane
SAVED_TABS=Saved Tabs SAVED_TABS=Saved Tabs