working downloads window
This commit is contained in:
@@ -0,0 +1,15 @@
|
||||
package com.muwire.clilanterna
|
||||
|
||||
import com.muwire.core.download.Downloader
|
||||
|
||||
class DownloaderWrapper {
|
||||
final Downloader downloader
|
||||
DownloaderWrapper(Downloader downloader) {
|
||||
this.downloader = downloader
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
downloader.file.getName()
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
package com.muwire.clilanterna
|
||||
|
||||
import com.googlecode.lanterna.gui2.TextGUIThread
|
||||
import com.googlecode.lanterna.gui2.table.TableModel
|
||||
|
||||
import com.muwire.core.Core
|
||||
import com.muwire.core.download.DownloadStartedEvent
|
||||
import com.muwire.core.download.Downloader
|
||||
import com.muwire.core.files.FileDownloadedEvent
|
||||
|
||||
import net.i2p.data.DataHelper
|
||||
|
||||
class DownloadsModel {
|
||||
private final TextGUIThread guiThread
|
||||
private final Core core
|
||||
private final List<Downloader> downloaders = new ArrayList<>()
|
||||
private final TableModel model = new TableModel("Name", "Status", "Progress", "Speed")
|
||||
|
||||
DownloadsModel(TextGUIThread guiThread, Core core) {
|
||||
this.guiThread = guiThread
|
||||
this.core = core
|
||||
|
||||
core.eventBus.register(DownloadStartedEvent.class, this)
|
||||
Timer timer = new Timer(true)
|
||||
Runnable refreshModel = {refreshModel()}
|
||||
timer.schedule({
|
||||
guiThread.invokeLater(refreshModel)
|
||||
} as TimerTask, 1000,1000)
|
||||
}
|
||||
|
||||
void onDownloadStartedEvent(DownloadStartedEvent e) {
|
||||
guiThread.invokeLater({
|
||||
downloaders.add(e.downloader)
|
||||
refreshModel()
|
||||
})
|
||||
}
|
||||
|
||||
private void refreshModel() {
|
||||
int rowCount = model.getRowCount()
|
||||
rowCount.times { model.removeRow(0) }
|
||||
downloaders.each {
|
||||
String status = it.getCurrentState().toString()
|
||||
String speed = DataHelper.formatSize2Decimal(it.speed(), false) + "B/sec"
|
||||
|
||||
int pieces = it.nPieces
|
||||
int done = it.donePieces()
|
||||
int percent = -1
|
||||
if (pieces != 0)
|
||||
percent = (done * 100 / pieces)
|
||||
String totalSize = DataHelper.formatSize2Decimal(it.length, false) + "B"
|
||||
String progress = (String.format("%2d", percent) + "% of ${totalSize}".toString())
|
||||
|
||||
model.addRow([new DownloaderWrapper(it), status, progress, speed])
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,72 @@
|
||||
package com.muwire.clilanterna
|
||||
|
||||
import com.googlecode.lanterna.gui2.BasicWindow
|
||||
import com.googlecode.lanterna.gui2.Button
|
||||
import com.googlecode.lanterna.gui2.GridLayout
|
||||
import com.googlecode.lanterna.gui2.GridLayout.Alignment
|
||||
import com.googlecode.lanterna.gui2.LayoutData
|
||||
import com.googlecode.lanterna.gui2.Panel
|
||||
import com.googlecode.lanterna.gui2.TextGUI
|
||||
import com.googlecode.lanterna.gui2.Window
|
||||
import com.googlecode.lanterna.gui2.dialogs.MessageDialog
|
||||
import com.googlecode.lanterna.gui2.dialogs.MessageDialogButton
|
||||
import com.googlecode.lanterna.gui2.table.Table
|
||||
import com.muwire.core.Core
|
||||
import com.muwire.core.download.Downloader
|
||||
import com.muwire.core.download.UIDownloadCancelledEvent
|
||||
|
||||
class DownloadsView extends BasicWindow {
|
||||
private final Core core
|
||||
private final DownloadsModel model
|
||||
private final TextGUI textGUI
|
||||
private final Table table
|
||||
|
||||
DownloadsView(Core core, DownloadsModel model, TextGUI textGUI) {
|
||||
this.core = core
|
||||
this.model = model
|
||||
this.textGUI = textGUI
|
||||
|
||||
setHints([Window.Hint.EXPANDED])
|
||||
|
||||
Panel contentPanel = new Panel()
|
||||
contentPanel.setLayoutManager(new GridLayout(1))
|
||||
table = new Table("Name","Status","Progress","Speed")
|
||||
table.setCellSelection(false)
|
||||
table.setSelectAction({rowSelected()})
|
||||
table.setTableModel(model.model)
|
||||
contentPanel.addComponent(table, GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER))
|
||||
|
||||
Button closeButton = new Button("Close",{close()})
|
||||
contentPanel.addComponent(closeButton, GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER))
|
||||
|
||||
setComponent(contentPanel)
|
||||
closeButton.takeFocus()
|
||||
}
|
||||
|
||||
private void rowSelected() {
|
||||
int selectedRow = table.getSelectedRow()
|
||||
def row = model.model.getRow(selectedRow)
|
||||
Downloader downloader = row[0].downloader
|
||||
|
||||
Window prompt = new BasicWindow("Kill Download?")
|
||||
prompt.setHints([Window.Hint.CENTERED])
|
||||
Panel contentPanel = new Panel()
|
||||
contentPanel.setLayoutManager(new GridLayout(2))
|
||||
LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER)
|
||||
|
||||
Button killDownload = new Button("Kill Download", {
|
||||
downloader.cancel()
|
||||
core.eventBus.publish(new UIDownloadCancelledEvent(downloader : downloader))
|
||||
MessageDialog.showMessageDialog(textGUI, "Download Killed", downloader.file.getName()+ " has been killed", MessageDialogButton.OK)
|
||||
})
|
||||
Button close = new Button("Close", {
|
||||
prompt.close()
|
||||
})
|
||||
|
||||
contentPanel.addComponent(killDownload,layoutData)
|
||||
contentPanel.addComponent(close, layoutData)
|
||||
prompt.setComponent(contentPanel)
|
||||
close.takeFocus()
|
||||
textGUI.addWindowAndWait(prompt)
|
||||
}
|
||||
}
|
||||
@@ -22,12 +22,16 @@ class MainWindowView extends BasicWindow {
|
||||
private final Label connectionCount
|
||||
private final TextBox searchTextBox
|
||||
|
||||
private final DownloadsModel downloadsModel
|
||||
|
||||
public MainWindowView(String title, Core core, TextGUI textGUI) {
|
||||
super(title);
|
||||
|
||||
this.core = core
|
||||
this.textGUI = textGUI
|
||||
|
||||
downloadsModel = new DownloadsModel(textGUI.getGUIThread(),core)
|
||||
|
||||
setHints([Window.Hint.EXPANDED])
|
||||
Panel contentPanel = new Panel()
|
||||
setComponent(contentPanel)
|
||||
@@ -43,7 +47,7 @@ class MainWindowView extends BasicWindow {
|
||||
|
||||
searchTextBox = new TextBox(new TerminalSize(40, 1))
|
||||
Button searchButton = new Button("Search", { search() })
|
||||
Button downloadsButton = new Button("Downloads", {println "downloads"})
|
||||
Button downloadsButton = new Button("Downloads", {download()})
|
||||
Button uploadsButton = new Button("Uploads", {println "uploads"})
|
||||
Button filesButton = new Button("Files", {println "files" })
|
||||
Button trustButton = new Button("Trust", {println "trust"})
|
||||
@@ -89,4 +93,8 @@ class MainWindowView extends BasicWindow {
|
||||
SearchModel model = new SearchModel(query, core)
|
||||
textGUI.addWindowAndWait(new SearchView(model,core, textGUI))
|
||||
}
|
||||
|
||||
private void download() {
|
||||
textGUI.addWindowAndWait(new DownloadsView(core, downloadsModel, textGUI))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,13 +3,18 @@ package com.muwire.clilanterna
|
||||
import com.googlecode.lanterna.gui2.BasicWindow
|
||||
import com.googlecode.lanterna.gui2.Button
|
||||
import com.googlecode.lanterna.gui2.GridLayout
|
||||
import com.googlecode.lanterna.gui2.LayoutData
|
||||
import com.googlecode.lanterna.gui2.GridLayout.Alignment
|
||||
import com.googlecode.lanterna.gui2.Panel
|
||||
import com.googlecode.lanterna.gui2.TextGUI
|
||||
import com.googlecode.lanterna.gui2.Window
|
||||
import com.googlecode.lanterna.gui2.dialogs.MessageDialog
|
||||
import com.googlecode.lanterna.gui2.dialogs.MessageDialogButton
|
||||
import com.googlecode.lanterna.gui2.table.Table
|
||||
|
||||
import com.muwire.core.Core
|
||||
import com.muwire.core.download.UIDownloadEvent
|
||||
import com.muwire.core.search.UIResultEvent
|
||||
|
||||
class ResultsView extends BasicWindow {
|
||||
|
||||
@@ -43,6 +48,41 @@ class ResultsView extends BasicWindow {
|
||||
}
|
||||
|
||||
private void rowSelected() {
|
||||
int selectedRow = table.getSelectedRow()
|
||||
def rows = model.model.getRow(selectedRow)
|
||||
boolean comment = Boolean.parseBoolean(rows[4])
|
||||
if (comment) {
|
||||
Window prompt = new BasicWindow("Download Or View Comment")
|
||||
prompt.setHints([Window.Hint.CENTERED])
|
||||
Panel contentPanel = new Panel()
|
||||
contentPanel.setLayoutManager(new GridLayout(3))
|
||||
Button downloadButton = new Button("Download", {download(rows[2])})
|
||||
Button viewButton = new Button("View Comment", {viewComment(rows[2])})
|
||||
Button closeButton = new Button("Cancel", {prompt.close()})
|
||||
|
||||
LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER)
|
||||
contentPanel.addComponent(downloadButton, layoutData)
|
||||
contentPanel.addComponent(viewButton, layoutData)
|
||||
contentPanel.addComponent(closeButton, layoutData)
|
||||
prompt.setComponent(contentPanel)
|
||||
downloadButton.takeFocus()
|
||||
textGUI.addWindowAndWait(prompt)
|
||||
} else {
|
||||
download(rows[2])
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void download(String infohash) {
|
||||
UIResultEvent result = model.rootToResult[infohash]
|
||||
def file = new File(core.muOptions.downloadLocation, result.name)
|
||||
|
||||
core.eventBus.publish(new UIDownloadEvent(result : [result], sources : result.sources,
|
||||
target : file, sequential : false))
|
||||
MessageDialog.showMessageDialog(textGUI, "Download Started", "Started download of "+result.name, MessageDialogButton.OK)
|
||||
}
|
||||
|
||||
private void viewComment(String infohash) {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user