count duplicate files towards total in Uploads panel

This commit is contained in:
Zlatin Balevsky
2019-07-11 23:28:12 +01:00
parent 7ae8076865
commit eaa883c3ba

View File

@@ -97,8 +97,6 @@ class MainFrameModel {
@Observable Downloader downloader @Observable Downloader downloader
private final Set<InfoHash> infoHashes = new HashSet<>()
private final Set<InfoHash> downloadInfoHashes = new HashSet<>() private final Set<InfoHash> downloadInfoHashes = new HashSet<>()
@Observable volatile Core core @Observable volatile Core core
@@ -300,9 +298,6 @@ class MainFrameModel {
} }
if (e.error != null) if (e.error != null)
return // TODO do something return // TODO do something
if (infoHashes.contains(e.sharedFile.infoHash))
return
infoHashes.add(e.sharedFile.infoHash)
runInsideUIAsync { runInsideUIAsync {
shared << e.sharedFile shared << e.sharedFile
loadedFiles = shared.size() loadedFiles = shared.size()
@@ -312,9 +307,6 @@ class MainFrameModel {
} }
void onFileLoadedEvent(FileLoadedEvent e) { void onFileLoadedEvent(FileLoadedEvent e) {
if (infoHashes.contains(e.loadedFile.infoHash))
return
infoHashes.add(e.loadedFile.infoHash)
runInsideUIAsync { runInsideUIAsync {
shared << e.loadedFile shared << e.loadedFile
loadedFiles = shared.size() loadedFiles = shared.size()
@@ -324,9 +316,6 @@ class MainFrameModel {
} }
void onFileUnsharedEvent(FileUnsharedEvent e) { void onFileUnsharedEvent(FileUnsharedEvent e) {
InfoHash infohash = e.unsharedFile.infoHash
if (!infoHashes.remove(infohash))
return
runInsideUIAsync { runInsideUIAsync {
shared.remove(e.unsharedFile) shared.remove(e.unsharedFile)
loadedFiles = shared.size() loadedFiles = shared.size()
@@ -470,7 +459,6 @@ class MainFrameModel {
void onFileDownloadedEvent(FileDownloadedEvent e) { void onFileDownloadedEvent(FileDownloadedEvent e) {
if (!core.muOptions.shareDownloadedFiles) if (!core.muOptions.shareDownloadedFiles)
return return
infoHashes.add(e.downloadedFile.infoHash)
runInsideUIAsync { runInsideUIAsync {
shared << e.downloadedFile shared << e.downloadedFile
JTable table = builder.getVariable("shared-files-table") JTable table = builder.getVariable("shared-files-table")