removed the error expected set, incorporated error handling with cli

i18nilize/src/internationalize/diffing_processor.py

@@ -2,7 +2,9 @@
 import hashlib
 import json
 from dirsync import sync
+from . import globals
 from src.internationalize.helpers import compute_hash, compute_hashes, read_json_file
+from src.internationalize.error_handler import ErrorHandler
 
 JSON_EXTENSION = ".json"
 
@@ -57,6 +59,13 @@ def update_metadata(self, hash_dict):
             json.dump(hash_dict, outfile)
 
     def sync_translations(self):
+        handler = ErrorHandler(globals.LANGUAGES_DIR)
+        errors = handler.verify_languages()
+        if errors:
+            print("Errors detected in language files:")
+            for file, error in errors.items():
+                print(f"{file}: {error}")
+            return
         sync(self.curr_translation_files_dir, self.diff_state_files_dir, "sync", purge=True)
 
     """

i18nilize/src/internationalize/error_handler.py

@@ -37,20 +37,17 @@ def verify_languages(self):
     Output: descriptive string about the error from the language file
     """
     def handle_error(self, language_file, error_expected=False):
-        result = ""
-
+        invalid_file_result = ""
         # Verify if file is invalid
-        result = self.handle_invalid_file(language_file)
-        if result != "":
-            return result
-
+        invalid_file_result = self.handle_invalid_file(language_file)
+        print(invalid_file_result)
+        if invalid_file_result != "":
+            return invalid_file_result
         # Verify if any keys are invalid
-        result = self.handle_invalid_keys(language_file)
-
-        if result == "" and error_expected:
-            raise Exception(f"expected error in {language_file} but no error was found")
-
-        return result
+        invalid_keys_result = self.handle_invalid_keys(language_file)
+        if invalid_keys_result != "":
+            return invalid_keys_result     
+        return ""
 
     """
     Checks if given language is in an invalid file
@@ -82,13 +79,14 @@ def handle_invalid_keys(self, language_file):
         language = {}
         try:
             with open(language_location, "r") as file:
-                language = json.load(file)
+                language = json.load(file)   
             for key in language:
+                stripped_key = key.strip()     
+                if stripped_key == "":
+                    return "Key is empty or contains only whitespace."
                 if not isinstance(language[key], str):
-                    return "Value is not a string."
-                if not key.strip():
-                    return "Key is empty."
+                    return f"Value for key '{key}' is not a string."
         except Exception as e:
             print(f"Unexpected Error: {e}")
             raise e
-        return ""
+        return ""

i18nilize/src/internationalize/helpers.py

@@ -4,6 +4,7 @@
 import hashlib
 import requests
 from . import globals
+from internationalize.error_handler import ErrorHandler
 
 # Function to parse json file, given its path
 def get_json(file_path):
@@ -38,13 +39,30 @@ def add_language(language):
 # Adds/updates a translated word under the given language in the default JSON file
 def add_update_translated_word(language, original_word, translated_word):
     file_path = os.path.join(globals.LANGUAGES_DIR, f"{language.lower()}.json")
-
+    handler = ErrorHandler(globals.LANGUAGES_DIR)
+
     if not os.path.exists(file_path):
         print(f"Error: Language '{language}' does not exist. Add the language before adding a translation.")
         sys.exit(1)
+    if not original_word.strip():
+        print("Error: Original word cannot be empty or contain only whitespace.")
+        sys.exit(1)
+    if not translated_word.strip():
+        print("Error: Translated word cannot be empty or contain only whitespace.")
+        sys.exit(1)
+    try:
+        data = get_json(file_path)
+    except json.JSONDecodeError as e:
+        result = handler.handle_error(f"{language.lower()}.json", True)
+        sys.exit(1)
 
-    data = get_json(file_path)
-
+    result = handler.handle_error(f"{language.lower()}.json", True)
+    if (result == "Key is empty or contains only whitespace."):
+        print(result)
+        sys.exit(1)
+    elif (result != ""):
+        print(result)
+        sys.exit(1)
     data[original_word] = translated_word
     with open(file_path, 'w') as file:
         json.dump(data, file, indent=4)
@@ -53,12 +71,31 @@ def add_update_translated_word(language, original_word, translated_word):
 # Deletes a translated word for the given language
 def delete_translation(language, original_word, translated_word):
     file_path = os.path.join(globals.LANGUAGES_DIR, f"{language.lower()}.json")
-
+    handler = ErrorHandler(globals.LANGUAGES_DIR)
     if not os.path.exists(file_path):
         print(f"Error: Language '{language}' does not exist.")
         sys.exit(1)
+    try:
+        data = get_json(file_path)
+    except json.JSONDecodeError as e:
+        result = handler.handle_error(f"{language.lower()}.json", True)
+        sys.exit(1)
+
+    result = handler.handle_error(f"{language.lower()}.json", True)
+    if (result == "Key is empty or contains only whitespace."):
+        print(result)
+        sys.exit(1)
+    elif (result != ""):
+        print(result)
+        sys.exit(1)
 
-    data = get_json(file_path)
+    if not original_word.strip():
+        print("Error: Original word cannot be empty or contain only whitespace.")
+        sys.exit(1)
+
+    if not translated_word.strip():
+        print("Error: Translated word cannot be empty or contain only whitespace.")
+        sys.exit(1)
 
     if original_word not in data:
         print(f"Error: Original word '{original_word}' does not exist in language '{language}'.")

i18nilize/tests/resources/error_handling/translations/empty_keys.json

@@ -1,4 +1,4 @@
 {
-    "": "bonjour",
+    "": 123",
     "   ": "merci"
 }

src/internationalize/languages/croatian.json

@@ -0,0 +1,4 @@
+{
+    "as": "hello",
+    "asdd": "as"
+}