commit_hash stringlengths 40 40 | author stringlengths 1 57 | date timestamp[s]date 2010-07-26 04:45:09 2026-04-14 18:21:10 | message stringlengths 8 1.39M | diff stringlengths 68 51.2k | files_changed int64 1 136 | insertions int64 0 2.35k | deletions int64 0 1.9k |
|---|---|---|---|---|---|---|---|
725449bfb3f4e39a543b023561b20365d9052a62 | Sebastian Thiel | 2020-11-02T12:36:28 | cargo clippy | diff --git a/src/unit/display.rs b/src/unit/display.rs
index f0c7177..8b36d26 100644
--- a/src/unit/display.rs
+++ b/src/unit/display.rs
@@ -96,16 +96,10 @@ pub(crate) enum What {
impl What {
fn values(&self) -> bool {
- match self {
- What::Values | What::ValuesAndUnit => true,
- _... | 1 | 2 | 8 |
a3bf8beeb8f9496fa102ff59aeb4a7c6bdcac70e | Sebastian Thiel | 2020-09-29T15:28:08 | Ignore interrupts when reading inputs…
…as they can happen when the program is put into the background for
instance. | diff --git a/crosstermion/src/input.rs b/crosstermion/src/input.rs
index bcfba03..4b6f03c 100644
--- a/crosstermion/src/input.rs
+++ b/crosstermion/src/input.rs
@@ -21,6 +21,21 @@ pub enum Key {
Esc,
}
+#[cfg(any(feature = "crossterm", feature = "termion"))]
+enum Action<T> {
+ Continue,
+ Result(Result<T... | 1 | 33 | 3 |
b5aa292bd89cb223e9239bad3decc74495363b55 | Sebastian Thiel | 2020-09-29T08:31:36 | update to crossterm 0.18, but…
…tui also needs this to be updated | diff --git a/crosstermion/Cargo.toml b/crosstermion/Cargo.toml
index 1b4af9a..f0b0c7c 100644
--- a/crosstermion/Cargo.toml
+++ b/crosstermion/Cargo.toml
@@ -28,7 +28,7 @@ tui-crossterm-backend = ["tui/crossterm"]
[dependencies]
-crossterm = { version = "0.17.5", optional = true, default-features = false }
+crosste... | 1 | 1 | 1 |
a70e96d64f52de0d3d4fcec9cbacbdf0fd6b7bb0 | Sebastian Thiel | 2020-09-28T12:07:02 | update to tui 0.12 | diff --git a/Cargo.toml b/Cargo.toml
index 99beacf..f450350 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -70,14 +70,14 @@ parking_lot = { version = "0.11.0", optional = true, default-features = false }
log = { version = "0.4.8", optional = true }
# render-tui
-tui = { version = "0.10.0", optional = true, default-fea... | 1 | 3 | 3 |
6e84aef4df2d5d4c465abaa9b8a8a804f238e4ac | Sebastian Thiel | 2020-09-17T03:11:08 | (cargo-release) version 10.0.2 | diff --git a/Cargo.toml b/Cargo.toml
index a85fb72..99beacf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "prodash"
-version = "10.0.1"
+version = "10.0.2"
authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"]
description = "A dashboard for visualizing progress of asynchronous and p... | 1 | 1 | 1 |
4fda4c05e5f4b7be2ff4a3b8898b060aa5c49ed4 | Sebastian Thiel | 2020-09-17T02:37:37 | Switch to release version of futures-lite | diff --git a/Cargo.toml b/Cargo.toml
index 030c7a4..38f78c8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -75,7 +75,7 @@ tui = { version = "0.10.0", optional = true, default-features = false }
tui-react = { version = "0.10.0", optional = true }
futures-core = { version = "0.3.4", optional = true, default-features = fal... | 1 | 1 | 1 |
e187a9d4addcde2587f02fdffa1d7a06a58dd3a6 | Sebastian Thiel | 2020-09-14T12:15:18 | (cargo-release) version 0.3.2 | diff --git a/crosstermion/Cargo.toml b/crosstermion/Cargo.toml
index 213de3d..5548aff 100644
--- a/crosstermion/Cargo.toml
+++ b/crosstermion/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "crosstermion"
-version = "0.3.1"
+version = "0.3.2"
authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"]
description = "The... | 1 | 1 | 1 |
0a6b6bcb2ce629254e715ecdff5544303e7c2d2c | Sebastian Thiel | 2020-09-13T11:22:06 | (cargo-release) version 0.3.1 | diff --git a/crosstermion/Cargo.toml b/crosstermion/Cargo.toml
index 4e4944b..070f164 100644
--- a/crosstermion/Cargo.toml
+++ b/crosstermion/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "crosstermion"
-version = "0.3.0"
+version = "0.3.1"
authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"]
description = "The... | 1 | 1 | 1 |
da021ea8306eaadb2bd40b155d4c431a164b6c42 | Sebastian Thiel | 2020-09-13T11:21:51 | upgrade futures-lite dependency | diff --git a/crosstermion/Cargo.toml b/crosstermion/Cargo.toml
index bd2c27a..4e4944b 100644
--- a/crosstermion/Cargo.toml
+++ b/crosstermion/Cargo.toml
@@ -34,7 +34,7 @@ futures-channel = { version = "0.3.5", optional = true, default-features = false
futures-core = { version = "0.3.5", optional = true, default-featur... | 1 | 1 | 1 |
a401d55dffd8191308dcee55c3404d6e0d777ccd | Sebastian Thiel | 2020-09-13T10:13:47 | (cargo-release) version 10.0.1 | diff --git a/Cargo.toml b/Cargo.toml
index b6ef2e9..803e670 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "prodash"
-version = "10.0.0"
+version = "10.0.1"
authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"]
description = "A dashboard for visualizing progress of asynchronous and p... | 1 | 1 | 1 |
01db9af60103abc1c2dbc486943c5fe9878abb1b | Sebastian Thiel | 2020-09-13T10:05:59 | upgrade blocking | diff --git a/Cargo.toml b/Cargo.toml
index 2c66b50..b6ef2e9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -104,7 +104,7 @@ futures-util = { version = "0.3.4", default-features = false }
argh = "0.1.3"
futures = "0.3.5"
atty = "0.2.14"
-blocking = "0.5.0"
+blocking = "1.0.0"
multitask = "0.2.0"
once_cell = "1.4.0"
p... | 3 | 6 | 6 |
4d71843120b68fa431628627b6b5458b3576b70a | Sebastian Thiel | 2020-09-13T10:00:46 | upgrade async-io | diff --git a/Cargo.toml b/Cargo.toml
index a83cd8e..2c66b50 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -80,7 +80,7 @@ humantime = { version = "2.0.0", optional = true }
unicode-segmentation = { version = "1.6.0", optional = true }
unicode-width = { version = "0.1.7", optional = true }
crosstermion = { version = "0.... | 3 | 6 | 5 |
9eb47a671ea8befb7f16d805d9c7c57f0c72d5c2 | Sebastian Thiel | 2020-09-13T09:54:12 | upgrade to latest futures-lite | diff --git a/Cargo.toml b/Cargo.toml
index f2cce82..a83cd8e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -75,7 +75,7 @@ tui = { version = "0.10.0", optional = true, default-features = false }
tui-react = { version = "0.10.0", optional = true }
futures-core = { version = "0.3.4", optional = true, default-features = fal... | 1 | 1 | 1 |
360d3ee664b21c126b087ada5cd897927e0389bc | Sebastian Thiel | 2020-08-10T10:54:06 | more precise throughput computation | diff --git a/src/throughput.rs b/src/throughput.rs
index b87f6d6..e9b81b8 100644
--- a/src/throughput.rs
+++ b/src/throughput.rs
@@ -1,4 +1,5 @@
use crate::{progress, unit};
+use std::collections::VecDeque;
use std::time::{Duration, SystemTime};
const THROTTLE_INTERVAL: Duration = Duration::from_secs(1);
@@ -7,8 +... | 1 | 26 | 7 |
52661eea38a511d3b1b47d63fd9ef9ac0f46caaf | Sebastian Thiel | 2020-08-10T10:35:26 | remove throughput field which was effectively constant | diff --git a/src/throughput.rs b/src/throughput.rs
index bfb34d5..b87f6d6 100644
--- a/src/throughput.rs
+++ b/src/throughput.rs
@@ -2,11 +2,10 @@ use crate::{progress, unit};
use std::time::{Duration, SystemTime};
const THROTTLE_INTERVAL: Duration = Duration::from_secs(1);
+const ONCE_A_SECOND: Duration = Duration... | 1 | 4 | 8 |
a4ea34c5a0f5370e7d109abccab3872c4f38aa8d | Sebastian Thiel | 2020-08-10T09:49:12 | ThroughputOnDrop utility | diff --git a/src/progress/mod.rs b/src/progress/mod.rs
index fe74cff..c55b5b4 100644
--- a/src/progress/mod.rs
+++ b/src/progress/mod.rs
@@ -12,7 +12,7 @@ pub use self::log::Log;
#[doc(inline)]
pub use key::Key;
-pub use utils::{Discard, DoOrDiscard, Either};
+pub use utils::{Discard, DoOrDiscard, Either, Throughpu... | 2 | 53 | 1 |
2d57a54c1508bc9314713384fe9cb08f949cbf76 | Sebastian Thiel | 2020-08-10T09:00:24 | provide a way to take out progress from a DropOrDiscard (for
completeness) | diff --git a/src/progress/utils.rs b/src/progress/utils.rs
index 5272210..105dbfc 100644
--- a/src/progress/utils.rs
+++ b/src/progress/utils.rs
@@ -105,13 +105,21 @@ where
}
}
-impl<T> DoOrDiscard<T> {
+impl<T: Progress> DoOrDiscard<T> {
pub fn into_inner(self) -> Option<T> {
match self {
... | 1 | 13 | 5 |
a80104c955675c6cc40adcd8b90885010bfc9d0a | Sebastian Thiel | 2020-08-10T08:01:56 | Make throughput printing more flexible, allowing to override value and unit | diff --git a/src/traits.rs b/src/traits.rs
index 3f13111..17c5400 100644
--- a/src/traits.rs
+++ b/src/traits.rs
@@ -73,36 +73,46 @@ pub trait Progress {
}
/// A shorthand to print throughput information
fn show_throughput(&mut self, start: Instant) {
- let elapsed = start.elapsed().as_secs_f32();... | 1 | 37 | 27 |
0e8427029abb2d87244aa51669ea82086b545b81 | Sebastian Thiel | 2020-08-10T07:25:17 | format throughput utility with less arguments and using available Unit | diff --git a/src/progress/log.rs b/src/progress/log.rs
index abc2f42..c199f3f 100644
--- a/src/progress/log.rs
+++ b/src/progress/log.rs
@@ -71,6 +71,18 @@ impl Progress for Log {
}
}
+ fn unit(&self) -> Option<Unit> {
+ self.unit.clone()
+ }
+
+ fn max(&self) -> Option<usize> {
+ ... | 5 | 128 | 19 |
7c5be6b62a85d8b06d1f2609203e38173903e611 | Sebastian Thiel | 2020-08-10T05:03:25 | fix benchmarks | diff --git a/benches/usage.rs b/benches/usage.rs
index 9c0806b..ef5e808 100644
--- a/benches/usage.rs
+++ b/benches/usage.rs
@@ -1,6 +1,6 @@
use criterion::*;
-use prodash::{tree::MessageLevel, Tree, TreeOptions};
+use prodash::{messages::MessageLevel, Tree, TreeOptions};
fn usage(c: &mut Criterion) {
fn sma... | 1 | 1 | 1 |
8cf7452b795d0d1b7e16df75cf4a1cd4c3cbec3f | Sebastian Thiel | 2020-08-10T05:00:42 | Make 'Log' more intuitive to reach | diff --git a/src/progress/mod.rs b/src/progress/mod.rs
index 900c755..fe74cff 100644
--- a/src/progress/mod.rs
+++ b/src/progress/mod.rs
@@ -5,7 +5,9 @@ pub mod key;
mod utils;
#[cfg(feature = "progress-log")]
-pub mod log;
+mod log;
+#[cfg(feature = "progress-log")]
+pub use self::log::Log;
#[doc(inline)]
pub ... | 1 | 3 | 1 |
4b396f5f49d879006801cd678a17628ec56f3d19 | Sebastian Thiel | 2020-08-10T04:56:04 | convenience functions for nicer use of render() | diff --git a/src/render/mod.rs b/src/render/mod.rs
index 1e42be6..0f498ae 100644
--- a/src/render/mod.rs
+++ b/src/render/mod.rs
@@ -1,5 +1,9 @@
#[cfg(feature = "render-tui")]
pub mod tui;
+#[cfg(feature = "render-tui")]
+pub use self::tui::render as tui;
#[cfg(feature = "render-line")]
pub mod line;
+#[cfg(featu... | 1 | 4 | 0 |
72bfa47d468b2ecaf6086b62b2d1a25c860f1baa | Sebastian Thiel | 2020-08-10T04:15:49 | thanks clipppy | diff --git a/src/progress/log.rs b/src/progress/log.rs
index 33ccdb0..abc2f42 100644
--- a/src/progress/log.rs
+++ b/src/progress/log.rs
@@ -53,16 +53,15 @@ impl Progress for Log {
return;
}
let now = std::time::SystemTime::now();
- if self
+ let last_emission_time = self
... | 2 | 7 | 5 |
37f1266131bf52b35e5c473305f4c1d07df468f2 | Sebastian Thiel | 2020-08-10T04:11:22 | log progress now works with units | diff --git a/src/progress/log.rs b/src/progress/log.rs
index e4ce790..33ccdb0 100644
--- a/src/progress/log.rs
+++ b/src/progress/log.rs
@@ -64,9 +64,8 @@ impl Progress for Log {
> EMIT_LOG_EVERY_S
{
self.last_set = Some(now);
- match (self.max, self.unit) {
- ... | 2 | 4 | 5 |
3da74b0aff7c615911f0259336b7ec28a11249d1 | Sebastian Thiel | 2020-08-10T03:25:04 | Make tui renderer use Root trait | diff --git a/src/render/tui/engine.rs b/src/render/tui/engine.rs
index ac4ed3c..bdbe3e2 100644
--- a/src/render/tui/engine.rs
+++ b/src/render/tui/engine.rs
@@ -1,4 +1,4 @@
-use crate::{render::tui::draw, render::tui::ticker, tree::Root, Throughput};
+use crate::{render::tui::draw, render::tui::ticker, Root, Throughput... | 1 | 3 | 3 |
a977c446534ea7c18f037e2a51dcbc419aac7c3d | Sebastian Thiel | 2020-08-10T03:23:30 | use Root trait in line renderer | diff --git a/src/render/line/draw.rs b/src/render/line/draw.rs
index a5e8701..a28a83d 100644
--- a/src/render/line/draw.rs
+++ b/src/render/line/draw.rs
@@ -1,8 +1,7 @@
use crate::{
messages::{Message, MessageCopyState, MessageLevel},
progress::{self, Value},
- tree::{self},
- unit, Throughput,
+ un... | 2 | 8 | 5 |
ec5c6732098f9f90ba62184aacdd76f397d3d8a8 | Sebastian Thiel | 2020-08-10T03:14:07 | Implement Root trait for tree::Root | diff --git a/src/lib.rs b/src/lib.rs
index e9bc71c..e2ab6fb 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -54,12 +54,11 @@ pub mod messages;
pub mod progress;
mod traits;
+pub use traits::{Progress, Root};
mod throughput;
pub use crate::throughput::Throughput;
-pub use traits::Progress;
-
#[cfg(not(feature = "... | 3 | 31 | 9 |
63fd65a82c57af25023ee9615662481b49e1d4e3 | Sebastian Thiel | 2020-08-10T02:42:38 | refactor | diff --git a/src/progress/mod.rs b/src/progress/mod.rs
new file mode 100644
index 0000000..35601cd
--- /dev/null
+++ b/src/progress/mod.rs
@@ -0,0 +1,60 @@
+use crate::unit::Unit;
+use std::time::SystemTime;
+
+mod utils;
+pub use utils::{Discard, DoOrDiscard, Either};
+
+/// The amount of steps a progress can make
+pu... | 2 | 62 | 59 |
08d30c61f12aa69a66e46639016e4c9c15300a20 | Sebastian Thiel | 2020-08-10T02:33:15 | first stab at sketching out the Root trait - it needs a key, however :D | diff --git a/src/traits.rs b/src/traits.rs
index 80b143b..63a5677 100644
--- a/src/traits.rs
+++ b/src/traits.rs
@@ -75,3 +75,27 @@ pub trait Progress {
));
}
}
+
+use crate::messages::{Message, MessageCopyState};
+
+trait Root {
+ /// Returns the maximum amount of messages we can keep before overwrit... | 3 | 25 | 8 |
93ffb6037bec833fdf2d0bc51bbe6632d06aa17a | Sebastian Thiel | 2020-08-10T02:04:12 | Add `Progress` trait and implement it for `tree::Item` | diff --git a/src/lib.rs b/src/lib.rs
index 55e571c..6eece6a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -54,6 +54,7 @@ pub mod messages;
pub mod progress;
mod traits;
+pub use traits::Progress;
#[cfg(not(feature = "log-renderer"))]
mod log {
diff --git a/src/progress.rs b/src/progress.rs
index 3e90d0d..77a7503 ... | 4 | 218 | 0 |
f021ed8f26faa360bfbd68b3a4479540dcea2942 | Sebastian Thiel | 2020-08-10T01:52:15 | Rename `Value` -> `Task` and `Progress` -> `Value` | diff --git a/src/progress.rs b/src/progress.rs
index 8ad2c51..3e90d0d 100644
--- a/src/progress.rs
+++ b/src/progress.rs
@@ -25,7 +25,7 @@ impl Default for State {
/// Progress associated with some item in the progress tree.
#[derive(Clone, Default, Debug)]
-pub struct Progress {
+pub struct Value {
/// The am... | 9 | 44 | 48 |
4e38c6bb1ea157fb067dd61f015e2cb0a2855c70 | Sebastian Thiel | 2020-08-10T01:29:49 | prepare for generalizing the root interface to keep renderers general…
…and allow possibly other implementations of the progress tree. | diff --git a/src/lib.rs b/src/lib.rs
index 8cc5d27..d069ddb 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -52,6 +52,8 @@ pub use unit::Unit;
pub mod progress;
+mod traits;
+
#[cfg(not(feature = "log-renderer"))]
mod log {
/// Stub
diff --git a/src/progress.rs b/src/progress.rs
index beddac0..8ad2c51 100644
--... | 5 | 50 | 43 |
e6f242e8555b2ef0fc15d6cf25273a991332f47c | Sebastian Thiel | 2020-08-10T01:19:36 | move most progress related types back to tree, however…
…maybe it's better to have them in a general place to allow building
traits around them. | diff --git a/src/lib.rs b/src/lib.rs
index 96eb25e..8cc5d27 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -51,8 +51,6 @@ pub mod unit;
pub use unit::Unit;
pub mod progress;
-#[doc(inline)]
-pub use progress::Progress;
#[cfg(not(feature = "log-renderer"))]
mod log {
diff --git a/src/progress.rs b/src/progress.rs
i... | 19 | 68 | 64 |
7435f35f9ddd88443eb87c0fe13256172d23d0f5 | Sebastian Thiel | 2020-08-09T14:29:39 | thanks clippy | diff --git a/src/tree/throughput.rs b/src/tree/throughput.rs
index d601f90..dce0f6b 100644
--- a/src/tree/throughput.rs
+++ b/src/tree/throughput.rs
@@ -36,7 +36,7 @@ impl State {
}
fn update(&mut self, value: progress::Step, elapsed: Duration) -> Option<unit::display::Throughput> {
- self.aggregate_... | 1 | 1 | 1 |
be39f49fa2e84139c6af2e870dcf079b234cabe6 | Sebastian Thiel | 2020-08-09T14:22:21 | disable throughput for dashboard as it's not reqired | diff --git a/examples/dashboard.rs b/examples/dashboard.rs
index 67334e4..f415248 100644
--- a/examples/dashboard.rs
+++ b/examples/dashboard.rs
@@ -45,7 +45,7 @@ async fn work_forever(mut args: args::Options) -> Result {
Some(never_ending.boxed())
} else {
Some(
- shared::launch_ambie... | 3 | 5 | 4 |
2e91ed217f241290ffcb36c77e178f26393df422 | Sebastian Thiel | 2020-08-09T11:40:27 | Now it works! | diff --git a/src/tui/draw/progress.rs b/src/tui/draw/progress.rs
index 976ea61..3b9176f 100644
--- a/src/tui/draw/progress.rs
+++ b/src/tui/draw/progress.rs
@@ -147,7 +147,7 @@ impl<'a> fmt::Display for ProgressFormat<'a> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self.0 {
... | 1 | 1 | 1 |
d0e3af34ebf5f01bc1923e0024667200361a104b | Sebastian Thiel | 2020-08-09T11:38:24 | first attempt to bring throughput to TUI | diff --git a/examples/shared/mod.rs b/examples/shared/mod.rs
index 3f7c937..bb4e94f 100644
--- a/examples/shared/mod.rs
+++ b/examples/shared/mod.rs
@@ -64,6 +64,7 @@ pub fn launch_ambient_gui(
title: TITLES.choose(&mut thread_rng()).copied().unwrap().into(),
frames_per_second: args.fp... | 6 | 47 | 19 |
9212de4662f7e35492a8796d5ef4dcece91e5ea8 | Sebastian Thiel | 2020-08-09T11:24:56 | refactor | diff --git a/src/line/draw.rs b/src/line/draw.rs
index 98cd3c2..7adea10 100644
--- a/src/line/draw.rs
+++ b/src/line/draw.rs
@@ -3,7 +3,7 @@ use crosstermion::{
ansi_term::{ANSIString, ANSIStrings, Color, Style},
color,
};
-use std::{collections::VecDeque, io, iter::FromIterator, ops::RangeInclusive, time::D... | 4 | 38 | 29 |
6a4ae4e7b933695e4c32359237c97cacc543ea8c | Sebastian Thiel | 2020-08-09T11:12:33 | Throttling throughput recomputation to 1s really does the trick | diff --git a/src/tree/throughput.rs b/src/tree/throughput.rs
index 8e7c2c2..8084ae8 100644
--- a/src/tree/throughput.rs
+++ b/src/tree/throughput.rs
@@ -1,35 +1,54 @@
use crate::{progress, tree, unit};
use std::time::Duration;
+const THROTTLE_INTERVAL: Duration = Duration::from_secs(1);
+
#[derive(Clone, Eq, Parti... | 1 | 24 | 5 |
0ceebd4fa0e3b25e15cbeb3b68dddc76b28515e2 | Sebastian Thiel | 2020-08-09T10:52:54 | First working example for throughput, but…
It's way too instable due to timing differences. Ideally it will be able
to produce values much closer to what they really are.
Maybe just an issue with big numbers. | diff --git a/examples/units.rs b/examples/units.rs
index 14b214b..917f808 100644
--- a/examples/units.rs
+++ b/examples/units.rs
@@ -53,16 +53,16 @@ fn work_for_a_long_time_blocking(root: Tree) {
)),
);
- fn formatter() -> unit::human::Formatter {
+ fn formatter(decimals: usize) -> unit::human::Fo... | 2 | 10 | 5 |
e2ffb047b2eab3785b33db0925e7503d8e6300ea | Sebastian Thiel | 2020-08-09T10:08:14 | first dummy throughput impl does what it should, nice! | diff --git a/examples/units.rs b/examples/units.rs
index ec21b58..14b214b 100644
--- a/examples/units.rs
+++ b/examples/units.rs
@@ -26,13 +26,19 @@ fn main() -> Result {
fn work_for_a_long_time_blocking(root: Tree) {
let mut bytes = root.add_child("download unknown");
- bytes.init(None, Some(unit::dynamic(u... | 2 | 31 | 9 |
74315bf28e8451ef8008c6b98630b8984db38464 | Sebastian Thiel | 2020-08-09T09:57:26 | possibly working impl of getting the throughput + reconcile | diff --git a/src/tree/throughput.rs b/src/tree/throughput.rs
index 3dc6fc6..fb5d077 100644
--- a/src/tree/throughput.rs
+++ b/src/tree/throughput.rs
@@ -10,14 +10,21 @@ struct State {
}
impl State {
- fn new(value: progress::Step) -> Self {
+ fn new(value: progress::Step, elapsed: Duration) -> Self {
... | 1 | 22 | 4 |
a1af8fc78b7e5f8fd49b28df6352e9690caed8af | Sebastian Thiel | 2020-08-09T09:44:34 | integrate calls to (optional) throughput into line renderer | diff --git a/examples/shared/mod.rs b/examples/shared/mod.rs
index df073d6..3f7c937 100644
--- a/examples/shared/mod.rs
+++ b/examples/shared/mod.rs
@@ -50,6 +50,7 @@ pub fn launch_ambient_gui(
initial_delay: args.line_initial_delay.map(Duration::from_secs_f32),
frames_per_seco... | 5 | 45 | 15 |
2edeefca27592583186bca914b50e4bf6fc5f7e7 | Sebastian Thiel | 2020-08-09T09:19:01 | first sketch of Thoughput handler | diff --git a/src/tree/mod.rs b/src/tree/mod.rs
index bfc9ccf..30ea4ef 100644
--- a/src/tree/mod.rs
+++ b/src/tree/mod.rs
@@ -10,6 +10,9 @@ pub use messages::{Message, MessageCopyState, MessageLevel};
mod item;
pub use item::Item;
+mod throughput;
+pub use throughput::Throughput;
+
pub mod key;
#[doc(inline)]
pub... | 3 | 37 | 20 |
19e090164be073351b16ded0a75168b48a5cf654 | Sebastian Thiel | 2020-08-09T08:36:20 | refactor | diff --git a/src/lib.rs b/src/lib.rs
index f908ad4..3af54ba 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -47,6 +47,7 @@ pub use log::info;
#[cfg(feature = "log-renderer")]
pub use log::warn;
+mod progress;
#[cfg(any(feature = "humantime", feature = "time"))]
pub mod time;
pub mod unit;
diff --git a/src/tree/progr... | 3 | 2 | 2 |
040204078802f1d97a1a186f75d2e61cda3dd5d5 | Sebastian Thiel | 2020-08-09T08:35:19 | refactor | diff --git a/src/tree/item.rs b/src/tree/item.rs
index cb17673..f3a3167 100644
--- a/src/tree/item.rs
+++ b/src/tree/item.rs
@@ -1,3 +1,4 @@
+use crate::tree::ProgressStep;
use crate::{
tree::{messages::MessageRingBuffer, Key, MessageLevel, Progress, ProgressState, Value},
unit::Unit,
@@ -38,8 +39,6 @@ impl ... | 3 | 61 | 57 |
b981d2eb055248ee67ada33da3b4ef946a842e8d | Sebastian Thiel | 2020-08-09T08:31:58 | refactor | diff --git a/src/tree/key.rs b/src/tree/key.rs
new file mode 100644
index 0000000..20bffd8
--- /dev/null
+++ b/src/tree/key.rs
@@ -0,0 +1,235 @@
+use crate::tree::{item, Value};
+use std::ops::{Index, IndexMut};
+
+// NOTE: This means we will show weird behaviour if there are more than 2^16 tasks at the same time on a ... | 4 | 242 | 238 |
c6068c58bbcbf8faa28d9dc7d5ec3766ec41d953 | Sebastian Thiel | 2020-08-09T08:18:25 | refactor | diff --git a/src/tree/item.rs b/src/tree/item.rs
new file mode 100644
index 0000000..cb17673
--- /dev/null
+++ b/src/tree/item.rs
@@ -0,0 +1,214 @@
+use crate::{
+ tree::{messages::MessageRingBuffer, Key, MessageLevel, Progress, ProgressState, Value},
+ unit::Unit,
+};
+use dashmap::DashMap;
+use parking_lot::Mut... | 4 | 231 | 222 |
983d2e5c90773694dcd42fa54b5574a61621cf44 | Sebastian Thiel | 2020-08-09T08:08:27 | refactor | diff --git a/src/tree/messages.rs b/src/tree/messages.rs
new file mode 100644
index 0000000..42cc93b
--- /dev/null
+++ b/src/tree/messages.rs
@@ -0,0 +1,120 @@
+use std::time::SystemTime;
+
+/// The severity of a message
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub enum MessageLevel {
+ /// Ra... | 2 | 123 | 118 |
0c537ab65af9d388e02fdea7175e7fbcd4fb4a3e | Sebastian Thiel | 2020-08-09T08:03:13 | refactor | diff --git a/examples/units.rs b/examples/units.rs
index 3244844..ec21b58 100644
--- a/examples/units.rs
+++ b/examples/units.rs
@@ -30,7 +30,10 @@ fn work_for_a_long_time_blocking(root: Tree) {
let mut bytes_max = root.add_child("download");
bytes_max.init(
Some(100_000_000),
- Some(unit::dyn... | 5 | 140 | 141 |
fd687101407eced316b544dff48bb914acc5cf7f | Sebastian Thiel | 2020-08-09T07:46:12 | basic display of timespans for throughputs | diff --git a/src/unit/display.rs b/src/unit/display.rs
index 33f8bbc..0e5c08e 100644
--- a/src/unit/display.rs
+++ b/src/unit/display.rs
@@ -29,6 +29,7 @@ impl Default for ThroughputState {
}
}
+#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Debug)]
pub struct Throughput {
pub value_change_in_times... | 3 | 72 | 11 |
40869a8322faa352c0d082f7ee33c2e533d9836d | Sebastian Thiel | 2020-08-09T06:44:06 | refactor | diff --git a/src/line/draw.rs b/src/line/draw.rs
index 0fa34ed..6239fcf 100644
--- a/src/line/draw.rs
+++ b/src/line/draw.rs
@@ -264,7 +264,7 @@ fn format_progress<'a>(
column_count: u16,
colored: bool,
midpoint: Option<u16>,
- elapsed: Option<Duration>,
+ _elapsed: Option<Duration>,
buf: &mut... | 6 | 262 | 234 |
682dee2ad35766c56e01458d0ec151587079ee4a | Sebastian Thiel | 2020-08-09T05:55:06 | prepare to move throughput calculations into renderer | diff --git a/src/line/draw.rs b/src/line/draw.rs
index 589c18a..0fa34ed 100644
--- a/src/line/draw.rs
+++ b/src/line/draw.rs
@@ -281,7 +281,7 @@ fn format_progress<'a>(
let values_brush = brush.style(Style::new().bold().dimmed());
match progress.unit.as_ref() {
Some(unit) => {... | 4 | 86 | 46 |
66800fd4e6c9f517f19da4e26a75cb3f139353b0 | Sebastian Thiel | 2020-08-09T04:22:30 | FAIL: Attempt to impl throughput in display…
…which can't work because it's actually never mutable due to the way
drawing work: it operates on a snapshot, a copy, that is not written
back.
And even if it was, the type system statically concludes sync is needed
as well for this to work.
Long story short: No state cha... | diff --git a/src/unit/mod.rs b/src/unit/mod.rs
index 9c66c17..55684f2 100644
--- a/src/unit/mod.rs
+++ b/src/unit/mod.rs
@@ -129,32 +129,36 @@ impl Unit {
}
}
-#[derive(Copy, Clone, Hash, Eq, PartialEq, Ord, PartialOrd, Debug)]
+#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Debug)]
pub enum Location {
... | 2 | 42 | 11 |
eb224176f041de36f9a6ab42888bceef0d3b85c5 | Sebastian Thiel | 2020-08-09T02:45:55 | pass elapsed time on in tui renderer | diff --git a/src/line/draw.rs b/src/line/draw.rs
index dc8fc48..589c18a 100644
--- a/src/line/draw.rs
+++ b/src/line/draw.rs
@@ -3,7 +3,7 @@ use crosstermion::{
ansi_term::{ANSIString, ANSIStrings, Color, Style},
color,
};
-use std::{collections::VecDeque, io, iter::FromIterator, ops::RangeInclusive};
+use s... | 4 | 15 | 10 |
33be555f1e6c5141c5ee756a1d42b7ea0762f975 | Sebastian Thiel | 2020-08-09T02:37:21 | pass elapsed time on in line renderer | diff --git a/src/line/draw.rs b/src/line/draw.rs
index e4720bf..dc8fc48 100644
--- a/src/line/draw.rs
+++ b/src/line/draw.rs
@@ -17,6 +17,8 @@ pub struct State {
last_progress_midpoint: Option<u16>,
/// The amount of blocks per line we have written last time.
blocks_per_line: VecDeque<u16>,
+ /// The ... | 2 | 8 | 1 |
a4b4ab7d95457f7b662fb98d12eefb2bd0c34f39 | Sebastian Thiel | 2020-08-09T02:27:28 | Allow providing an optional elapsed duration…
…as during the first frame no time has elapsed yet. | diff --git a/src/line/draw.rs b/src/line/draw.rs
index 6788fd0..e4720bf 100644
--- a/src/line/draw.rs
+++ b/src/line/draw.rs
@@ -277,7 +277,7 @@ fn format_progress<'a>(
let values_brush = brush.style(Style::new().bold().dimmed());
match progress.unit.as_ref() {
Some(unit) => {... | 4 | 36 | 21 |
963c933ebd2f5dcb090460dc79c445e122731c9a | Sebastian Thiel | 2020-08-09T02:19:20 | First test for throughput - before major refactoring | diff --git a/examples/units.rs b/examples/units.rs
index e283c7d..3244844 100644
--- a/examples/units.rs
+++ b/examples/units.rs
@@ -30,7 +30,7 @@ fn work_for_a_long_time_blocking(root: Tree) {
let mut bytes_max = root.add_child("download");
bytes_max.init(
Some(100_000_000),
- Some(unit::dyna... | 3 | 66 | 19 |
3266fad2ad5e63855eb92c1f0c390bf2bfd8167f | Sebastian Thiel | 2020-08-09T01:45:50 | prepare throughput display | diff --git a/examples/units.rs b/examples/units.rs
index 9a97cf9..e283c7d 100644
--- a/examples/units.rs
+++ b/examples/units.rs
@@ -30,10 +30,7 @@ fn work_for_a_long_time_blocking(root: Tree) {
let mut bytes_max = root.add_child("download");
bytes_max.init(
Some(100_000_000),
- Some(unit::dyn... | 3 | 47 | 41 |
b41311114ce3be7174dea7c1751fb15b20284794 | Sebastian Thiel | 2020-08-09T01:24:02 | Make Unit a struct, introduce new 'Kind' to capture dynamic and static strings of display value | diff --git a/src/unit/mod.rs b/src/unit/mod.rs
index d4c9e2f..0a23da9 100644
--- a/src/unit/mod.rs
+++ b/src/unit/mod.rs
@@ -52,17 +52,23 @@ impl DisplayValue for &'static str {
}
}
+#[derive(Debug, Clone)]
+pub struct Unit {
+ kind: Kind,
+ mode: Option<Mode>,
+}
+
#[derive(Clone)]
-pub enum Unit {
- ... | 1 | 34 | 15 |
ea705ac4089d7958e97b81f3ee1f8261e9948d2f | Sebastian Thiel | 2020-08-09T01:09:49 | prepare Mode to carry information about throughput handling | diff --git a/examples/units.rs b/examples/units.rs
index 3d80f40..9a97cf9 100644
--- a/examples/units.rs
+++ b/examples/units.rs
@@ -30,7 +30,10 @@ fn work_for_a_long_time_blocking(root: Tree) {
let mut bytes_max = root.add_child("download");
bytes_max.init(
Some(100_000_000),
- Some(unit::dyn... | 3 | 54 | 17 |
a2d35fb096a915c0a55985f619a12149add29251 | Sebastian Thiel | 2020-08-08T13:32:22 | fix benches | diff --git a/benches/usage.rs b/benches/usage.rs
index 17e89ba..9c0806b 100644
--- a/benches/usage.rs
+++ b/benches/usage.rs
@@ -26,7 +26,7 @@ fn usage(c: &mut Criterion) {
.bench_function("set tree 5 times", |b| {
let root = small_tree();
let mut progress = root.add_child("the one");... | 1 | 3 | 3 |
e3bdbf1a8ef5c132405ec6570422b87ed07360ce | Sebastian Thiel | 2020-08-08T12:40:04 | first simple progress bar using bytes | diff --git a/Cargo.toml b/Cargo.toml
index 929bcbd..dacd0f8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,7 +25,14 @@ required-features = ["tui-renderer", "tui-renderer-termion", "line-renderer", "l
[[example]]
name = "units"
path = "examples/units.rs"
-required-features = ["tui-renderer", "tui-renderer-crossterm"... | 6 | 67 | 38 |
2f1cb125b455c7357fd6576f3180e145c5efdc44 | Sebastian Thiel | 2020-08-08T12:09:34 | frame for new example program | diff --git a/Cargo.toml b/Cargo.toml
index d649907..929bcbd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,6 +22,11 @@ name = "dashboard-termion"
path = "examples/dashboard.rs"
required-features = ["tui-renderer", "tui-renderer-termion", "line-renderer", "line-renderer-termion"]
+[[example]]
+name = "units"
+path ... | 4 | 34 | 6 |
6a185843344c1f54efc70f8bcf0e3736b6be87b0 | Sebastian Thiel | 2020-08-08T12:01:00 | refactor | diff --git a/examples/dashboard.rs b/examples/dashboard.rs
index 1f97f55..fffaa7f 100644
--- a/examples/dashboard.rs
+++ b/examples/dashboard.rs
@@ -12,11 +12,11 @@ compile_error!(
fn main() -> Result {
env_logger::init();
- let args: arg::Options = argh::from_env();
+ let args: args::Options = argh::from... | 3 | 6 | 6 |
afb0c91a20bd187f271791056238b0563015fbd1 | Sebastian Thiel | 2020-08-08T08:46:36 | make range more compliant to aid consistent coloring | diff --git a/src/unit/range.rs b/src/unit/range.rs
index d49276e..ce663d7 100644
--- a/src/unit/range.rs
+++ b/src/unit/range.rs
@@ -14,18 +14,18 @@ impl Range {
}
impl DisplayValue for Range {
- fn separator(&self, w: &mut dyn fmt::Write, _value: ProgressStep, _upper: Option<ProgressStep>) -> fmt::Result {
- ... | 2 | 10 | 10 |
b83d6bd7137ea0dc8e9731552ae125cec6cb8631 | Sebastian Thiel | 2020-08-08T08:43:40 | a new range display mode, only good with an upper bound | diff --git a/src/unit/mod.rs b/src/unit/mod.rs
index d7884a7..c38c6ad 100644
--- a/src/unit/mod.rs
+++ b/src/unit/mod.rs
@@ -5,6 +5,8 @@ use std::{fmt, fmt::Write, ops::Deref};
mod bytes;
#[cfg(feature = "unit-bytes")]
pub use bytes::Bytes;
+mod range;
+pub use range::Range;
pub trait DisplayValue {
fn displ... | 3 | 47 | 1 |
f350079a9db9433936f0f90fe9316d0bed65cf38 | Sebastian Thiel | 2020-08-08T07:38:26 | support for omitting the unit | diff --git a/src/unit/mod.rs b/src/unit/mod.rs
index e68eb26..d7884a7 100644
--- a/src/unit/mod.rs
+++ b/src/unit/mod.rs
@@ -140,10 +140,15 @@ impl<'a> fmt::Display for UnitDisplay<'a> {
}
}
if self.display.unit() {
+ let mut buf = String::with_capacity(10);
if sel... | 2 | 11 | 2 |
bf89a3d11fcc6eba087da1d28cace7991156bb39 | Sebastian Thiel | 2020-08-08T07:36:10 | Using fmt::Write is so much better! | diff --git a/src/unit/bytes.rs b/src/unit/bytes.rs
index 06250ba..6d8b128 100644
--- a/src/unit/bytes.rs
+++ b/src/unit/bytes.rs
@@ -5,10 +5,10 @@ use std::fmt;
pub struct Bytes;
impl Bytes {
- fn format_bytes(f: &mut fmt::Formatter, value: ProgressStep) -> fmt::Result {
+ fn format_bytes(w: &mut dyn fmt::Wri... | 2 | 16 | 16 |
0e15b97d6a7cf5dcd7be068de8bf3f4b6472089c | Sebastian Thiel | 2020-08-08T06:26:01 | Allow splitting up generation of values and unit for more creative control…
…or to support the existing application. | diff --git a/src/unit/mod.rs b/src/unit/mod.rs
index b2a8298..a7f2dbe 100644
--- a/src/unit/mod.rs
+++ b/src/unit/mod.rs
@@ -48,6 +48,7 @@ impl Unit {
current_value,
upper_bound,
parent: self,
+ display: WhatToDisplay::ValuesAndUnit,
}
}
@@ -69,6 +70,39 ... | 2 | 83 | 13 |
43c0980ffe15efe5e4994398d16b519d9e19836e | Sebastian Thiel | 2020-08-08T05:57:32 | percentage support | diff --git a/src/unit/mod.rs b/src/unit/mod.rs
index 63dc321..b2a8298 100644
--- a/src/unit/mod.rs
+++ b/src/unit/mod.rs
@@ -15,8 +15,8 @@ pub trait DisplayValue {
write!(f, "{}", value)
}
fn display_unit(&self, f: &mut fmt::Formatter, value: ProgressStep) -> fmt::Result;
- fn display_percentage(&... | 2 | 66 | 16 |
5bd90cc6539bf61019de6d096589b1c2caeb685e | Sebastian Thiel | 2020-08-08T05:37:32 | first small steps towards implementing unit and value display correctly | diff --git a/src/unit.rs b/src/unit.rs
deleted file mode 100644
index c68bc5c..0000000
--- a/src/unit.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use crate::tree::ProgressStep;
-use std::fmt;
-
-pub trait DisplayValue {
- fn display_current_value(
- &self,
- f: &mut fmt::Formatter,
- value: ProgressStep,... | 3 | 101 | 49 |
716e77489aedd9df54745793c979af67acfbb41f | Sebastian Thiel | 2020-08-08T03:53:33 | refactor | diff --git a/src/lib.rs b/src/lib.rs
index bed76d8..a7f00aa 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -52,6 +52,7 @@ pub use log::warn;
#[cfg(any(feature = "humantime", feature = "time"))]
pub mod time;
+mod unit;
#[cfg(not(feature = "log-renderer"))]
mod log {
diff --git a/src/tree/mod.rs b/src/tree/mod.rs
i... | 3 | 6 | 3 |
6063c2796b0b2508a73eb41b0c6c9ed8a601e21b | Sebastian Thiel | 2020-08-08T03:51:36 | refactor in preparation for another example application | diff --git a/examples/dashboard.rs b/examples/dashboard.rs
index 0bdd2ca..dca7c63 100644
--- a/examples/dashboard.rs
+++ b/examples/dashboard.rs
@@ -44,7 +44,11 @@ async fn work_forever(mut args: arg::Options) -> Result {
let never_ending = smol::Task::spawn(futures_lite::future::pending::<()>());
Som... | 5 | 316 | 303 |
90a9c2dac084b5ee9a60065875401c57644dce00 | Sebastian Thiel | 2020-08-08T01:39:53 | rough layout on how to get much more powerful unit and value rendering | diff --git a/src/tree/mod.rs b/src/tree/mod.rs
index 6906e86..e260b6f 100644
--- a/src/tree/mod.rs
+++ b/src/tree/mod.rs
@@ -6,6 +6,7 @@ use std::{fmt, sync::Arc, time::SystemTime};
#[cfg(test)]
mod tests;
+mod unit;
/// The top-level of the progress tree.
#[derive(Clone, Debug)]
@@ -208,16 +209,6 @@ pub struct... | 2 | 50 | 10 |
129d09d6190619e64144a93d617b65f434d26f50 | Sebastian Thiel | 2020-08-07T09:24:42 | first sketch for new Unit type and trait to display what we are interested in | diff --git a/src/tree/mod.rs b/src/tree/mod.rs
index b25032b..6906e86 100644
--- a/src/tree/mod.rs
+++ b/src/tree/mod.rs
@@ -2,7 +2,7 @@ use crate::TreeOptions;
use dashmap::DashMap;
use parking_lot::Mutex;
use std::ops::{Deref, Index, IndexMut};
-use std::{sync::Arc, time::SystemTime};
+use std::{fmt, sync::Arc, ti... | 1 | 11 | 1 |
8071110e8a41612808206c3f8f444542818f4a51 | Sebastian Thiel | 2020-07-23T00:25:26 | line renderer: more compact progress bar | diff --git a/src/line/draw.rs b/src/line/draw.rs
index b3af43f..d2fd8d9 100644
--- a/src/line/draw.rs
+++ b/src/line/draw.rs
@@ -274,7 +274,7 @@ fn format_progress<'a>(
let pre_unit = buf.len();
buf.push(brush.style(Style::new().bold().dimmed()).paint(match progress.done_at {
- ... | 1 | 1 | 1 |
f6fa7ab681549abfd77a14e4c8015f623f720c83 | Sebastian Thiel | 2020-07-22T09:33:56 | Revert "FAIL: Try to manually implement/run a local executor"
This reverts commit 64cfe9e87e038fb36492307dfb75cbc8204180d8. | diff --git a/examples/dashboard.rs b/examples/dashboard.rs
index 8fcdb08..345007c 100644
--- a/examples/dashboard.rs
+++ b/examples/dashboard.rs
@@ -9,25 +9,11 @@ compile_error!(
"Please set either the 'tui-renderer-crossterm' or 'tui-renderer-termion' feature whne using the 'tui-renderer'"
);
-static EXECUTOR:... | 1 | 70 | 30 |
a3254a6aac6b4150bcbd10004d55d4cc06d45dbe | Sebastian Thiel | 2020-07-22T09:33:53 | Revert "Another attempt of using a local executor: FAIL"
This reverts commit ee6275ca3f0da906b9f94e6d95d9ce130907e9c8. | diff --git a/examples/dashboard.rs b/examples/dashboard.rs
index 094d895..8fcdb08 100644
--- a/examples/dashboard.rs
+++ b/examples/dashboard.rs
@@ -9,23 +9,28 @@ compile_error!(
"Please set either the 'tui-renderer-crossterm' or 'tui-renderer-termion' feature whne using the 'tui-renderer'"
);
+static EXECUTOR:... | 1 | 40 | 50 |
ee6275ca3f0da906b9f94e6d95d9ce130907e9c8 | Sebastian Thiel | 2020-07-22T09:33:29 | Another attempt of using a local executor: FAIL | diff --git a/examples/dashboard.rs b/examples/dashboard.rs
index 8fcdb08..094d895 100644
--- a/examples/dashboard.rs
+++ b/examples/dashboard.rs
@@ -9,28 +9,23 @@ compile_error!(
"Please set either the 'tui-renderer-crossterm' or 'tui-renderer-termion' feature whne using the 'tui-renderer'"
);
-static EXECUTOR:... | 1 | 50 | 40 |
64cfe9e87e038fb36492307dfb75cbc8204180d8 | Sebastian Thiel | 2020-07-22T09:23:41 | FAIL: Try to manually implement/run a local executor | diff --git a/examples/dashboard.rs b/examples/dashboard.rs
index 345007c..8fcdb08 100644
--- a/examples/dashboard.rs
+++ b/examples/dashboard.rs
@@ -9,11 +9,25 @@ compile_error!(
"Please set either the 'tui-renderer-crossterm' or 'tui-renderer-termion' feature whne using the 'tui-renderer'"
);
+static EXECUTOR:... | 1 | 30 | 70 |
d19a1db08305abb77505868cc237b1c71491960d | Sebastian Thiel | 2020-07-22T08:58:38 | Actually only a few lines are needed to drive multi-task | diff --git a/Cargo.toml b/Cargo.toml
index eab3e14..7b9aa46 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -77,11 +77,12 @@ rand = "0.7.3"
env_logger = { version = "0.7.1", default-features = false, features = ["termcolor", "atty", "humantime"] }
criterion = { version = "0.3.1", default-features = false }
futures-util ... | 2 | 62 | 1 |
ab7dcb4f2b108fbf7f525b61110f3f6b6339d0b0 | Sebastian Thiel | 2020-07-22T08:16:52 | upgrade to smol 2.0 | diff --git a/Cargo.toml b/Cargo.toml
index c0cc0dd..d86aa2f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,7 +34,7 @@ tui-renderer = ["tui",
"futures-util",
"futures-lite",
"futures-core",
- "smol",
+ "async-io",
"humanti... | 3 | 15 | 13 |
56cf67e36ed0db6a4a78e1d30e7fc4eebe7c7342 | Sebastian Thiel | 2020-07-22T06:49:47 | Use bold characters for some highlights | diff --git a/src/tui/draw/all.rs b/src/tui/draw/all.rs
index 03b9787..1d61b2c 100644
--- a/src/tui/draw/all.rs
+++ b/src/tui/draw/all.rs
@@ -10,6 +10,8 @@ use std::time::Duration;
use tui::{
buffer::Buffer,
layout::Rect,
+ style::{Modifier, Style},
+ text::Span,
widgets::{Block, Borders, Widget},
... | 4 | 34 | 13 |
79afe123dda6e892425772fca8e040ac256edf9d | Sebastian Thiel | 2020-07-22T06:16:11 | upgrade to tui 0.10 | diff --git a/Cargo.toml b/Cargo.toml
index b21272f..0ebc8a9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -52,8 +52,8 @@ parking_lot = "0.11.0"
log = { version = "0.4.8", optional = true }
# tui-renderer
-tui = { version = "0.9.4", optional = true, default-features = false }
-tui-react = { version = "0.4.0", optional... | 5 | 13 | 12 |
dcda91b744cb9f4f735591a53997ac4f2747a61e | Sebastian Thiel | 2020-07-22T03:00:12 | Crosstermion 0.3 with support for tui 0.10 | diff --git a/crosstermion/Cargo.toml b/crosstermion/Cargo.toml
index f72ea68..bd2c27a 100644
--- a/crosstermion/Cargo.toml
+++ b/crosstermion/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "crosstermion"
-version = "0.2.0"
+version = "0.3.0"
authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"]
description = "The... | 1 | 3 | 3 |
1105cfd46d9a163c6e6d6c761fec8f70a0b08156 | Sebastian Thiel | 2020-07-22T02:57:49 | decouple prodash from local crosstermion for tui migration | diff --git a/Cargo.toml b/Cargo.toml
index 0807f6a..b21272f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -61,7 +61,7 @@ futures-lite = { version = "0.1.5", optional = true }
humantime = { version = "2.0.0", optional = true }
unicode-segmentation = { version = "1.6.0", optional = true }
unicode-width = { version = "0.... | 1 | 1 | 1 |
45a8a00a76c3beed0baf0cffaa5656f0835a927e | Sebastian Thiel | 2020-07-21T11:25:55 | (cargo-release) version 7.0.4 | diff --git a/Cargo.toml b/Cargo.toml
index 164e1e0..0807f6a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "prodash"
-version = "7.0.3"
+version = "7.0.4"
authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"]
description = "A dashboard for visualizing progress of asynchronous and pos... | 1 | 1 | 1 |
85c1f6d894f651a006793dfa0df3a547c8ed4a29 | Sebastian Thiel | 2020-07-20T00:16:14 | remove unused dependency | diff --git a/Cargo.toml b/Cargo.toml
index 85d0ba6..cc5c628 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -56,7 +56,6 @@ tui-react = { version = "0.4.0", optional = true }
smol = { version = "0.1.5", optional = true, default-features = false }
futures-core = { version = "0.3.4", optional = true, default-features = fals... | 1 | 0 | 1 |
6fc58461028e63ca333adf7381178473329fe643 | Sebastian Thiel | 2020-07-20T00:14:38 | Remove futures-util nearly completely - missing filter_map() extension for stream | diff --git a/crosstermion/Cargo.toml b/crosstermion/Cargo.toml
index ea3aab1..111ad89 100644
--- a/crosstermion/Cargo.toml
+++ b/crosstermion/Cargo.toml
@@ -14,7 +14,7 @@ default = []
color = ["ansi_term"]
-input-async = ["futures-channel", "futures-util", "futures-executor", ]
+input-async = ["futures-channel", "... | 2 | 10 | 8 |
f0eaf279c42f0a7d28bc6b4c6d064df072f3a3a7 | Sebastian Thiel | 2020-07-11T13:40:55 | greatly simplify line renderer engine code
Even though you can select on multiple channels, why not simply use
the same channel?
That way, mpsc standard fan-in channels work just fine. | diff --git a/Cargo.toml b/Cargo.toml
index 94d7757..efe65a6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -35,7 +35,7 @@ tui-renderer = ["tui",
"futures-core",
"smol",
"humantime"]
-line-renderer = ["flume", "crosstermion/color", "humantime", "unicode-width"]
+line-rende... | 2 | 48 | 47 |
9a7c2efec958c5b0729e799177a94f5089882158 | Sebastian Thiel | 2020-07-11T01:56:57 | bump patch level | diff --git a/Cargo.toml b/Cargo.toml
index 2d5d922..94d7757 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "prodash"
-version = "7.0.1"
+version = "7.0.2"
authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"]
description = "A dashboard for visualizing progress of asynchronous and pos... | 1 | 1 | 1 |
d090c0ccbce3c4323eb03dc31fc550b7c11f2cf2 | Sebastian Thiel | 2020-07-10T14:41:00 | Don't cause cursor movement when using '0' as MoveUp value
One might argue that should be a noop | diff --git a/src/line/draw.rs b/src/line/draw.rs
index 8805750..0ee85e7 100644
--- a/src/line/draw.rs
+++ b/src/line/draw.rs
@@ -162,7 +162,9 @@ pub fn all(
crosstermion::execute!(out, crosstermion::cursor::MoveUp(state.blocks_per_line.len() as u16))?;
state.blocks_per_line.resize(lines_drawn,... | 1 | 3 | 1 |
48879f3cf44d1b8531819f7c4d3ca84d0bf116e9 | Sebastian Thiel | 2020-07-10T05:33:25 | minior cleanup | diff --git a/src/line/draw.rs b/src/line/draw.rs
index 6eb79d9..8805750 100644
--- a/src/line/draw.rs
+++ b/src/line/draw.rs
@@ -1,5 +1,8 @@
use crate::tree;
-use crosstermion::ansi_term::{ANSIString, ANSIStrings, Color, Style};
+use crosstermion::{
+ ansi_term::{ANSIString, ANSIStrings, Color, Style},
+ color,
... | 1 | 7 | 4 |
021dc5abda66dad0c2270e5db093b3772e56e7b3 | Sebastian Thiel | 2020-07-10T05:26:14 | Dynamically resize and align progress bars - looks so much better now!
The hierarchy is only communicate by indentation of the progress, but
I think that's all it takes. | diff --git a/src/line/draw.rs b/src/line/draw.rs
index b746292..6eb79d9 100644
--- a/src/line/draw.rs
+++ b/src/line/draw.rs
@@ -1,6 +1,6 @@
use crate::tree;
use crosstermion::ansi_term::{ANSIString, ANSIStrings, Color, Style};
-use std::{collections::VecDeque, io, ops::RangeInclusive};
+use std::{collections::VecDeq... | 1 | 36 | 5 |
5cb7fea8e60b829ea32fec1c1a161a3cddb7cb5e | Sebastian Thiel | 2020-07-10T04:49:50 | dynamically recompute dimensions of log messages | diff --git a/examples/dashboard.rs b/examples/dashboard.rs
index 16936be..0cf3d53 100644
--- a/examples/dashboard.rs
+++ b/examples/dashboard.rs
@@ -110,7 +110,7 @@ fn launch_ambient_gui(
hide_cursor: true,
#[cfg(not(feature = "ctrlc"))]
hide_cursor: false,... | 3 | 26 | 10 |
bfd1a98990f9c7628bd82d6c1391dca8f783f570 | Sebastian Thiel | 2020-07-10T04:13:03 | allow setting the terminal width using CLI in dashboard example | diff --git a/examples/dashboard.rs b/examples/dashboard.rs
index cb05946..22f1825 100644
--- a/examples/dashboard.rs
+++ b/examples/dashboard.rs
@@ -110,7 +110,10 @@ fn launch_ambient_gui(
hide_cursor: true,
#[cfg(not(feature = "ctrlc"))]
hide_cursor: false... | 1 | 8 | 1 |
4d6806028a780633e24966ca9900e0a517e6b783 | Sebastian Thiel | 2020-07-10T03:32:16 | initial progress messages should actually be shown despite initial delay
improvement required :) | diff --git a/examples/dashboard.rs b/examples/dashboard.rs
index e2dfa60..0fc4427 100644
--- a/examples/dashboard.rs
+++ b/examples/dashboard.rs
@@ -22,6 +22,12 @@ async fn work_forever(mut args: arg::Options) -> Result {
..prodash::TreeOptions::default()
}
.create();
+ {
+ let mut sp = pro... | 1 | 6 | 0 |
f980a83226489dc1a1066a488aa39eb3c4d54cba | Sebastian Thiel | 2020-07-10T03:14:44 | progress drawing now can be without color as well
The 'brush' abstraction is really easy to use and to retrofit code with. | diff --git a/src/line/draw.rs b/src/line/draw.rs
index 300c9cd..f64664c 100644
--- a/src/line/draw.rs
+++ b/src/line/draw.rs
@@ -106,7 +106,7 @@ pub fn all(out: &mut impl io::Write, progress: &tree::Root, state: &mut State, c
.filter(|(k, _)| level_range.contains(&k.level()))
.zip(state.blocks... | 1 | 23 | 7 |
298afe685589827ab9a882f37ee53726486bd678 | Sebastian Thiel | 2020-07-10T03:01:02 | Nobody needs ticks right now, and using the step for unbounded progress rocks…
…similar to how it works nicely for the TUI as well, allowing to be
as fast as there is actual progress.
This might make them appear like running backwards, but that's just
something we have to live with I guess. | diff --git a/src/line/draw.rs b/src/line/draw.rs
index 4890f45..300c9cd 100644
--- a/src/line/draw.rs
+++ b/src/line/draw.rs
@@ -11,8 +11,6 @@ pub struct State {
max_message_origin_size: usize,
/// The amount of blocks per line we have written last time.
blocks_per_line: std::collections::VecDeque<u16>,
... | 1 | 11 | 28 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.