diff --git a/tests/golden-files/help b/tests/golden-files/help index b8ce8e7..eb3df65 100644 --- a/tests/golden-files/help +++ b/tests/golden-files/help @@ -27,14 +27,14 @@ │ │ │Statuses: │ │ (B (B Normal │ -│ (B (B Ok │ -│ (B (B Problem │ +│ (B (B Ok │ +│ (B (B Problem │ │ (B (B Not applicable │ -│ (B (B Running │ +│ (B (B Running │ │ (B (B Paused │ │ (B (B Timed out │ │ . Pending │ -│ (BE(B Error │ +│ (BE(B Error │ │ │ │ │ │ │ @@ -57,4 +57,4 @@ │ │ │ │ └──────────────────────────────────────────────────────────────────────────────────────────────────┘ -(B (Bh(Belp (Bq(Buit (Btab(B:focus (Bt(Burn (Bl(Bog (Be(Bdit (Bn(Bext (Bp(Bause (Bo(Brder (Br(Befresh (Bf(Bullscreen (Brunning(B order:directory (B \ No newline at end of file +(B (Bh(Belp (Bq(Buit (Btab(B:focus (Bt(Burn (Bl(Bog (Be(Bdit (Bn(Bext (Bp(Bause (Bo(Brder (Br(Befresh (Bf(Bullscreen (Brunning(B order:directory (B \ No newline at end of file diff --git a/tests/golden-files/results/metadata-hi3_py b/tests/golden-files/results/metadata-hi3_py index 30970d0..bfa8378 100644 --- a/tests/golden-files/results/metadata-hi3_py +++ b/tests/golden-files/results/metadata-hi3_py @@ -1,18 +1,18 @@ -(Bsize:(B 12.0 B(B (12 bytes)(B -(Bpermissions:(B ?rwxr-xr-x(B (755)(B +(Bsize:(B 12.0 B(B (12 bytes)(B +(Bpermissions:(B ?rwxr-xr-x(B (755)(B -(Bmodified time:(B Sun Jan 31 23:14:05 2016(B (1454282045 secs)(B -(Bcreation time:(B Sun Jan 31 23:14:05 2016(B (1454282045 secs)(B -(Baccess time:(B Sun Jan 31 23:14:07 2016(B (1454282047 secs)(B +(Bmodified time:(B Sun Jan 31 23:14:05 2016(B (1454282045 secs)(B +(Bcreation time:(B Sun Jan 31 23:14:05 2016(B (1454282045 secs)(B +(Baccess time:(B Sun Jan 31 23:14:07 2016(B (1454282047 secs)(B -(Bowner:(B foo(B (1111 uid)(B -(Bgroup:(B foo(B (1111 gid)(B +(Bowner:(B foo(B (1111 uid)(B +(Bgroup:(B foo(B (1111 gid)(B -(Bhardlinks:(B 2 -(Bsymlink:(B no +(Bhardlinks:(B 2 +(Bsymlink:(B no -(Bmd5:(B 28ca2e417cb64ea4e555efe3203642de -(Bsha1:(B 8b8c0214f3f0a0d79032d1b44550064964a33a26 +(Bmd5:(B 28ca2e417cb64ea4e555efe3203642de +(Bsha1:(B 8b8c0214f3f0a0d79032d1b44550064964a33a26 -(Bmime type:(B text/x-python; charset=us-ascii -(Bfile type:(B Python script, ASCII text executable (B \ No newline at end of file +(Bmime type:(B text/x-python; charset=us-ascii +(Bfile type:(B Python script, ASCII text executable (B \ No newline at end of file diff --git a/tests/golden-files/results/python_coverage-hi3_py b/tests/golden-files/results/python_coverage-hi3_py index 47d610d..467f03b 100644 --- a/tests/golden-files/results/python_coverage-hi3_py +++ b/tests/golden-files/results/python_coverage-hi3_py @@ -1,4 +1,4 @@ (B -(B> def hi():(B -(B> print("hi")(B \ No newline at end of file +(B> def hi():(B +(B> print("hi")(B \ No newline at end of file diff --git a/tests/golden-files/results/python_coverage-hi_py b/tests/golden-files/results/python_coverage-hi_py index c7b8d8a..b2d2daf 100644 --- a/tests/golden-files/results/python_coverage-hi_py +++ b/tests/golden-files/results/python_coverage-hi_py @@ -1,4 +1,4 @@ (B -(B> def hi():(B -(B> print "hi"(B \ No newline at end of file +(B> def hi():(B +(B> print "hi"(B \ No newline at end of file diff --git a/vigil/__main__.py b/vigil/__main__.py index 0d1d0bd..30b1a9a 100755 --- a/vigil/__main__.py +++ b/vigil/__main__.py @@ -196,7 +196,7 @@ def log_filesystem_changed(log, added, removed, modified): termstr.Color.grey_100 if stat == 0 else color) parts = [part(added, "added", termstr.Color.green), part(removed, "removed", termstr.Color.red), - part(modified, "modified", termstr.Color.light_blue)] + part(modified, "modified", termstr.Color.blue)] log.log_message("Filesystem changed: " + fill3.join(" ", parts)) @@ -892,8 +892,8 @@ class Screen: progress_bar_size): ordering_text = "directory" if is_directory_sort else "type " paused_indicator = (termstr.TermStr("paused ").fg_color( - termstr.Color.dark_yellow) if is_paused else termstr.TermStr("running"). - fg_color(termstr.Color.light_blue)) + termstr.Color.yellow) if is_paused else termstr.TermStr("running"). + fg_color(termstr.Color.blue)) indicators = " " + paused_indicator + f" order:{ordering_text} " spacing = " " * (width - len(self._STATUS_BAR) - len(indicators)) bar = (self._STATUS_BAR[:width - len(indicators)] + spacing + diff --git a/vigil/termstr.py b/vigil/termstr.py index e87d710..ab2bc4c 100644 --- a/vigil/termstr.py +++ b/vigil/termstr.py @@ -35,20 +35,18 @@ def _cache_first_result(user_function): class Color: + # https://en.wikipedia.org/wiki/Natural_Color_System black = (0, 0, 0) white = (255, 255, 255) - red = (255, 0, 0) - green = (0, 128, 0) - blue = (0, 0, 255) - dark_red = (139, 0, 0) + red = (196, 2, 51) + green = (0, 159, 107) + blue = (0, 135, 189) lime = (0, 255, 0) - yellow = (255, 255, 0) - dark_yellow = (255, 211, 0) - # dark_yellow = (204, 204, 0) + yellow = (255, 211, 0) grey_50 = (50, 50, 50) grey_100 = (100, 100, 100) grey_150 = (150, 150, 150) - light_blue = (90, 90, 255) + light_blue = (173, 216, 230) purple = (200, 0, 200) brown = (150, 75, 0) orange = (255, 153, 0) diff --git a/vigil/tools.py b/vigil/tools.py index 5c060ed..6eadaab 100644 --- a/vigil/tools.py +++ b/vigil/tools.py @@ -54,11 +54,11 @@ class Status(enum.IntEnum): _STATUS_COLORS = {Status.ok: termstr.Color.green, - Status.problem: termstr.Color.dark_red, + Status.problem: termstr.Color.red, Status.normal: termstr.Color.grey_150, Status.not_applicable: termstr.Color.grey_100, - Status.running: termstr.Color.light_blue, - Status.paused: termstr.Color.dark_yellow, + Status.running: termstr.Color.blue, + Status.paused: termstr.Color.yellow, Status.timed_out: termstr.Color.purple} STATUS_MEANINGS = [ (Status.normal, "Normal"), (Status.ok, "Ok"), @@ -250,7 +250,7 @@ def metadata(path): else: name, value = line name = termstr.TermStr(name + ":").fg_color( - termstr.Color.light_blue).ljust(16) + termstr.Color.blue).ljust(16) text.append(name + fill3.join("", value) + "\n") return (Status.normal, fill3.Text(fill3.join("", text)))