3.8.10

dkundih · Aug 7, 2022 · 669ec96 · 669ec96
1 parent 84ec5bd
commit 669ec96
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -512,4 +512,8 @@ CHANGELOG
 
 3.8.9 (07/08/2022)
 - paint_text added to toolkit.
-- now also inits colorama colors before other packages to avoid conflicts.
+- now also inits colorama colors before other packages to avoid conflicts.
+
+3.8.10 (07/08/2022)
+- changes to coloring policies
+- alligned paint_text to duality._paint_text changes.
diff --git a/vandal/__init__.py b/vandal/__init__.py
@@ -38,7 +38,7 @@
 
             file_handler(file) - handles the file extension upon import.
             
-            paint_text(text, color, print_trigger = True) - paints the text with a desired color ('r', 'g', 'b', 'k', 'c', 'm', 'y').
+            paint_text(text, color, print_trigger) - paints the text with a desired color ('fr', 'fg', 'fb', 'fk', 'fc', 'fm', 'fy', 'br', 'bg', 'bb', 'bk', 'bc', 'bm', 'by').
 
     EXAMPLE (MODULE FUNCTIONS)
         --------------------------
@@ -91,6 +91,8 @@
 # colorama imports.
 from colorama import (
     Fore,
+    Back,
+    Style,
     init,
 )
 

diff --git a/vandal/__main__.py b/vandal/__main__.py
@@ -1,6 +1,8 @@
 # coloring.
 from colorama import (
     Fore,
+    Back,
+    Style,
     init,
 )
 

diff --git a/vandal/hub/__init__.py b/vandal/hub/__init__.py
@@ -2,6 +2,16 @@
 from vandal.hub import toolkit
 from vandal.hub import example
 
+# coloring.
+from colorama import (
+    Fore,
+    Back,
+    Style,
+    init,
+)
+
+init()
+
 from vandal.hub.toolkit import (
     random_value,
     random_pool,

diff --git a/vandal/hub/toolkit.py b/vandal/hub/toolkit.py
@@ -1,7 +1,9 @@
 # coloring.
 from colorama import (
-        Fore,
-        init,
+    Fore,
+    Back,
+    Style,
+    init,
 )
 
 init()
@@ -41,7 +43,7 @@
 
         file_handler(file) - handles the file extenstion upon import.
         
-        paint_text(text, color, print_trigger = True) - paints the text with a desired color ('r', 'g', 'b', 'k', 'c', 'm', 'y').
+        paint_text(text, color, print_trigger) - paints the text with a desired color ('fr', 'fg', 'fb', 'fk', 'fc', 'fm', 'fy', 'br', 'bg', 'bb', 'bk', 'bc', 'bm', 'by').
 	
 '''
 
@@ -188,19 +190,43 @@ def save_to(file, prefix, func_name, choice):
         else:
                 print('=== NO OPTION CHOSEN, EXITING THE MENU... ===\n')
 
-#p aints the text with a desired color ('r', 'g', 'b', 'k', 'c', 'm', 'y').
-def paint_text(text, color, print_trigger = True):
-    colors = {'r': Fore.RED,
-              'g' : Fore.GREEN,
-              'b' : Fore.BLUE,
-              'k' : Fore.BLACK,
-              'm' : Fore.MAGENTA,
-              'y' : Fore.YELLOW,
-              'c' : Fore.CYAN,
-              }
-
-    if print_trigger == True:
-        return print(colors[color] + text + Fore.RESET)
-
-    elif print_trigger == False:
-        return colors[color] + text + Fore.RESET
+# paints the text with a desired color ('fr', 'fg', 'fb', 'fk', 'fc', 'fm', 'fy', 'br', 'bg', 'bb', 'bk', 'bc', 'bm', 'by').
+def paint_text(
+        text : StringType,
+        color : StringType,
+        print_trigger : BooleanType = True
+        ) -> StringType:
+
+        '''
+        * coloring of CLI.
+        
+        - text - desired text to print.
+        - color - desired color to print in.
+        - print_trigger (True/False) - modify return type.
+        '''
+
+        # Fore coloring.
+        colors = {
+            'Fr' : Fore.RED,
+            'Fg' : Fore.GREEN,
+            'Fb' : Fore.BLUE,
+            'Fk' : Fore.BLACK,
+            'Fm' : Fore.MAGENTA,
+            'Fy' : Fore.YELLOW,
+            'Fc' : Fore.CYAN,
+
+        # Back coloring.
+            'Br' : Back.RED,
+            'Bg' : Back.GREEN,
+            'Bb' : Back.BLUE,
+            'Bk' : Back.BLACK,
+            'Bm' : Back.MAGENTA,
+            'By' : Back.YELLOW,
+            'Bc' : Back.CYAN,
+            }
+
+        if print_trigger == True:
+            return print(colors[color] + str(text) + Style.RESET_ALL)
+
+        elif print_trigger == False:
+            return colors[color] + str(text) + Style.RESET_ALL
diff --git a/vandal/misc/_meta.py b/vandal/misc/_meta.py
@@ -13,7 +13,7 @@
 
 ]
 __license__ = 'Copyright © 2021-2022 David Kundih. All rights reserved. Licensed under the Apache License, Version 2.0 | For more details about the license and terms of use visit the official vandal documentation linked at https://github.com/dkundih/vandal and https://pypi.org/project/vandal'
-__version__ = '3.8.9'
+__version__ = '3.8.10'
 __documentation__ = 'https://github.com/dkundih/vandal | https://pypi.org/project/vandal'
 __contact__ = 'dakundih@unin.hr | kundihdavid@gmail.com'
 __donate__ = 'https://patreon.com/dkundih | https://buymeacoffee.com/dkundih'

diff --git a/vandal/objects/eoq.py b/vandal/objects/eoq.py
@@ -1,8 +1,10 @@
 # coloring.
 from colorama import (
     Fore,
+    Back,
+    Style,
     init,
-) 
+)
 
 init()
 

diff --git a/vandal/objects/montecarlo.py b/vandal/objects/montecarlo.py
@@ -1,8 +1,10 @@
 # coloring.
 from colorama import (
     Fore,
+    Back,
+    Style,
     init,
-) 
+)
 
 init()