attempted to add ja support

Author: RobThePCGuy

config_handler.py

@@ -1,39 +1,80 @@
+import os
+import glob
+import logging
+
+# Initialize logger for config_handler module
+logger = logging.getLogger(__name__)
+logger.setLevel(logging.INFO) # Or desired level, if not set at root logger
+
 def modify_config_file(config_path, setting, new_value):
-    """Modifies a setting in bluestacks.conf."""
+    """Modifies a setting in bluestacks.conf.
+
+    Args:
+        config_path (str): Path to the bluestacks.conf file.
+        setting (str): The setting to modify (e.g., "bst.feature.rooting").
+        new_value (str): The new value for the setting.
+    """
     changed = False
     try:
-        with open(config_path, "r") as f:
+        logger.debug(f"Attempting to modify setting '{setting}' in config file: {config_path}")
+        # Open with encoding='utf-8' for reading
+        with open(config_path, "r", encoding='utf-8') as f:
             lines = f.readlines()
 
-        with open(config_path, "w") as f:
+        # Open with encoding='utf-8' for writing
+        with open(config_path, "w", encoding='utf-8') as f:
             for line in lines:
                 if line.startswith(f"{setting}="):
+                    logger.debug(f"Found setting '{setting}', replacing value. Original line: '{line.strip()}'")
                     f.write(f"{setting}=\"{new_value}\"\n")
                     changed = True
+                    logger.debug(f"Setting '{setting}' updated to '{new_value}'")
                 else:
                     f.write(line)
 
         if changed:
-            print(f"Successfully updated '{setting}' to '{new_value}' in {config_path}")
+            logger.info(f"Successfully updated setting '{setting}' to '{new_value}' in {config_path}")
         else:
-            print(f"No changes made for '{setting}' in {config_path}")
+            logger.info(f"Setting '{setting}' not found in {config_path}, no changes made.")
     except FileNotFoundError:
-        print(f"Error: File not found at {config_path}")
+        error_msg = f"Config file not found at {config_path}"
+        logger.error(error_msg)
+        print(error_msg) # Keep print for user feedback if needed in CLI context, but logging is primary
     except Exception as e:
-        print(f"Error modifying configuration: {e}")
+        error_msg = f"Error modifying configuration file {config_path}: {e}"
+        logger.exception(error_msg) # Log full exception traceback
+        print(error_msg) # Keep print for user feedback
 
 
 def is_root_enabled(config_path, instance_name):
-    """Checks if root access is enabled for a specific instance."""
+    """Checks if root access is enabled for a specific instance.
+
+    Args:
+        config_path (str): Path to the bluestacks.conf file.
+        instance_name (str): The name of the BlueStacks instance.
+
+    Returns:
+        bool: True if root access is enabled, False otherwise.
+    """
     try:
-        with open(config_path, "r") as f:
+        setting_key = f"bst.instance.{instance_name}.enable_root_access="
+        logger.debug(f"Checking root status for instance '{instance_name}' in {config_path}")
+        # Open with encoding='utf-8' for reading
+        with open(config_path, "r", encoding='utf-8') as f:
             for line in f:
-                if line.startswith(f"bst.instance.{instance_name}.enable_root_access="):
-                    return line.strip().endswith("=\"1\"")
-        return False
+                if line.startswith(setting_key):
+                    is_enabled = line.strip().endswith("=\"1\"")
+                    logger.debug(f"Root status for instance '{instance_name}': {'Enabled' if is_enabled else 'Disabled'}")
+                    return is_enabled
+        logger.debug(f"Root setting '{setting_key}' not found for instance '{instance_name}' in {config_path}. Assuming root is disabled.")
+        return False # Setting not found, assume root is disabled
     except FileNotFoundError:
-        print(f"Error: File not found at {config_path}")
+        error_msg = f"Config file not found at {config_path}"
+        logger.error(error_msg)
+        print(error_msg)
         return False
     except Exception as e:
-        print(f"Error reading configuration: {e}")
+        error_msg = f"Error reading configuration file {config_path}: {e}"
+        logger.exception(error_msg)
+        print(error_msg)
         return False

instance_handler.py

@@ -1,22 +1,39 @@
 import os
 import glob
+import logging
+
+# Initialize logger for instance_handler module
+logger = logging.getLogger(__name__)
+logger.setLevel(logging.INFO) # Or desired level, if not set at root logger
+
 
 def modify_instance_files(instance_path, file_names, new_type):
-    """Modifies file types in .bstk files to toggle R/W status, and logs changes in detail."""
+    """Modifies file types in .bstk files to toggle R/W status, and logs changes in detail.
+
+    Args:
+        instance_path (str): Path to the BlueStacks instance directory.
+        file_names (list): List of file names to modify within the .bstk files.
+        new_type (str): The new file type to set ("Normal" or "Readonly").
+    """
     bstk_files = ["Android.bstk.in"]
-    instance_bstk = glob.glob(os.path.join(instance_path, "*.bstk"))
+    instance_bstk_files = glob.glob(os.path.join(instance_path, "*.bstk"))
 
-    if not instance_bstk:
-        print(f"Error: No .bstk file found in {instance_path}")
+    if not instance_bstk_files:
+        error_msg = f"Error: No .bstk file found in instance path: {instance_path}"
+        logger.error(error_msg)
+        print(error_msg)
         return
 
-    bstk_files.append(os.path.basename(instance_bstk[0]))
+    bstk_files.append(os.path.basename(instance_bstk_files[0])) # Take the first one found
+
+    logger.debug(f"Modifying instance files in path: {instance_path}, BSTK files: {bstk_files}, Target files: {file_names}, New type: {new_type}")
 
     for bstk_file in bstk_files:
         bstk_path = os.path.join(instance_path, bstk_file)
         changed_entries = []  # Store (filename, old_value, new_value)
 
         try:
+            logger.debug(f"Processing BSTK file: {bstk_path}")
             with open(bstk_path, "r") as f:
                 content = f.readlines()
 
@@ -29,36 +46,63 @@ def modify_instance_files(instance_path, file_names, new_type):
                             old_value = "Readonly"
                             line = line.replace("Readonly", new_type)
                             changed_entries.append((matched_file_name, old_value, new_type))
+                            logger.debug(f"Modified line for file '{matched_file_name}': from 'Readonly' to '{new_type}'")
                         elif "Normal" in line:
                             old_value = "Normal"
                             line = line.replace("Normal", new_type)
                             changed_entries.append((matched_file_name, old_value, new_type))
+                            logger.debug(f"Modified line for file '{matched_file_name}': from 'Normal' to '{new_type}'")
                     f.write(line)
 
             if changed_entries:
                 for (file_name, old_val, new_val) in changed_entries:
-                    print(f"Successfully updated '{file_name}' from '{old_val}' to '{new_val}' in {bstk_path}")
+                    logger.info(f"Successfully updated file type for '{file_name}' in {bstk_path}: from '{old_val}' to '{new_val}'")
             else:
-                print(f"No changes made in {bstk_path}")
+                logger.info(f"No target file types ('Readonly' or 'Normal' with filenames {file_names}) found to modify in {bstk_path}.")
 
         except FileNotFoundError:
-            print(f"Error: File not found at {bstk_path}")
+            error_msg = f"BSTK file not found at {bstk_path}"
+            logger.error(error_msg)
+            print(error_msg)
         except Exception as e:
-            print(f"Error modifying file: {e}")
+            error_msg = f"Error modifying BSTK file {bstk_path}: {e}"
+            logger.exception(error_msg)
+            print(error_msg)
+
 
 def is_instance_readonly(instance_path):
-    """Checks if instance files are set to 'Readonly'."""
-    for bstk_file in ["Android.bstk.in", f"{os.path.basename(instance_path)}.bstk"]:
+    """Checks if instance files are set to 'Readonly'.
+
+    Args:
+        instance_path (str): Path to the BlueStacks instance directory.
+
+    Returns:
+        bool: True if 'Readonly' is found in any checked .bstk file, False otherwise.
+    """
+    bstk_files_to_check = ["Android.bstk.in"] # Define filenames to check directly
+    instance_bstk_files = glob.glob(os.path.join(instance_path, "*.bstk"))
+    if instance_bstk_files: # Only add if found, avoid index error if glob returns empty list
+        bstk_files_to_check.append(os.path.basename(instance_bstk_files[0]))
+
+    logger.debug(f"Checking readonly status for instance path: {instance_path}, BSTK files to check: {bstk_files_to_check}")
+
+    for bstk_file in bstk_files_to_check:
         bstk_path = os.path.join(instance_path, bstk_file)
         try:
             with open(bstk_path, "r") as f:
                 for line in f:
                     if "Readonly" in line:
+                        logger.debug(f"'Readonly' found in {bstk_path}")
                         return True
-            return False
+            logger.debug(f"'Readonly' not found in {bstk_path}") # Log even when not found to confirm check
         except FileNotFoundError:
-            print(f"Error: File not found at {bstk_path}")
-            return False
+            error_msg = f"BSTK file not found at {bstk_path}"
+            logger.error(error_msg)
+            print(error_msg)
+            return False # If one file not found, consider it not readonly for safety (or adjust logic)
         except Exception as e:
-            print(f"Error reading file: {e}")
-            return False
+            error_msg = f"Error reading BSTK file {bstk_path}: {e}"
+            logger.exception(error_msg)
+            print(error_msg)
+            return False
+    return False # Readonly not found in any checked files