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

attach uuid to search results

pull/4/head
Zlatin Balevsky 2019-06-01 07:20:39 +01:00
parent 77fac612cc
commit d2231b8e38
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/groovy/com/muwire/core/connection/ConnectionAcceptor.groovy
View File

@ -204,7 +204,7 @@ class ConnectionAcceptor {
byte [] payload = new byte[jsonSize] byte [] payload = new byte[jsonSize]
dis.readFully(payload) dis.readFully(payload)
def json = slurper.parse(payload) def json = slurper.parse(payload)
eventBus.publish(ResultsParser.parse(sender, json)) eventBus.publish(ResultsParser.parse(sender, resultsUUID, json))
} }
} catch (IOException | UnexpectedResultsException | InvalidSearchResultException bad) { } catch (IOException | UnexpectedResultsException | InvalidSearchResultException bad) {
log.log(Level.WARNING, "failed to process POST", bad) log.log(Level.WARNING, "failed to process POST", bad)

5
core/src/main/groovy/com/muwire/core/search/ResultsParser.groovy
View File

@ -9,7 +9,7 @@ import com.muwire.core.util.DataUtil
import net.i2p.data.Base64 import net.i2p.data.Base64
class ResultsParser { class ResultsParser {
public static UIResultEvent parse(Persona p, def json) throws InvalidSearchResultException { public static UIResultEvent parse(Persona p, UUID uuid, def json) throws InvalidSearchResultException {
if (json.type != "Result") if (json.type != "Result")
throw new InvalidSearchResultException("not a result json") throw new InvalidSearchResultException("not a result json")
if (json.version != 1) if (json.version != 1)
@ -46,7 +46,8 @@ class ResultsParser {
name : name, name : name,
size : size, size : size,
infohash : parsedIH, infohash : parsedIH,
pieceSize : pieceSize) pieceSize : pieceSize,
uuid : uuid)
} catch (Exception e) { } catch (Exception e) {
throw new InvalidSearchResultException("parsing search result failed",e) throw new InvalidSearchResultException("parsing search result failed",e)
} }

1
core/src/main/groovy/com/muwire/core/search/UIResultEvent.groovy
View File

@ -6,6 +6,7 @@ import com.muwire.core.Persona
class UIResultEvent extends Event { class UIResultEvent extends Event {
Persona sender Persona sender
UUID uuid
String name String name
long size long size
InfoHash infohash InfoHash infohash