Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
a5dae03897 | |||
|
57e9419565 |
@ -2,7 +2,7 @@ apply plugin: "groovy"
|
|||||||
apply plugin: "maven"
|
apply plugin: "maven"
|
||||||
|
|
||||||
group = "com.jdbernard"
|
group = "com.jdbernard"
|
||||||
version = "1.2"
|
version = "1.2.2"
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenLocal()
|
mavenLocal()
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# Package
|
# Package
|
||||||
|
|
||||||
version = "1.2"
|
version = "1.2.2"
|
||||||
author = "Jonathan Bernard"
|
author = "Jonathan Bernard"
|
||||||
description = "Utility for writing dynamic progress bars to the console."
|
description = "Utility for writing dynamic progress bars to the console."
|
||||||
license = "BSD"
|
license = "BSD"
|
||||||
@ -9,4 +9,3 @@ srcDir = "src/main/nim"
|
|||||||
# Dependencies
|
# Dependencies
|
||||||
|
|
||||||
requires "nim >= 0.13.0"
|
requires "nim >= 0.13.0"
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ proc getMax*(pd: Progress): BiggestInt =
|
|||||||
proc setMax*(pd: Progress, maxValue: BiggestInt) =
|
proc setMax*(pd: Progress, maxValue: BiggestInt) =
|
||||||
pd.maxValue = max(maxValue, 1)
|
pd.maxValue = max(maxValue, 1)
|
||||||
|
|
||||||
proc newProgress*(sout: File, maxValue: BiggestInt): Progress =
|
proc newProgress*(maxValue: BiggestInt, sout: File = stdout): Progress =
|
||||||
return Progress(sout: sout,
|
return Progress(sout: sout,
|
||||||
startTime: cpuTime(),
|
startTime: cpuTime(),
|
||||||
lastStep: 0,
|
lastStep: 0,
|
||||||
@ -30,8 +30,8 @@ proc updateProgress*(pd: Progress, newValue: BiggestInt, info: string): void =
|
|||||||
|
|
||||||
if info == pd.lastInfo and curStep == pd.lastStep: return
|
if info == pd.lastInfo and curStep == pd.lastStep: return
|
||||||
|
|
||||||
let curTime = cpuTime()
|
let curDuration = cpuTime() - pd.startTime
|
||||||
let remTime = ((curTime / curPercent) - curTime) * 1000
|
let remTime = ((curDuration / curPercent) - curDuration)
|
||||||
let displayedSteps = max(curStep - 1, 0)
|
let displayedSteps = max(curStep - 1, 0)
|
||||||
|
|
||||||
pd.lastInfo = info
|
pd.lastInfo = info
|
||||||
|
Loading…
x
Reference in New Issue
Block a user