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

show collection views

pull/53/head
Zlatin Balevsky 2020-11-02 12:50:19 +00:00
parent d5613c7e7d
commit cbb44ad772
No known key found for this signature in database
GPG Key ID: A72832072D525E41
5 changed files with 67 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/groovy/com/muwire/core/collections/CollectionManager.groovy
View File

@ -259,6 +259,8 @@ class CollectionManager {
def collection = rootToCollection.get(ih)
if (collection == null)
return
collection.hit(e.persona)
List<SharedFile> sharedFiles = new ArrayList<>()
collection.files.each { item ->
def sfs = fileManager.getRootToFiles().get(item.infoHash)

7
gui/griffon-app/controllers/com/muwire/gui/CollectionsToolController.groovy
View File

@ -78,4 +78,11 @@ class CollectionsToolController {
def clipboard = Toolkit.getDefaultToolkit().getSystemClipboard()
clipboard.setContents(selection, null)
}
@ControllerAction
void clearHits() {
model.selectedCollection.getHits().clear()
model.hits.clear()
view.hitsTable.model.fireTableDataChanged()
}
}

1
gui/griffon-app/i18n/messages.properties
View File

@ -546,6 +546,7 @@ CREATED=Created
AUTHOR=Author
COLLECTION_TOOL_HEADER=These are the collections in your repository. Deleting a collection will not affect the files included in it.
DELETE=Delete
COLLECTION_VIEWS=Collection views
## Collection tab
COLLECTION_SELECT=Select a collection to view it's description

4
gui/griffon-app/models/com/muwire/gui/CollectionsToolModel.groovy
View File

@ -20,10 +20,12 @@ class CollectionsToolModel {
@Observable boolean viewCommentButtonEnabled
@Observable boolean viewFileCommentButtonEnabled
@Observable boolean deleteButtonEnabled
@Observable boolean clearHitsButtonEnabled
List<FileCollection> collections = new ArrayList<>()
List<SharedFile> files = new ArrayList<>()
// TODO: add tree view
FileCollection selectedCollection
List<FileCollection.SearchHit> hits = new ArrayList<>()
void mvcGroupInit(Map<String,String> args) {
collections.addAll(collectionManager.getCollections())

74
gui/griffon-app/views/com/muwire/gui/CollectionsToolView.groovy
View File

@ -42,6 +42,7 @@ class CollectionsToolView {
JTable collectionsTable
JTable filesTable
JTable hitsTable
def lastCollectionSortEvent
def lastFilesSortEvent
@ -53,33 +54,56 @@ class CollectionsToolView {
dialog.setResizable(true)
mainPanel = builder.panel {
gridLayout(rows : 2, cols : 1)
gridLayout(rows : 1, cols : 2)
panel {
borderLayout()
panel (constraints : BorderLayout.NORTH) {
label(text : trans("COLLECTION_TOOL_HEADER"))
}
scrollPane(constraints : BorderLayout.CENTER) {
collectionsTable = table(autoCreateRowSorter : true, rowHeight : rowHeight) {
tableModel(list : model.collections) {
closureColumn(header : trans("NAME"), preferredWidth : 100, type : String, read : {it.name})
closureColumn(header : trans("AUTHOR"), preferredWidth : 100, type : String, read : {it.author.getHumanReadableName()})
closureColumn(header : trans("FILES"), preferredWidth: 10, type : Integer, read : {it.numFiles()})
closureColumn(header : trans("SIZE"), preferredWidth : 10, type : Long, read : {it.totalSize()})
closureColumn(header : trans("COMMENT"), preferredWidth : 10, type : Boolean, read : {it.comment != ""})
closureColumn(header : trans("SEARCH_HITS"), preferredWidth : 10, type : Integer, read : {it.hits.size()})
closureColumn(header : trans("CREATED"), preferredWidth : 30, type : Long, read : {it.timestamp})
gridLayout(rows : 2, cols : 1)
panel {
borderLayout()
panel (constraints : BorderLayout.NORTH) {
label(text : trans("COLLECTION_TOOL_HEADER"))
}
scrollPane(constraints : BorderLayout.CENTER) {
collectionsTable = table(autoCreateRowSorter : true, rowHeight : rowHeight) {
tableModel(list : model.collections) {
closureColumn(header : trans("NAME"), preferredWidth : 100, type : String, read : {it.name})
closureColumn(header : trans("AUTHOR"), preferredWidth : 100, type : String, read : {it.author.getHumanReadableName()})
closureColumn(header : trans("FILES"), preferredWidth: 10, type : Integer, read : {it.numFiles()})
closureColumn(header : trans("SIZE"), preferredWidth : 10, type : Long, read : {it.totalSize()})
closureColumn(header : trans("COMMENT"), preferredWidth : 10, type : Boolean, read : {it.comment != ""})
closureColumn(header : trans("SEARCH_HITS"), preferredWidth : 10, type : Integer, read : {it.hits.size()})
closureColumn(header : trans("CREATED"), preferredWidth : 30, type : Long, read : {it.timestamp})
}
}
}
panel(constraints : BorderLayout.SOUTH) {
button(text : trans("VIEW_COMMENT"), enabled : bind {model.viewCommentButtonEnabled}, viewCommentAction)
button(text : trans("COPY_HASH_TO_CLIPBOARD"), enabled : bind {model.deleteButtonEnabled}, copyHashAction)
button(text : trans("DELETE"), enabled : bind {model.deleteButtonEnabled}, deleteAction)
}
}
panel(constraints : BorderLayout.SOUTH) {
button(text : trans("VIEW_COMMENT"), enabled : bind {model.viewCommentButtonEnabled}, viewCommentAction)
button(text : trans("COPY_HASH_TO_CLIPBOARD"), enabled : bind {model.deleteButtonEnabled}, copyHashAction)
button(text : trans("DELETE"), enabled : bind {model.deleteButtonEnabled}, deleteAction)
panel {
borderLayout()
panel(constraints : BorderLayout.NORTH) {
label(text : trans("COLLECTION_VIEWS"))
}
scrollPane(constraints : BorderLayout.CENTER) {
hitsTable = table(autoCreateRowSorter : true, rowHeight : rowHeight) {
tableModel(list : model.hits) {
closureColumn(header : trans("SEARCHER"), preferredWidth : 100, type : String, read : {it.searcher.getHumanReadableName()})
closureColumn(header : trans("TIMESTAMP"), preferredWidth : 100, type : Long, read : {it.timestamp})
}
}
}
panel(constraints : BorderLayout.SOUTH) {
button(text : trans("CLEAR_HITS"), enabled : bind {model.clearHitsButtonEnabled}, clearHitsAction)
}
}
}
panel {
borderLayout()
panel(constraints : BorderLayout.NORTH) {
label(text : trans("FILES"))
}
scrollPane(constraints : BorderLayout.CENTER) {
filesTable = table(autoCreateRowSorter : true, rowHeight : rowHeight) {
tableModel(list : model.files) {
@ -136,11 +160,13 @@ class CollectionsToolView {
if (selectedRow < 0) {
model.viewCommentButtonEnabled = false
model.deleteButtonEnabled = false
model.clearHitsButtonEnabled = false
return
}
model.deleteButtonEnabled = true
FileCollection collection = model.collections.get(selectedRow)
model.selectedCollection = collection
model.viewCommentButtonEnabled = collection.getComment() != ""
model.files.clear()
@ -148,8 +174,13 @@ class CollectionsToolView {
SharedFile sf = model.fileManager.getRootToFiles().get(it.infoHash).first()
model.files.add(sf)
}
filesTable.model.fireTableDataChanged()
model.hits.clear()
model.hits.addAll(collection.getHits())
if (!model.hits.isEmpty())
model.clearHitsButtonEnabled = true
hitsTable.model.fireTableDataChanged()
})
collectionsTable.addMouseListener(new MouseAdapter() {
@ -192,6 +223,9 @@ class CollectionsToolView {
}
})
// hits table
hitsTable.setDefaultRenderer(Long.class, new DateRenderer())
dialog.getContentPane().add(mainPanel)
dialog.pack()
dialog.setLocationRelativeTo(mainFrame)