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

Correct count of direct sources. GitHub issue #79

auto-update
Zlatin Balevsky 2021-10-10 19:15:41 +01:00
parent fdd34cb606
commit 491da9ff3a
No known key found for this signature in database
GPG Key ID: A72832072D525E41
3 changed files with 100 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/griffon-app/controllers/com/muwire/gui/SearchTabController.groovy
View File

@ -47,7 +47,7 @@ class SearchTabController {
if (target.parent != null)
parent = new File(downloadsFolder, target.parent.toString())
def resultsBucket = model.hashBucket[target.resultEvent.infohash]
def resultsBucket = model.hashBucket[target.resultEvent.infohash].getResults()
def sources = model.sourcesBucket[target.resultEvent.infohash]
core.eventBus.publish(new UIDownloadEvent(result : resultsBucket, sources: sources,

91
gui/griffon-app/models/com/muwire/gui/SearchTabModel.groovy
View File

@ -1,5 +1,7 @@
package com.muwire.gui
import com.muwire.core.InfoHash
import javax.annotation.Nonnull
import javax.inject.Inject
import javax.swing.JTable
@ -39,7 +41,7 @@ class SearchTabModel {
String uuid
def senders = []
def results = []
def hashBucket = [:]
def hashBucket = new HashMap<InfoHash, HashBucket>()
def sourcesBucket = [:]
def sendersBucket = new LinkedHashMap<>()
@ -70,10 +72,10 @@ class SearchTabModel {
runInsideUIAsync {
def bucket = hashBucket.get(e.infohash)
if (bucket == null) {
bucket = []
bucket = new HashBucket()
hashBucket[e.infohash] = bucket
}
bucket << e
bucket.add(e)
def senderBucket = sendersBucket.get(e.sender)
if (senderBucket == null) {
@ -109,7 +111,7 @@ class SearchTabModel {
return
def bucket = hashBucket.get(it.infohash)
if (bucket == null) {
bucket = []
bucket = new HashBucket()
hashBucket[it.infohash] = bucket
}
@ -128,7 +130,7 @@ class SearchTabModel {
}
sourceBucket.addAll(it.sources)
bucket << it
bucket.add it
senderBucket << it
}
@ -144,4 +146,83 @@ class SearchTabModel {
table.selectionModel.setSelectionInterval(selectedRow, selectedRow)
}
}
private static class HashBucket {
private final Set<UIResultEvent> events = new HashSet<>()
private final Set<Persona> senders = new HashSet<>()
private String cachedName
private long cachedSize
private void add(UIResultEvent event) {
events.add(event)
senders.add(event.sender)
}
Set<UIResultEvent> getResults() {
events
}
Set<Persona> getSenders() {
senders
}
String getName() {
if (cachedName == null) {
cachedName = events.first().name
}
cachedName
}
long getSize() {
if (cachedSize == 0) {
cachedSize = events.first().size
}
cachedSize
}
int sourceCount() {
senders.size()
}
int commentCount() {
int count = 0
for (UIResultEvent event : events) {
if (event.comment != null)
count++
}
count
}
int certificateCount() {
int count = 0
for (UIResultEvent event : events)
count += event.certificates
count
}
int chatCount() {
int count = 0
for (UIResultEvent event : events) {
if (event.chat)
count++
}
count
}
int feedCount() {
int count = 0
for (UIResultEvent event : events) {
if (event.feed)
count++
}
count
}
int collectionsCount() {
int count = 0
for (UIResultEvent event : events) {
count += event.collections.size()
}
count
}
}
}

49
gui/griffon-app/views/com/muwire/gui/SearchTabView.groovy
View File

@ -119,7 +119,7 @@ class SearchTabView {
tableModel(list: model.results) {
closureColumn(header: trans("NAME"), preferredWidth: 350, type: String, read: { row -> HTMLSanitizer.sanitize(row.name) })
closureColumn(header: trans("SIZE"), preferredWidth: 20, type: Long, read: { row -> row.size })
closureColumn(header: trans("DIRECT_SOURCES"), preferredWidth: 50, type: Integer, read: { row -> model.hashBucket[row.infohash].size() })
closureColumn(header: trans("DIRECT_SOURCES"), preferredWidth: 50, type: Integer, read: { row -> model.hashBucket[row.infohash].sourceCount() })
closureColumn(header: trans("POSSIBLE_SOURCES"), preferredWidth: 50, type: Integer, read: { row -> model.sourcesBucket[row.infohash].size() })
closureColumn(header: trans("COMMENTS"), preferredWidth: 20, type: Boolean, read: { row -> row.comment != null })
closureColumn(header: trans("CERTIFICATES"), preferredWidth: 20, type: Integer, read: { row -> row.certificates })
@ -163,54 +163,31 @@ class SearchTabView {
resultsTable2 = table(id : "results-table2", autoCreateRowSorter : true, rowHeight : rowHeight) {
tableModel(list : model.results2) {
closureColumn(header : trans("NAME"), preferredWidth : 350, type : String, read : {
HTMLSanitizer.sanitize(model.hashBucket[it].first().name)
HTMLSanitizer.sanitize(model.hashBucket[it].getName())
})
closureColumn(header : trans("SIZE"), preferredWidth : 20, type : Long, read : {
model.hashBucket[it].first().size
model.hashBucket[it].getSize()
})
closureColumn(header : trans("DIRECT_SOURCES"), preferredWidth : 20, type : Integer, read : {
model.hashBucket[it].size()
model.hashBucket[it].sourceCount()
})
closureColumn(header : trans("POSSIBLE_SOURCES"), preferredWidth : 20, type : Integer , read : {
model.sourcesBucket[it].size()
})
closureColumn(header : trans("COMMENTS"), preferredWidth : 20, type : Integer, read : {
int count = 0
model.hashBucket[it].each {
if (it.comment != null)
count++
}
count
model.hashBucket[it].commentCount()
})
closureColumn(header : trans("CERTIFICATES"), preferredWidth : 20, type : Integer, read : {
int count = 0
model.hashBucket[it].each {
count += it.certificates
}
count
model.hashBucket[it].certificateCount()
})
closureColumn(header : trans("FEEDS"), preferredWidth : 20, type : Integer, read : {
int count = 0
model.hashBucket[it].each {
if (it.feed)
count++
}
count
model.hashBucket[it].feedCount()
})
closureColumn(header : trans("CHAT_HOSTS"), preferredWidth : 20, type : Integer, read : {
int count = 0
model.hashBucket[it].each {
if (it.chat)
count++
}
count
model.hashBucket[it].chatCount()
})
closureColumn(header : trans("COLLECTIONS"), preferredWidth : 20, type : Integer, read : {
int count = 0
model.hashBucket[it].each { UIResultEvent row ->
count += row.collections.size()
}
count
model.hashBucket[it].collectionsCount()
})
}
}
@ -476,7 +453,7 @@ class SearchTabView {
return
}
model.downloadActionEnabled = true
def results = model.hashBucket[e.infohash]
def results = model.hashBucket[e.infohash].getResults()
model.senders2.clear()
model.senders2.addAll(results)
int selectedRow = sendersTable2.getSelectedRow()
@ -604,15 +581,15 @@ class SearchTabView {
Persona sender = selectedSender()
if (sender == null) // really shouldn't happen
return model.hashBucket[infohash].first()
return model.hashBucket[infohash].getResults().first()
for (UIResultEvent candidate : model.hashBucket[infohash]) {
for (UIResultEvent candidate : model.hashBucket[infohash].getResults()) {
if (candidate.sender == sender)
return candidate
}
// also shouldn't happen
return model.hashBucket[infohash].first()
return model.hashBucket[infohash].getResults().first()
} else {
int[] selectedRows = resultsTable.getSelectedRows()
if (selectedRows.length != 1)