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

Decode comments from SharedFile objects

pull/53/head
Zlatin Balevsky 2020-10-31 09:18:25 +00:00
parent 013cefb347
commit 9fbedbcdb5
No known key found for this signature in database
GPG Key ID: A72832072D525E41
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/groovy/com/muwire/core/collections/FileCollectionBuilder.groovy
View File

@ -7,7 +7,9 @@ import com.muwire.core.InfoHash
import com.muwire.core.Persona
import com.muwire.core.SharedFile
import com.muwire.core.files.FileTree
import com.muwire.core.util.DataUtil
import net.i2p.data.Base64
import net.i2p.data.SigningPrivateKey
class FileCollectionBuilder {
@ -81,9 +83,11 @@ class FileCollectionBuilder {
Set<FileCollectionItem> files = new LinkedHashSet<>()
for (SharedFile sf : sfPathElements.keySet()) {
String comment = sf.getComment() // TODO: check comment encoding
String comment = sf.getComment()
if (comment == null)
comment = ""
else
comment = DataUtil.readi18nString(Base64.decode(comment))
def item = new FileCollectionItem(new InfoHash(sf.root), comment, sfPathElements.get(sf), (byte)sf.pieceSize, sf.getCachedLength())
files.add(item)
}

5
gui/griffon-app/controllers/com/muwire/gui/CollectionsToolController.groovy
View File

@ -4,11 +4,14 @@ import griffon.core.artifact.GriffonController
import griffon.core.controller.ControllerAction
import griffon.inject.MVCMember
import griffon.metadata.ArtifactProviderFor
import net.i2p.data.Base64
import javax.annotation.Nonnull
import com.muwire.core.SharedFile
import com.muwire.core.collections.FileCollection
import com.muwire.core.collections.UICollectionDeletedEvent
import com.muwire.core.util.DataUtil
@ArtifactProviderFor(GriffonController)
class CollectionsToolController {
@ -55,7 +58,7 @@ class CollectionsToolController {
SharedFile sf = model.files.getAt(row)
def params = [:]
params['text'] = sf.getComment()
params['text'] = DataUtil.readi18nString(Base64.decode(sf.getComment()))
mvcGroup.createMVCGroup("show-comment", params)
}
}