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

do not perform filesystem operations in the UI thread

Browse Source
This commit is contained in:
Zlatin Balevsky
2019-06-27 23:29:48 +01:00
parent a9aa3a524f
commit e3066161c5
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
package com.muwire.core; package com.muwire.core;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.util.Set; import java.util.Set;
import net.i2p.data.Destination; import net.i2p.data.Destination;
@@ -9,7 +10,8 @@ public class DownloadedFile extends SharedFile {
private final Set<Destination> sources; private final Set<Destination> sources;
public DownloadedFile(File file, InfoHash infoHash, int pieceSize, Set<Destination> sources) { public DownloadedFile(File file, InfoHash infoHash, int pieceSize, Set<Destination> sources)
throws IOException {
super(file, infoHash, pieceSize); super(file, infoHash, pieceSize);
this.sources = sources; this.sources = sources;
} }

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

@@ -1,6 +1,7 @@
package com.muwire.core; package com.muwire.core;
import java.io.File; import java.io.File;
import java.io.IOException;
public class SharedFile { public class SharedFile {
@@ -8,10 +9,15 @@ public class SharedFile {
private final InfoHash infoHash; private final InfoHash infoHash;
private final int pieceSize; private final int pieceSize;
public SharedFile(File file, InfoHash infoHash, int pieceSize) { private final String cachedPath;
private final long cachedLength;
public SharedFile(File file, InfoHash infoHash, int pieceSize) throws IOException {
this.file = file; this.file = file;
this.infoHash = infoHash; this.infoHash = infoHash;
this.pieceSize = pieceSize; this.pieceSize = pieceSize;
this.cachedPath = file.getAbsolutePath();
this.cachedLength = file.length();
} }
public File getFile() { public File getFile() {
@@ -35,6 +41,14 @@ public class SharedFile {
return rv; return rv;
} }
public String getCachedPath() {
return cachedPath;
}
public long getCachedLength() {
return cachedLength;
}
@Override @Override
public int hashCode() { public int hashCode() {
return file.hashCode() ^ infoHash.hashCode(); return file.hashCode() ^ infoHash.hashCode();

4
gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
View File

@@ -167,8 +167,8 @@ class MainFrameView {
scrollPane(constraints : BorderLayout.CENTER) { scrollPane(constraints : BorderLayout.CENTER) {
table(id : "shared-files-table", autoCreateRowSorter: true) { table(id : "shared-files-table", autoCreateRowSorter: true) {
tableModel(list : model.shared) { tableModel(list : model.shared) {
closureColumn(header : "Name", preferredWidth : 500, type : String, read : {row -> row.file.getAbsolutePath()}) closureColumn(header : "Name", preferredWidth : 500, type : String, read : {row -> row.getCachedPath()})
closureColumn(header : "Size", preferredWidth : 100, type : Long, read : {row -> row.file.length() }) closureColumn(header : "Size", preferredWidth : 100, type : Long, read : {row -> row.getCachedLength() })
} }
} }
} }