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

do not transmit path information if there is none

auto-update
Zlatin Balevsky 2021-10-05 00:51:35 +01:00
parent 1fa27f4ab7
commit 4e28e6020b
No known key found for this signature in database
GPG Key ID: A72832072D525E41
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,7 +136,7 @@ class ResultsParser {
uuid: uuid, uuid: uuid,
certificates : certificates, certificates : certificates,
collections : collections, collections : collections,
path: path.toArray(new String[0])) path: path.isEmpty() ? null : path.toArray(new String[0]))
} catch (Exception e) { } catch (Exception e) {
throw new InvalidSearchResultException("parsing search result failed",e) throw new InvalidSearchResultException("parsing search result failed",e)
} }

8
core/src/main/groovy/com/muwire/core/search/ResultsSender.groovy
View File

@ -210,9 +210,13 @@ class ResultsSender {
if (showPaths) { if (showPaths) {
List<String> path = new ArrayList<>() List<String> path = new ArrayList<>()
if (sf.getPathToSharedParent() != null) { if (sf.getPathToSharedParent() != null) {
for (Path element : sf.getPathToSharedParent()) for (Path element : sf.getPathToSharedParent()) {
path << Base64.encode(DataUtil.encodei18nString(element.toString())) String toString = element.toString()
if (!toString.isEmpty())
path << Base64.encode(DataUtil.encodei18nString(toString))
} }
}
if (!path.isEmpty())
obj.path = path obj.path = path
} }