idk/muwire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

de-hardcode piece sizes in results

Browse Source
This commit is contained in:
Zlatin Balevsky
2019-06-08 01:48:07 +01:00
parent 60776829b9
commit 53c6db4ec8
8 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/groovy/com/muwire/core/download/Downloader.groovy
View File

@@ -205,7 +205,7 @@ public class Downloader {
if (downloaded.isComplete() && !eventFired) { if (downloaded.isComplete() && !eventFired) {
piecesFile.delete() piecesFile.delete()
eventFired = true eventFired = true
eventBus.publish(new FileDownloadedEvent(downloadedFile : new DownloadedFile(file, infoHash, Collections.emptySet()))) eventBus.publish(new FileDownloadedEvent(downloadedFile : new DownloadedFile(file, infoHash, pieceSize, Collections.emptySet())))
} }
endpoint?.close() endpoint?.close()
} }

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

@@ -40,7 +40,7 @@ class HasherService {
eventBus.publish new FileHashedEvent(error: "$f is too large to be shared ${f.length()}") eventBus.publish new FileHashedEvent(error: "$f is too large to be shared ${f.length()}")
} else { } else {
def hash = hasher.hashFile f def hash = hasher.hashFile f
eventBus.publish new FileHashedEvent(sharedFile: new SharedFile(f, hash)) eventBus.publish new FileHashedEvent(sharedFile: new SharedFile(f, hash, FileHasher.getPieceSize(f.length())))
} }
} }
} }

12
core/src/main/groovy/com/muwire/core/files/PersisterService.groovy
View File

@@ -98,14 +98,19 @@ class PersisterService extends Service {
if (!Arrays.equals(root, ih.getRoot())) if (!Arrays.equals(root, ih.getRoot()))
return null return null
if (json.sources != null) { int pieceSize = 0
if (json.pieceSize != null)
pieceSize = json.pieceSize
if (json.sources != null) {
List sources = (List)json.sources List sources = (List)json.sources
Set<Destination> sourceSet = sources.stream().map({d -> new Destination(d.toString())}).collect Collectors.toSet() Set<Destination> sourceSet = sources.stream().map({d -> new Destination(d.toString())}).collect Collectors.toSet()
DownloadedFile df = new DownloadedFile(file, ih, sourceSet) DownloadedFile df = new DownloadedFile(file, ih, pieceSize, sourceSet)
return new FileLoadedEvent(loadedFile : df) return new FileLoadedEvent(loadedFile : df)
} }
SharedFile sf = new SharedFile(file, ih)
SharedFile sf = new SharedFile(file, ih, pieceSize)
return new FileLoadedEvent(loadedFile: sf) return new FileLoadedEvent(loadedFile: sf)
} }
@@ -132,6 +137,7 @@ class PersisterService extends Service {
json.length = f.length() json.length = f.length()
InfoHash ih = sf.getInfoHash() InfoHash ih = sf.getInfoHash()
json.infoHash = Base64.encode ih.getRoot() json.infoHash = Base64.encode ih.getRoot()
json.pieceSize = sf.getPieceSize()
byte [] tmp = new byte [32] byte [] tmp = new byte [32]
json.hashList = [] json.hashList = []
for (int i = 0;i < ih.getHashList().length / 32; i++) { for (int i = 0;i < ih.getHashList().length / 32; i++) {

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

@@ -51,11 +51,14 @@ class ResultsSender {
if (target.equals(me.destination)) { if (target.equals(me.destination)) {
results.each { results.each {
long length = it.getFile().length() long length = it.getFile().length()
int pieceSize = it.getPieceSize()
if (pieceSize == 0)
pieceSize = FileHasher.getPieceSize(length)
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 : it.getInfoHash(),
pieceSize : FileHasher.getPieceSize(length), pieceSize : pieceSize,
uuid : uuid uuid : uuid
) )
eventBus.publish(uiResultEvent) eventBus.publish(uiResultEvent)
@@ -95,7 +98,7 @@ class ResultsSender {
obj.name = encodedName obj.name = encodedName
obj.infohash = Base64.encode(it.getInfoHash().getRoot()) obj.infohash = Base64.encode(it.getInfoHash().getRoot())
obj.size = it.getFile().length() obj.size = it.getFile().length()
obj.pieceSize = FileHasher.getPieceSize(it.getFile().length()) obj.pieceSize = it.getPieceSize()
byte [] hashList = it.getInfoHash().getHashList() byte [] hashList = it.getInfoHash().getHashList()
def hashListB64 = [] def hashListB64 = []
for (int i = 0; i < hashList.length / InfoHash.SIZE; i++) { for (int i = 0; i < hashList.length / InfoHash.SIZE; i++) {

4
core/src/main/java/com/muwire/core/DownloadedFile.java
View File

@@ -9,8 +9,8 @@ public class DownloadedFile extends SharedFile {
private final Set<Destination> sources; private final Set<Destination> sources;
public DownloadedFile(File file, InfoHash infoHash, Set<Destination> sources) { public DownloadedFile(File file, InfoHash infoHash, int pieceSize, Set<Destination> sources) {
super(file, infoHash); super(file, infoHash, pieceSize);
this.sources = sources; this.sources = sources;
} }

7
core/src/main/java/com/muwire/core/SharedFile.java
View File

@@ -6,10 +6,12 @@ public class SharedFile {
private final File file; private final File file;
private final InfoHash infoHash; private final InfoHash infoHash;
private final int pieceSize;
public SharedFile(File file, InfoHash infoHash) { public SharedFile(File file, InfoHash infoHash, int pieceSize) {
this.file = file; this.file = file;
this.infoHash = infoHash; this.infoHash = infoHash;
this.pieceSize = pieceSize;
} }
public File getFile() { public File getFile() {
@@ -20,4 +22,7 @@ public class SharedFile {
return infoHash; return infoHash;
} }
public int getPieceSize() {
return pieceSize;
}
} }

24
core/src/test/groovy/com/muwire/core/files/FileManagerTest.groovy
View File

@@ -35,7 +35,7 @@ class FileManagerTest {
void testHash1Result() { void testHash1Result() {
File f = new File("a b.c") File f = new File("a b.c")
InfoHash ih = InfoHash.fromHashList(new byte[32]) InfoHash ih = InfoHash.fromHashList(new byte[32])
SharedFile sf = new SharedFile(f,ih) SharedFile sf = new SharedFile(f,ih, 0)
FileHashedEvent fhe = new FileHashedEvent(sharedFile: sf) FileHashedEvent fhe = new FileHashedEvent(sharedFile: sf)
manager.onFileHashedEvent(fhe) manager.onFileHashedEvent(fhe)
@@ -54,8 +54,8 @@ class FileManagerTest {
@Test @Test
void testHash2Results() { void testHash2Results() {
InfoHash ih = InfoHash.fromHashList(new byte[32]) InfoHash ih = InfoHash.fromHashList(new byte[32])
SharedFile sf1 = new SharedFile(new File("a b.c"), ih) SharedFile sf1 = new SharedFile(new File("a b.c"), ih, 0)
SharedFile sf2 = new SharedFile(new File("d e.f"), ih) SharedFile sf2 = new SharedFile(new File("d e.f"), ih, 0)
manager.onFileLoadedEvent new FileLoadedEvent(loadedFile : sf1) manager.onFileLoadedEvent new FileLoadedEvent(loadedFile : sf1)
manager.onFileLoadedEvent new FileLoadedEvent(loadedFile : sf2) manager.onFileLoadedEvent new FileLoadedEvent(loadedFile : sf2)
@@ -76,7 +76,7 @@ class FileManagerTest {
void testHash0Results() { void testHash0Results() {
File f = new File("a b.c") File f = new File("a b.c")
InfoHash ih = InfoHash.fromHashList(new byte[32]) InfoHash ih = InfoHash.fromHashList(new byte[32])
SharedFile sf = new SharedFile(f,ih) SharedFile sf = new SharedFile(f,ih, 0)
FileHashedEvent fhe = new FileHashedEvent(sharedFile: sf) FileHashedEvent fhe = new FileHashedEvent(sharedFile: sf)
manager.onFileHashedEvent(fhe) manager.onFileHashedEvent(fhe)
@@ -90,7 +90,7 @@ class FileManagerTest {
void testKeyword1Result() { void testKeyword1Result() {
File f = new File("a b.c") File f = new File("a b.c")
InfoHash ih = InfoHash.fromHashList(new byte[32]) InfoHash ih = InfoHash.fromHashList(new byte[32])
SharedFile sf = new SharedFile(f,ih) SharedFile sf = new SharedFile(f,ih,0)
FileHashedEvent fhe = new FileHashedEvent(sharedFile: sf) FileHashedEvent fhe = new FileHashedEvent(sharedFile: sf)
manager.onFileHashedEvent(fhe) manager.onFileHashedEvent(fhe)
@@ -108,12 +108,12 @@ class FileManagerTest {
void testKeyword2Results() { void testKeyword2Results() {
File f1 = new File("a b.c") File f1 = new File("a b.c")
InfoHash ih1 = InfoHash.fromHashList(new byte[32]) InfoHash ih1 = InfoHash.fromHashList(new byte[32])
SharedFile sf1 = new SharedFile(f1, ih1) SharedFile sf1 = new SharedFile(f1, ih1, 0)
manager.onFileLoadedEvent new FileLoadedEvent(loadedFile: sf1) manager.onFileLoadedEvent new FileLoadedEvent(loadedFile: sf1)
File f2 = new File("c d.e") File f2 = new File("c d.e")
InfoHash ih2 = InfoHash.fromHashList(new byte[64]) InfoHash ih2 = InfoHash.fromHashList(new byte[64])
SharedFile sf2 = new SharedFile(f2, ih2) SharedFile sf2 = new SharedFile(f2, ih2, 0)
manager.onFileLoadedEvent new FileLoadedEvent(loadedFile: sf2) manager.onFileLoadedEvent new FileLoadedEvent(loadedFile: sf2)
UUID uuid = UUID.randomUUID() UUID uuid = UUID.randomUUID()
@@ -131,7 +131,7 @@ class FileManagerTest {
void testKeyword0Results() { void testKeyword0Results() {
File f = new File("a b.c") File f = new File("a b.c")
InfoHash ih = InfoHash.fromHashList(new byte[32]) InfoHash ih = InfoHash.fromHashList(new byte[32])
SharedFile sf = new SharedFile(f,ih) SharedFile sf = new SharedFile(f,ih,0)
FileHashedEvent fhe = new FileHashedEvent(sharedFile: sf) FileHashedEvent fhe = new FileHashedEvent(sharedFile: sf)
manager.onFileHashedEvent(fhe) manager.onFileHashedEvent(fhe)
@@ -144,8 +144,8 @@ class FileManagerTest {
@Test @Test
void testRemoveFileExistingHash() { void testRemoveFileExistingHash() {
InfoHash ih = InfoHash.fromHashList(new byte[32]) InfoHash ih = InfoHash.fromHashList(new byte[32])
SharedFile sf1 = new SharedFile(new File("a b.c"), ih) SharedFile sf1 = new SharedFile(new File("a b.c"), ih, 0)
SharedFile sf2 = new SharedFile(new File("d e.f"), ih) SharedFile sf2 = new SharedFile(new File("d e.f"), ih, 0)
manager.onFileLoadedEvent new FileLoadedEvent(loadedFile : sf1) manager.onFileLoadedEvent new FileLoadedEvent(loadedFile : sf1)
manager.onFileLoadedEvent new FileLoadedEvent(loadedFile : sf2) manager.onFileLoadedEvent new FileLoadedEvent(loadedFile : sf2)
@@ -162,12 +162,12 @@ class FileManagerTest {
void testRemoveFile() { void testRemoveFile() {
File f1 = new File("a b.c") File f1 = new File("a b.c")
InfoHash ih1 = InfoHash.fromHashList(new byte[32]) InfoHash ih1 = InfoHash.fromHashList(new byte[32])
SharedFile sf1 = new SharedFile(f1, ih1) SharedFile sf1 = new SharedFile(f1, ih1, 0)
manager.onFileLoadedEvent new FileLoadedEvent(loadedFile: sf1) manager.onFileLoadedEvent new FileLoadedEvent(loadedFile: sf1)
File f2 = new File("c d.e") File f2 = new File("c d.e")
InfoHash ih2 = InfoHash.fromHashList(new byte[64]) InfoHash ih2 = InfoHash.fromHashList(new byte[64])
SharedFile sf2 = new SharedFile(f2, ih2) SharedFile sf2 = new SharedFile(f2, ih2, 0)
manager.onFileLoadedEvent new FileLoadedEvent(loadedFile: sf2) manager.onFileLoadedEvent new FileLoadedEvent(loadedFile: sf2)
manager.onFileUnsharedEvent new FileUnsharedEvent(unsharedFile: sf2) manager.onFileUnsharedEvent new FileUnsharedEvent(unsharedFile: sf2)

4
core/src/test/groovy/com/muwire/core/files/PersisterServiceSavingTest.groovy
View File

@@ -55,7 +55,7 @@ class PersisterServiceSavingTest {
@Test @Test
void testSavingSharedFile() { void testSavingSharedFile() {
sf = new SharedFile(f, ih) sf = new SharedFile(f, ih, 0)
ps = new PersisterService(persisted, eventBus, 100, fileSource) ps = new PersisterService(persisted, eventBus, 100, fileSource)
ps.start() ps.start()
@@ -74,7 +74,7 @@ class PersisterServiceSavingTest {
@Test @Test
void testSavingDownloadedFile() { void testSavingDownloadedFile() {
Destinations dests = new Destinations() Destinations dests = new Destinations()
sf = new DownloadedFile(f, ih, new HashSet([dests.dest1, dests.dest2])) sf = new DownloadedFile(f, ih, 0, new HashSet([dests.dest1, dests.dest2]))
ps = new PersisterService(persisted, eventBus, 100, fileSource) ps = new PersisterService(persisted, eventBus, 100, fileSource)
ps.start() ps.start()