From 9f8cd55762fabcf71bcdc40a6d0203e158799197 Mon Sep 17 00:00:00 2001 From: Pranav Srinivas KumaR Date: Wed, 4 Dec 2019 20:59:51 -0600 Subject: [PATCH] Clang format --- clang-format.bash | 2 +- demo/demo.cpp | 348 ++++++++++++++-------------- include/indica/color.hpp | 2 +- include/indica/progress_bar.hpp | 2 +- include/indica/progress_spinner.hpp | 12 +- 5 files changed, 181 insertions(+), 185 deletions(-) diff --git a/clang-format.bash b/clang-format.bash index 057c6f5..897445b 100755 --- a/clang-format.bash +++ b/clang-format.bash @@ -1,2 +1,2 @@ #!/usr/bin/env bash -find ./include ./samples/ -type f \( -iname \*.cpp -o -iname \*.hpp \) | xargs clang-format -style="{ColumnLimit : 100}" -i +find ./include ./demo/ -type f \( -iname \*.cpp -o -iname \*.hpp \) | xargs clang-format -style="{ColumnLimit : 100}" -i diff --git a/demo/demo.cpp b/demo/demo.cpp index b469d20..f6cd02c 100644 --- a/demo/demo.cpp +++ b/demo/demo.cpp @@ -22,27 +22,27 @@ int main() { std::atomic index{0}; std::vector status_text = {"Rocket.exe is not responding", - "Buying more snacks", - "Finding a replacement engineer", - "Assimilating the modding community", - "Crossing fingers", - "Porting KSP to a Nokia 3310", - "Flexing struts", - "Releasing space whales", - "Watching paint dry"}; + "Buying more snacks", + "Finding a replacement engineer", + "Assimilating the modding community", + "Crossing fingers", + "Porting KSP to a Nokia 3310", + "Flexing struts", + "Releasing space whales", + "Watching paint dry"}; auto job = [&p, &index, &status_text]() { - while (true) { - if (p.is_completed()) - break; - p.set_postfix_text(status_text[index % status_text.size()]); - p.set_progress(index * 10); - index += 1; - std::this_thread::sleep_for(std::chrono::milliseconds(600)); - } - }; + while (true) { + if (p.is_completed()) + break; + p.set_postfix_text(status_text[index % status_text.size()]); + p.set_progress(index * 10); + index += 1; + std::this_thread::sleep_for(std::chrono::milliseconds(600)); + } + }; std::thread thread(job); - thread.join(); + thread.join(); } { @@ -60,18 +60,17 @@ int main() { p.set_foreground_color(indica::Color::WHITE); p.hide_percentage(); auto job = [&p]() { - while (true) { - p.set_prefix_text("Reading package list... " + - std::to_string(p.current()) + "% "); - if (p.current() + 2 >= 100) - p.set_prefix_text("Reading package list... Done"); - p.tick(); - if (p.is_completed()) { - break; - } - std::this_thread::sleep_for(std::chrono::milliseconds(25)); - } - }; + while (true) { + p.set_prefix_text("Reading package list... " + std::to_string(p.current()) + "% "); + if (p.current() + 2 >= 100) + p.set_prefix_text("Reading package list... Done"); + p.tick(); + if (p.is_completed()) { + break; + } + std::this_thread::sleep_for(std::chrono::milliseconds(25)); + } + }; std::thread thread(job); thread.join(); } @@ -90,33 +89,31 @@ int main() { p.set_postfix_text("Getting started"); p.set_foreground_color(indica::Color::GREEN); auto job = [&p]() { - while (true) { - auto ticks = p.current(); - if (ticks > 20 && ticks < 50) - p.set_postfix_text("Delaying the inevitable"); - else if (ticks > 50 && ticks < 80) - p.set_postfix_text("Crying quietly"); - else if (ticks > 80 && ticks < 98) - p.set_postfix_text("Almost there"); - else if (ticks >= 98) - p.set_postfix_text("Done"); - p.tick(); - if (p.is_completed()) - break; - std::this_thread::sleep_for(std::chrono::milliseconds(30)); - } - }; + while (true) { + auto ticks = p.current(); + if (ticks > 20 && ticks < 50) + p.set_postfix_text("Delaying the inevitable"); + else if (ticks > 50 && ticks < 80) + p.set_postfix_text("Crying quietly"); + else if (ticks > 80 && ticks < 98) + p.set_postfix_text("Almost there"); + else if (ticks >= 98) + p.set_postfix_text("Done"); + p.tick(); + if (p.is_completed()) + break; + std::this_thread::sleep_for(std::chrono::milliseconds(30)); + } + }; std::thread thread(job); thread.join(); - } { // // PROGRESS BAR 4 // - std::vector lead_spinner{"⠋", "⠙", "⠹", "⠸", "⠼", - "⠴", "⠦", "⠧", "⠇", "⠏"}; + std::vector lead_spinner{"⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"}; indica::ProgressBar p4; p4.set_bar_width(40); p4.start_bar_with(""); @@ -129,28 +126,28 @@ int main() { p4.hide_percentage(); std::atomic index4{0}; auto job4 = [&p4, &index4, &lead_spinner]() { - while (true) { - p4.set_prefix_text("{ " + std::to_string(p4.current()) + "% } "); - p4.lead_bar_progress_with(lead_spinner[index4 % lead_spinner.size()]); - index4 += 1; - if (p4.current() + 2 >= 100) { - std::cout << std::endl; - p4.set_foreground_color(indica::Color::RED); - p4.set_prefix_text("{ ERROR }"); - p4.start_bar_with(""); - p4.fill_bar_progress_with(""); - p4.lead_bar_progress_with(""); - p4.fill_bar_remainder_with(""); - p4.end_bar_with(""); - p4.show_percentage(); - p4.set_postfix_text("Failed to restore system"); - p4.mark_as_completed(); - break; - } - p4.tick(); - std::this_thread::sleep_for(std::chrono::milliseconds(40)); - } - }; + while (true) { + p4.set_prefix_text("{ " + std::to_string(p4.current()) + "% } "); + p4.lead_bar_progress_with(lead_spinner[index4 % lead_spinner.size()]); + index4 += 1; + if (p4.current() + 2 >= 100) { + std::cout << std::endl; + p4.set_foreground_color(indica::Color::RED); + p4.set_prefix_text("{ ERROR }"); + p4.start_bar_with(""); + p4.fill_bar_progress_with(""); + p4.lead_bar_progress_with(""); + p4.fill_bar_remainder_with(""); + p4.end_bar_with(""); + p4.show_percentage(); + p4.set_postfix_text("Failed to restore system"); + p4.mark_as_completed(); + break; + } + p4.tick(); + std::this_thread::sleep_for(std::chrono::milliseconds(40)); + } + }; std::thread thread4(job4); thread4.join(); @@ -172,47 +169,46 @@ int main() { p.set_postfix_text("Reverting system restore"); std::atomic progress{100}; auto job = [&p, &progress]() { - while (true) { - progress -= 1; - p.set_progress(progress); - if (progress == 0) { - p.set_postfix_text("Revert complete!"); - p.mark_as_completed(); - break; - } - std::this_thread::sleep_for(std::chrono::milliseconds(60)); - } - }; + while (true) { + progress -= 1; + p.set_progress(progress); + if (progress == 0) { + p.set_postfix_text("Revert complete!"); + p.mark_as_completed(); + break; + } + std::this_thread::sleep_for(std::chrono::milliseconds(60)); + } + }; std::thread thread(job); thread.join(); - } - + } } { // // PROGRESS BAR 5 - // + // indica::ProgressSpinner p; p.set_prefix_text(""); p.set_postfix_text("Checking credentials"); p.set_foreground_color(indica::Color::YELLOW); p.set_spinner_states({"⠈", "⠐", "⠠", "⢀", "⡀", "⠄", "⠂", "⠁"}); auto job = [&p]() { - while (true) { - if (p.is_completed()) { - p.set_foreground_color(indica::Color::GREEN); - p.set_prefix_text("✔"); - p.hide_spinner(); - p.hide_percentage(); - p.set_postfix_text("Authenticated!"); - p.mark_as_completed(); - break; - } else - p.tick(); - std::this_thread::sleep_for(std::chrono::milliseconds(40)); - } - }; + while (true) { + if (p.is_completed()) { + p.set_foreground_color(indica::Color::GREEN); + p.set_prefix_text("✔"); + p.hide_spinner(); + p.hide_percentage(); + p.set_postfix_text("Authenticated!"); + p.mark_as_completed(); + break; + } else + p.tick(); + std::this_thread::sleep_for(std::chrono::milliseconds(40)); + } + }; std::thread thread(job); thread.join(); } @@ -221,7 +217,7 @@ int main() { { // // PROGRESS BAR 6 - // + // indica::ProgressSpinner p; p.set_prefix_text(" - "); p.set_postfix_text("Searching for the Moon"); @@ -229,82 +225,82 @@ int main() { p.set_spinner_states({"▖", "▘", "▝", "▗"}); p.hide_percentage(); auto job = [&p]() { - while (true) { - auto current = p.current(); - if (current == 24) { - p.set_prefix_text(" - ✔"); - p.hide_spinner(); - } else if (current == 25) { - std::cout << std::endl; - p.show_spinner(); - p.set_prefix_text(" - "); - p.set_postfix_text("Contacting Kerbal headquarters"); - } else if (current == 49) { - p.set_prefix_text(" - ✔"); - p.hide_spinner(); - } else if (current == 50) { - std::cout << std::endl; - p.show_spinner(); - p.set_prefix_text(" - "); - p.set_postfix_text("Designing spaceship"); - } else if (current == 74) { - p.set_prefix_text(" - ✔"); - p.hide_spinner(); - } else if (current == 75) { - std::cout << std::endl; - p.show_spinner(); - p.set_prefix_text(" - "); - p.set_postfix_text("Launching rocket"); - } else if (current == 95) { - p.set_prefix_text(" - ✔"); - p.hide_spinner(); - } else if (current == 99) { - std::cout << std::endl; - // - // NESTED PROGRESS BAR - // - indica::ProgressBar p2; - p2.set_bar_width(30); - p2.set_prefix_text(" - "); - p2.start_bar_with("🌎"); - p2.fill_bar_progress_with("·"); - p2.lead_bar_progress_with("🚀"); - p2.fill_bar_remainder_with(" "); - p2.end_bar_with("🌑"); - p2.set_postfix_text("Achieved low-Earth orbit"); - p2.set_foreground_color(indica::Color::WHITE); - std::vector ship_trail{"⠁", "⠂", "⠄", "⡀", "⢀", "⠠", "⠐", "⠈"}; - std::atomic ship_trail_index{0}; - auto job2 = [&p2, &ship_trail_index, &ship_trail]() { - while (true) { - auto ticks = p2.current(); - if (ticks > 20 && ticks < 50) - p2.set_postfix_text("Switching to trans-lunar trajectory"); - else if (ticks > 50 && ticks < 80) - p2.set_postfix_text("Transferred to Lunar lander"); - else if (ticks > 80 && ticks < 98) - p2.set_postfix_text("Almost there"); - else if (ticks >= 98) - p2.set_postfix_text("Landed on the Moon"); - p2.tick(); - ship_trail_index += 1; - if (p2.is_completed()) - break; - std::this_thread::sleep_for(std::chrono::milliseconds(80)); - } - }; - std::thread thread2(job2); - thread2.join(); - p.set_postfix_text("Mission successful!"); - p.mark_as_completed(); - break; - } - p.tick(); - if (p.is_completed()) - break; - std::this_thread::sleep_for(std::chrono::milliseconds(60)); - } - }; + while (true) { + auto current = p.current(); + if (current == 24) { + p.set_prefix_text(" - ✔"); + p.hide_spinner(); + } else if (current == 25) { + std::cout << std::endl; + p.show_spinner(); + p.set_prefix_text(" - "); + p.set_postfix_text("Contacting Kerbal headquarters"); + } else if (current == 49) { + p.set_prefix_text(" - ✔"); + p.hide_spinner(); + } else if (current == 50) { + std::cout << std::endl; + p.show_spinner(); + p.set_prefix_text(" - "); + p.set_postfix_text("Designing spaceship"); + } else if (current == 74) { + p.set_prefix_text(" - ✔"); + p.hide_spinner(); + } else if (current == 75) { + std::cout << std::endl; + p.show_spinner(); + p.set_prefix_text(" - "); + p.set_postfix_text("Launching rocket"); + } else if (current == 95) { + p.set_prefix_text(" - ✔"); + p.hide_spinner(); + } else if (current == 99) { + std::cout << std::endl; + // + // NESTED PROGRESS BAR + // + indica::ProgressBar p2; + p2.set_bar_width(30); + p2.set_prefix_text(" - "); + p2.start_bar_with("🌎"); + p2.fill_bar_progress_with("·"); + p2.lead_bar_progress_with("🚀"); + p2.fill_bar_remainder_with(" "); + p2.end_bar_with("🌑"); + p2.set_postfix_text("Achieved low-Earth orbit"); + p2.set_foreground_color(indica::Color::WHITE); + std::vector ship_trail{"⠁", "⠂", "⠄", "⡀", "⢀", "⠠", "⠐", "⠈"}; + std::atomic ship_trail_index{0}; + auto job2 = [&p2, &ship_trail_index, &ship_trail]() { + while (true) { + auto ticks = p2.current(); + if (ticks > 20 && ticks < 50) + p2.set_postfix_text("Switching to trans-lunar trajectory"); + else if (ticks > 50 && ticks < 80) + p2.set_postfix_text("Transferred to Lunar lander"); + else if (ticks > 80 && ticks < 98) + p2.set_postfix_text("Almost there"); + else if (ticks >= 98) + p2.set_postfix_text("Landed on the Moon"); + p2.tick(); + ship_trail_index += 1; + if (p2.is_completed()) + break; + std::this_thread::sleep_for(std::chrono::milliseconds(80)); + } + }; + std::thread thread2(job2); + thread2.join(); + p.set_postfix_text("Mission successful!"); + p.mark_as_completed(); + break; + } + p.tick(); + if (p.is_completed()) + break; + std::this_thread::sleep_for(std::chrono::milliseconds(60)); + } + }; std::thread thread(job); thread.join(); } diff --git a/include/indica/color.hpp b/include/indica/color.hpp index 846446b..ec58745 100644 --- a/include/indica/color.hpp +++ b/include/indica/color.hpp @@ -28,5 +28,5 @@ SOFTWARE. #include namespace indica { - enum class Color { GREY, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE }; +enum class Color { GREY, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE }; } diff --git a/include/indica/progress_bar.hpp b/include/indica/progress_bar.hpp index e1b4db3..7223a4b 100644 --- a/include/indica/progress_bar.hpp +++ b/include/indica/progress_bar.hpp @@ -187,4 +187,4 @@ private: } }; -} +} // namespace indica diff --git a/include/indica/progress_spinner.hpp b/include/indica/progress_spinner.hpp index a4d4af6..9853064 100644 --- a/include/indica/progress_spinner.hpp +++ b/include/indica/progress_spinner.hpp @@ -60,7 +60,7 @@ public: void show_spinner() { _show_spinner = true; } - void hide_spinner() { _show_spinner = false; } + void hide_spinner() { _show_spinner = false; } void set_progress(float value) { { @@ -90,21 +90,21 @@ public: _print_progress(); } - void set_spinner_states(const std::vector& states) { + void set_spinner_states(const std::vector &states) { std::unique_lock lock{_mutex}; _states = states; } - + private: float _progress{0.0}; std::string _prefix_text{""}; size_t _index{0}; - std::vector _states{"⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"}; + std::vector _states{"⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"}; std::string _postfix_text{""}; std::atomic _max_postfix_text_length{0}; std::atomic _completed{false}; std::atomic _show_percentage{true}; - std::atomic _show_spinner{true}; + std::atomic _show_spinner{true}; std::mutex _mutex; Color _foreground_color; @@ -156,4 +156,4 @@ private: } }; -} +} // namespace indica