diff --git a/core/src/main/groovy/com/muwire/core/connection/Connection.groovy b/core/src/main/groovy/com/muwire/core/connection/Connection.groovy index b90c6054..3594c0a0 100644 --- a/core/src/main/groovy/com/muwire/core/connection/Connection.groovy +++ b/core/src/main/groovy/com/muwire/core/connection/Connection.groovy @@ -150,6 +150,7 @@ abstract class Connection implements Closeable { query.oobInfohash = e.searchEvent.oobInfohash query.searchComments = e.searchEvent.searchComments query.compressedResults = e.searchEvent.compressedResults + query.collections = e.searchEvent.collections if (e.searchEvent.searchHash != null) query.infohash = Base64.encode(e.searchEvent.searchHash) query.replyTo = e.replyTo.toBase64() @@ -257,6 +258,9 @@ abstract class Connection implements Closeable { boolean compressedResults = false if (search.compressedResults != null) compressedResults = search.compressedResults + boolean collections + if (search.collections != null) + collections = search.collections byte[] sig = null if (search.sig != null) { sig = Base64.decode(search.sig) @@ -310,6 +314,7 @@ abstract class Connection implements Closeable { oobInfohash : oob, searchComments : searchComments, compressedResults : compressedResults, + collections : collections, persona : originator) QueryEvent event = new QueryEvent ( searchEvent : searchEvent, replyTo : replyTo, diff --git a/core/src/main/groovy/com/muwire/core/search/SearchEvent.groovy b/core/src/main/groovy/com/muwire/core/search/SearchEvent.groovy index e8f42aed..5fd62b95 100644 --- a/core/src/main/groovy/com/muwire/core/search/SearchEvent.groovy +++ b/core/src/main/groovy/com/muwire/core/search/SearchEvent.groovy @@ -13,6 +13,7 @@ class SearchEvent extends Event { boolean searchComments boolean compressedResults Persona persona + boolean collections String toString() { def infoHash = null diff --git a/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy b/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy index 93a72ede..08289d71 100644 --- a/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy +++ b/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy @@ -118,7 +118,8 @@ class MainFrameController { def searchEvent byte [] payload if (hashSearch) { - searchEvent = new SearchEvent(searchHash : root, uuid : uuid, oobInfohash: true, compressedResults : true, persona : core.me) + searchEvent = new SearchEvent(searchHash : root, uuid : uuid, oobInfohash: true, + compressedResults : true, persona : core.me, collections : true) payload = root } else { def nonEmpty = SplitPattern.termify(search)