improved argument validation, fleshed README out, and began adding support for CMYK

1 files changed, 81 insertions, 13 deletions

diff --git a/color-converter.py b/color-converter.py
index 0dfae00..a574bd1 100644
--- a/color-converter.py
+++ b/color-converter.py
@@ -1,27 +1,40 @@
-import sys
+# import sys
 import argparse
 
-TYPES = ['hex', 'rgb', 'hsl', 'cmyk']
+# Order of types must match order of arguments defined
+# (or else arg validation will no longer work properly)
+TYPES = ['hex', 'rgb', 'cmyk']
+# look into CMY, HSL, HSV
+
 HEX_LETTERS = ['a', 'b', 'c', 'd', 'e', 'f']
 
 def main():
+
+    # Set up arguments
     parser = argparse.ArgumentParser()
-    parser.add_argument('--hex', action='store_true', help='convert from hex (accepted formats: [ffffff] or ["#ffffff"])')
-    parser.add_argument('--rgb', action='store_true', help='convert from RGB (accepted formats: [R G B], [\"rgb(R, G, B)\"], and [\"rgb(R,G,B)\"])')
-    parser.add_argument('color', nargs='*', help='accepts a color in Hex, RGB, CYMK, or HSL and performs format conversions')
+    
+    parser.add_argument('-hex', action='store_true', help='convert from hex (accepts hexadecimal input [ffffff] or string ["#ffffff"] (both are case insensitive)')
+    parser.add_argument('-rgb', action='store_true', help='convert from RGB (accepts integer input [R G B], or string [\"rgb(R, G, B)\"] (case/whitespace insensitive)')
+    parser.add_argument('-cmyk', action='store_true', help='convert from CMYK (accepts integer input [C M Y K], or string [\"cmyk(C, M, Y, K)\"] (case/whitespace insensitive)')
+    
+    parser.add_argument('color', nargs='*', help='accepts a color in Hex, RGB, CMYK, or HSL and performs format conversions (does not support CMYK profiles, conversions are uncalibrated)')
     args = parser.parse_args()
 
+
+    # debug print
+    print('args type: ', type(vars(args)))
     print(args, '\n')
 
-    color = args.color 
-    
-    if len(color) == 0 :
-        print('ERROR: Must enter color code')
-        return
 
+    # INPUT SYNTAX VALIDATION
+    if not validateArguments(args) :
+        return;
+
+    color = args.color
+    
     # HANDLE HEX INPUT
     if args.hex :
-        color = color[0].strip('#')
+        color = color[0].lower().strip('#')
         if not validateHex(color) :
             return
 
@@ -31,7 +44,7 @@ def main():
     if args.rgb :
         # cleanse any non-numerical stuff
         if len(color) == 1 :
-            color = color[0].strip('rgb(').strip(')').split(',')
+            color = color[0].lower().strip('rgb(').strip(')').split(',')
         if not validateRGB(color) :
             return
         
@@ -39,7 +52,16 @@ def main():
             color[i] = int(color[i])
 
         convertFromRGB(color)
-        
+
+    # HANDLE CMYK INPUT
+    if args.cmyk :
+        # cleanse any non-numerical stuff besides '%'
+        if len(color) == 1 :
+            color = color[0].lower().strip('cmyk(').strip(')').split(',')
+        if not validateCMYK(color) :
+            return
+
+        print('convert cmyk: ', color)
 ##
 # HEX CONVERSION SECTION
 ##
@@ -86,6 +108,9 @@ def convertToRGB(codeFormat, code) :
             tempSum = 0
     
     print('RGB: ', rgbValue)
+
+
+
 ##
 # INPUT VALIDATION SECTION
 ##
@@ -124,6 +149,49 @@ def validateRGB(values) :
             return False
     return True
 
+# Takes in a string. Returns True if valid CMYK values.
+def validateCMYK(values) :
+    if len(values) != 4 :
+        print('ERROR: Improper number of values (should be 4)')
+        return False
+    
+    for value in values :
+        if not value.strip().strip('%').isnumeric() :
+            print('ERROR: Improper format for CMYK value(s). All values must be numeric and between 0-100(%)!')
+            return False
+        value = int(value)
+        if (value < 0) or (value > 100) :
+            print('ERROR: Each CMYK value must be between 0-100(%)')
+            return False
+    
+    return True
+
+   
+
+##
+# GENERAL UTILITIES
+##
+
+# Takes in the program's arguments generated by argparse. Returns True if valid arguments
+def validateArguments(args) :
+    # First, check that only one input flag is being used
+    flagsActive = 0
+    for flag in range(len(vars(args))-1) :
+        # this uses our TYPES list to key into the args dictionary and determine how many flags are True
+        if vars(args)[TYPES[flag]] :
+            flagsActive += 1
+        if flagsActive > 1 :
+            print('ERROR: Currently this tool only supports one input type at a time. Too many flags!')
+            return False
+
+    # Second, check that there is a color code to convert
+    if len(color) == 0 :
+        print('ERROR: Must enter both an input flag and color code (did you forget to wrap color code in quotes?)\nFor more info, use the \'-h\' or \'--help\' flag.')
+        return False
+    
+    return True
+ 
+
 # Takes in a decimal number and converts it to hexadecimal
 def hex(number) :
     number = int(number)