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

chase down some usages of deprecated getInfoHash method #35

pull/42/head
Zlatin Balevsky 2020-02-14 01:32:38 +00:00
parent 7b55fc9ed8
commit 16ed5dd346
4 changed files with 5 additions and 5 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

@ -380,7 +380,7 @@ class ConnectionAcceptor {
JsonOutput jsonOutput = new JsonOutput() JsonOutput jsonOutput = new JsonOutput()
sharedFiles.each { sharedFiles.each {
it.hit(browser, System.currentTimeMillis(), "Browse Host"); it.hit(browser, System.currentTimeMillis(), "Browse Host");
int certificates = certificateManager.getByInfoHash(it.getInfoHash()).size() int certificates = certificateManager.getByInfoHash(new InfoHash(it.getRoot())).size()
def obj = ResultsSender.sharedFileToObj(it, false, certificates) def obj = ResultsSender.sharedFileToObj(it, false, certificates)
def json = jsonOutput.toJson(obj) def json = jsonOutput.toJson(obj)
dos.writeShort((short)json.length()) dos.writeShort((short)json.length())

2
core/src/main/groovy/com/muwire/core/filecert/CertificateManager.groovy
View File

@ -70,7 +70,7 @@ class CertificateManager {
} }
void onUICreateCertificateEvent(UICreateCertificateEvent e) { void onUICreateCertificateEvent(UICreateCertificateEvent e) {
InfoHash infoHash = e.sharedFile.getInfoHash() InfoHash infoHash = new InfoHash(e.sharedFile.getRoot())
String name = e.sharedFile.getFile().getName() String name = e.sharedFile.getFile().getName()
long timestamp = System.currentTimeMillis() long timestamp = System.currentTimeMillis()

2
core/src/main/groovy/com/muwire/core/files/FileManager.groovy
View File

@ -117,7 +117,7 @@ class FileManager {
void onFileUnsharedEvent(FileUnsharedEvent e) { void onFileUnsharedEvent(FileUnsharedEvent e) {
SharedFile sf = e.unsharedFile SharedFile sf = e.unsharedFile
InfoHash infoHash = sf.getInfoHash() InfoHash infoHash = new InfoHash(sf.getRoot())
Set<SharedFile> existing = rootToFiles.get(infoHash) Set<SharedFile> existing = rootToFiles.get(infoHash)
if (existing != null) { if (existing != null) {
existing.remove(sf) existing.remove(sf)

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

@ -77,11 +77,11 @@ class ResultsSender {
if (it.getComment() != null) { if (it.getComment() != null) {
comment = DataUtil.readi18nString(Base64.decode(it.getComment())) comment = DataUtil.readi18nString(Base64.decode(it.getComment()))
} }
int certificates = certificateManager.getByInfoHash(it.getInfoHash()).size() int certificates = certificateManager.getByInfoHash(new InfoHash(it.getRoot())).size()
def uiResultEvent = new UIResultEvent( sender : me, def uiResultEvent = new UIResultEvent( sender : me,
name : it.getFile().getName(), name : it.getFile().getName(),
size : length, size : length,
infohash : it.getInfoHash(), infohash : new InfoHash(it.getRoot()),
pieceSize : pieceSize, pieceSize : pieceSize,
uuid : uuid, uuid : uuid,
browse : settings.browseFiles, browse : settings.browseFiles,