Improve visuals of duration counters

BeayemX · BeayemX · commit 1fa141680502 · 2017-12-09T15:37:49.000+01:00
Show timers only if category is shown
diff --git a/GitViper.py b/GitViper.py
@@ -38,37 +38,46 @@
 
 start_time = time.time()
 
+time_separator = "".join(["-"] * int(window_width))
+
 def show_time():
     global start_time
-    if args.show_time:
-        print("%s seconds" % round(time.time() - start_time, 3))
-        start_time = time.time()
-        print("-------------------------------------------------------")
-        print()
+    delta_time = str(round(time.time() - start_time, 3))
+    print(BOLD + BLUE + (delta_time + " seconds ").rjust(int(window_width)) + RESET)
+    reset_time()
 
+def reset_time():
+    global start_time
+    start_time = time.time()
+
+def finalize_category(category_is_visible):
+    if category_is_visible:
+        if args.show_time:
+            show_time()
+            print(BOLD + BLUE + time_separator + RESET)
+            print()
+        else:
+            print()
+    else:
+        reset_time()
 
 try:
     if not args.hide_tasks:
-        gitviper.list_tasks()
-
-    show_time()
+        finalize_category(gitviper.list_tasks())
 
     # git
     gitconnector.connect()
 
     if connection.is_git_repo:
         if not args.hide_branches:
-            gitviper.list_branches()
-            show_time()
+            finalize_category(gitviper.list_branches())
         if not args.hide_logs:
-            gitviper.list_logs(args.log_number)
-            show_time()
+            finalize_category(gitviper.list_logs(args.log_number))
         if not args.hide_stash:
-            gitviper.list_stash()
-            show_time()
+            finalize_category(gitviper.list_stash())
         if not args.hide_status:
-            gitviper.list_status()
-            show_time()
+            finalize_category(gitviper.list_status())
+
 except KeyboardInterrupt:
     print()
 except BrokenPipeError: # occurs sometimes after quitting less when big git-logs are displayed
diff --git a/gitviper/branches.py b/gitviper/branches.py
@@ -21,7 +21,8 @@ def list_branches():
         else:
             _list_all_branches()
 
-        print()
+        return True
+    return False
 
 def should_show_branches():
     remotes = connection.repo.remotes
diff --git a/gitviper/log.py b/gitviper/log.py
@@ -14,7 +14,10 @@
 def list_logs(num):
 	if show_logs():
 		log(num)
-		print()
+
+		return True
+
+	return False
 
 def show_logs():
 	try:
diff --git a/gitviper/stash.py b/gitviper/stash.py
@@ -10,7 +10,10 @@
 def list_stash():
 	if stash_exists():
 		print_stash()
-		print()
+
+		return True
+
+	return False
 
 def stash_exists():
 	return len(connection.repo.git.stash("list")) > 0
diff --git a/gitviper/status.py b/gitviper/status.py
@@ -11,7 +11,10 @@
 def list_status():
 	if connection.repo.is_dirty() or len(connection.repo.untracked_files) > 0:
 		_list_status()
-		print()
+
+		return True
+
+	return False
 
 def _list_status():
 	gui.print_header("Status", BG_GREEN)
diff --git a/gitviper/tasks.py b/gitviper/tasks.py
@@ -45,8 +45,11 @@ def list_tasks():
 		print(line1)
 	if len(line2.strip()) > 0:
 		print(line2)
+
 	if len(line1.strip()) > 0 or len(line2.strip()) > 0:
-		print()
+		return True
+
+	return False
 
 def count_tasks(filename, counter_dict):
 	with open(filename, 'r') as myfile:
