JSON - YAML Converter modification

jedimasterbot · jedimasterbot · commit 1472d6184173 · 2021-02-06T19:00:24.000+05:00
diff --git a/JSON - YAML Converter/converter.py b/JSON - YAML Converter/converter.py
@@ -13,25 +13,29 @@ def json2yaml(files):
             # Get the filename and extension
             filename, extension = os.path.splitext(filename_full)
 
-            # Opening the file
-            source_file = open(filename_full, "r")
-            source_content = json.load(source_file)
-            source_file.close()
+            if extension == '.json':
+                # Opening the file
+                source_file = open(filename_full, "r")
+                source_content = json.load(source_file)
+                source_file.close()
+
+                # Processing the conversion
+                output = yaml.dump(source_content)
+
+                # If the target file already exists exit
+                new_filename = f'{filename}.yaml'
+                if os.path.exists(new_filename):
+                    print("ERROR: " + new_filename + " already exists")
+
+                # Otherwise write to the specified file
+                else:
+                    target_file = open(new_filename, "w")
+                    target_file.write(output)
+                    target_file.close()
+                    print(f"YAML File Converted: {new_filename}")
 
-            # Processing the conversion
-            output = yaml.dump(source_content)
-
-            # If the target file already exists exit
-            new_filename = f'{filename}.yaml'
-            if os.path.exists(new_filename):
-                print("ERROR: " + new_filename + " already exists")
-
-            # Otherwise write to the specified file
             else:
-                target_file = open(new_filename, "w")
-                target_file.write(output)
-                target_file.close()
-                print(f"YAML File Converted: {new_filename}")
+                print(f"Extension NOT Valid for file: {file}")
 
 
 def yaml2json(files):
@@ -43,25 +47,28 @@ def yaml2json(files):
             # Get the filename and extension
             filename, extension = os.path.splitext(filename_full)
 
-            # Opening the file
-            source_file = open(filename_full, "r")
-            source_content = yaml.safe_load(source_file)
-            source_file.close()
-
-            # Processing the conversion
-            output = json.dumps(source_content)
-
-            # If the target file already exists exit
-            new_filename = f'{filename}.json'
-            if os.path.exists(new_filename):
-                print(f"ERROR: {new_filename} already exists")
-
-            # Otherwise write to the specified file
+            if extension == ".yaml":
+                # Opening the file
+                source_file = open(filename_full, "r")
+                source_content = yaml.safe_load(source_file)
+                source_file.close()
+
+                # Processing the conversion
+                output = json.dumps(source_content)
+
+                # If the target file already exists exit
+                new_filename = f'{filename}.json'
+                if os.path.exists(new_filename):
+                    print(f"ERROR: {new_filename} already exists")
+
+                # Otherwise write to the specified file
+                else:
+                    target_file = open(new_filename, "w")
+                    target_file.write(output)
+                    target_file.close()
+                    print(f"JSON File Converted: {new_filename}")
             else:
-                target_file = open(new_filename, "w")
-                target_file.write(output)
-                target_file.close()
-                print(f"JSON File Converted: {new_filename}")
+                print(f"Extension NOT Valid for file: {file}")
 
 
 def main():
@@ -71,10 +78,10 @@ def main():
     parser.add_argument('-f', dest='file', nargs='+', type=str, help='Submit a file(s)', required=True)
 
     # Argument is to convert file to json
-    parser.add_argument('-j', dest='json', action='store_true', help='Convert YAML to JSON', required=True)
+    parser.add_argument('-j', dest='json', action='store_true', help='Convert YAML to JSON')
 
     # Argument is to convert file to yaml
-    parser.add_argument('-y', dest='yaml', action='store_true', help='Convert JSON to YAML', required=True)
+    parser.add_argument('-y', dest='yaml', action='store_true', help='Convert JSON to YAML')
 
     args = parser.parse_args()
 
