added HTTP cache and package size
This commit is contained in:
Submodule nim/htmlutils updated: 366e6f0be1...12868f49c8
@@ -11,11 +11,16 @@ var pkgMap : JsonNode
|
||||
|
||||
const serverURL {.strdefine.}: string = "http://oggio88.soon.it/jpacrepo/"
|
||||
|
||||
proc last[T](s : seq[T]) : T = s[s.len - 1]
|
||||
proc formatByteSize(size : BiggestInt) : string = size.float64.formatEng(precision=1, siPrefix=true, unit = "B")
|
||||
|
||||
type DownloadPanel = ref object
|
||||
badge : Node
|
||||
listgroup : Node
|
||||
pkgs : HashSet[string]
|
||||
footer : Node
|
||||
sizeLabel : Node
|
||||
size : BiggestInt
|
||||
|
||||
proc newDownloadPanel(parent : Node) : DownloadPanel =
|
||||
let dp = DownloadPanel()
|
||||
@@ -45,6 +50,13 @@ proc newDownloadPanel(parent : Node) : DownloadPanel =
|
||||
"text-align" : "right",
|
||||
"display" :"none"
|
||||
}
|
||||
"span":
|
||||
style {
|
||||
"font-weight" : "bold",
|
||||
"padding-right" : "10px"
|
||||
}
|
||||
cb:
|
||||
dp.sizeLabel = node
|
||||
"button":
|
||||
class ["btn", "btn-primary"]
|
||||
attrs {"type" : "button"}
|
||||
@@ -77,29 +89,49 @@ proc updateBadge(dp : DownloadPanel) =
|
||||
dp.footer.style.display = st
|
||||
dp.badge.style.display = st
|
||||
dp.badge.textContent = $dp.pkgs.len()
|
||||
|
||||
|
||||
proc updateSize(dp : DownloadPanel) =
|
||||
dp.sizeLabel.textContent = "Total: " & dp.size.formatByteSize
|
||||
|
||||
proc addPkg(dp : DownloadPanel, pkgfile : string) =
|
||||
if not dp.pkgs.contains(pkgfile):
|
||||
dp.pkgs.incl(pkgfile)
|
||||
htmlDocument(document, dp.listgroup):
|
||||
"li":
|
||||
var listElement : Node
|
||||
class ["list-group-item"]
|
||||
text pkgfile
|
||||
"span":
|
||||
class ["glyphicon", "glyphicon-remove", "pull-right"]
|
||||
let req = newXMLHTTPRequest()
|
||||
let load_cb = proc(e : Event) =
|
||||
let sz = parseInt(req.responseText)
|
||||
dp.size += sz
|
||||
dp.updateSize
|
||||
htmlDocument(document, dp.listgroup):
|
||||
"li":
|
||||
var listElement : Node
|
||||
class ["list-group-item"]
|
||||
text pkgfile
|
||||
"span":
|
||||
class ["glyphicon", "glyphicon-remove", "pull-right"]
|
||||
cb:
|
||||
let fn = proc(e : Event) =
|
||||
dp.pkgs.excl(pkgfile)
|
||||
listElement.remove()
|
||||
dp.updateBadge
|
||||
dp.size -= sz
|
||||
dp.updateSize
|
||||
node.addEventListener("click", fn)
|
||||
cb:
|
||||
let fn = proc(e : Event) =
|
||||
dp.pkgs.excl(pkgfile)
|
||||
listElement.remove()
|
||||
dp.updateBadge
|
||||
node.addEventListener("click", fn)
|
||||
cb:
|
||||
listElement = node
|
||||
|
||||
listElement = node
|
||||
req.addEventListener("load", load_cb)
|
||||
req.open("get", serverURL & "rest/pkg/filesize/" & pkgfile)
|
||||
req.setRequestHeader("Accept", "application/json")
|
||||
req.send()
|
||||
dp.updateBadge
|
||||
|
||||
proc readTableRow(row : Node) : JsonNode =
|
||||
let pkgname = $row.querySelector("td:nth-child(2)").textContent
|
||||
let version = $row.querySelector("td:nth-child(3) button").textContent
|
||||
let arch = $row.querySelector("td:nth-child(4) button").textContent
|
||||
pkgMap[pkgname][version][arch]
|
||||
|
||||
proc createDropdown(parent : Node, data :seq[string], onchange : proc(value : string)) =
|
||||
|
||||
htmlDocument(document, parent):
|
||||
"div":
|
||||
var button : Node
|
||||
@@ -108,9 +140,7 @@ proc createDropdown(parent : Node, data :seq[string], onchange : proc(value : st
|
||||
class ["btn", "btn-default", "dropdown-toggle"]
|
||||
attrs {"data-toggle": "dropdown", "type": "button"}
|
||||
cb:
|
||||
for line in data:
|
||||
node.textContent = line
|
||||
break
|
||||
node.textContent = data.last
|
||||
button = node
|
||||
"ul":
|
||||
class ["dropdown-menu"]
|
||||
@@ -162,6 +192,8 @@ proc newPkgTable(parent: Node, searchString : string) : PkgTable =
|
||||
text "Version"
|
||||
"th":
|
||||
text "Arch"
|
||||
"th":
|
||||
text "Installed size"
|
||||
"tbody":
|
||||
cb:
|
||||
var i = 0
|
||||
@@ -169,7 +201,12 @@ proc newPkgTable(parent: Node, searchString : string) : PkgTable =
|
||||
closureScope:
|
||||
htmlDocument(document, node):
|
||||
"tr":
|
||||
var row : Node
|
||||
var archCell : Node
|
||||
var sizeCell : Node
|
||||
let size_change_callback = proc(newValue : string) =
|
||||
sizeCell.textContent = readTableRow(row)["size"].getNum.formatByteSize
|
||||
|
||||
"td":
|
||||
"div":
|
||||
class ["checkbox"]
|
||||
@@ -189,7 +226,8 @@ proc newPkgTable(parent: Node, searchString : string) : PkgTable =
|
||||
var newdata = newSeq[string]()
|
||||
for arch, pkgname in vs[newValue]:
|
||||
newdata.add(arch)
|
||||
createDropdown(archCell, newdata, proc(s : string) = discard)
|
||||
createDropdown(archCell, newdata, size_change_callback)
|
||||
size_change_callback(newValue)
|
||||
createDropdown(node, data, change_callback)
|
||||
"td":
|
||||
cb:
|
||||
@@ -200,7 +238,17 @@ proc newPkgTable(parent: Node, searchString : string) : PkgTable =
|
||||
arches = a
|
||||
for arch, pkgname in arches:
|
||||
data.add(arch)
|
||||
createDropdown(node, data, proc(s : string) = discard)
|
||||
createDropdown(node, data, size_change_callback)
|
||||
"td":
|
||||
cb:
|
||||
sizeCell = node
|
||||
for v, arches in versions:
|
||||
for key, value in arches:
|
||||
node.textContent = value["size"].getNum.formatByteSize
|
||||
return
|
||||
cb:
|
||||
row = node
|
||||
|
||||
pkgtable
|
||||
|
||||
var dp : DownloadPanel
|
||||
@@ -248,10 +296,7 @@ htmlDocument document, document.body:
|
||||
for row in rows:
|
||||
let cbox = row.querySelector("td:first-child input")
|
||||
if cbox.checked:
|
||||
let pkgname = $row.querySelector("td:nth-child(2)").textContent
|
||||
let version = $row.querySelector("td:nth-child(3) button").textContent
|
||||
let arch = $row.querySelector("td:nth-child(4) button").textContent
|
||||
dp.addPkg(pkgMap[pkgname][version][arch].getStr)
|
||||
dp.addPkg(readTableRow(row)["filename"].getStr)
|
||||
proc oninput(e : Event) =
|
||||
if pkgMap.len == 0 or node.value.len < 2: return
|
||||
let pkgtable = newPkgTable(table, $node.value)
|
||||
|
||||
Reference in New Issue
Block a user