refactoring

Author: datsom1

db_diff/cli.py

@@ -114,8 +114,7 @@ def load(filename: str, key: str, input_format: str, encoding: str = "utf-8") ->
         logger.error(f"Error loading file {filename}: {str(e)}")
         raise click.ClickException(f"Failed to load '{filename}': {e}")
 
-def generate_output_filename(previous: str, current: str, output_file: Optional[str], 
-                         output_path: Optional[str], timestamp: bool = False) -> str:
+def generate_output_filename(previous: str, current: str, output_file: Optional[str], output_path: Optional[str], timestamp: bool = False) -> str:
     """
     Generate an output filename for the diff result.
     
@@ -132,33 +131,36 @@ def generate_output_filename(previous: str, current: str, output_file: Optional[
     Raises:
         click.ClickException: If the output path doesn't exist
     """
-    timestamp_prefix = ""
-    if timestamp:
-        timestamp_str = datetime.datetime.now().strftime("%Y-%m-%d_%H-%M-%S")
-        timestamp_prefix = f"{timestamp_str}_"
-    
     # Extract base filenames without extensions for the comparison files
     prev_basename = os.path.splitext(os.path.basename(previous))[0]
     curr_basename = os.path.splitext(os.path.basename(current))[0]
 
-    if not output_file:
-        # Default output filename
-        output_file = f"{timestamp_prefix}diffs_{prev_basename}__vs__{curr_basename}.json"
-    else:
-        # Remove .json if present to avoid double extension
+    # Build the base filename
+    if output_file:
+        # Remove .json extension if present to avoid double extension
         if output_file.lower().endswith('.json'):
             output_file = output_file[:-5]
-        output_file = f"{timestamp_prefix}diffs_{output_file}.json"
+        base_filename = f"diffs_{output_file}.json"
+    else:
+        # Default output filename
+        base_filename = f"diffs_{prev_basename}__vs__{curr_basename}.json"
 
-    # Handle output path
+    # Add timestamp prefix if enabled
+    if timestamp:
+        timestamp_str = datetime.datetime.now().strftime("%Y-%m-%d_%H-%M-%S")
+        base_filename = f"{timestamp_str}_{base_filename}"
+    
+    # Resolve the final path
     if output_path:
         if not os.path.isdir(output_path):
             logger.error(f"Output path '{output_path}' does not exist")
             raise click.ClickException(f"Output path '{output_path}' does not exist or is not a directory.")
-        output_file = os.path.join(output_path, os.path.basename(output_file))
+        full_path = os.path.join(output_path, base_filename)
+    else:
+        full_path = base_filename
 
-    logger.debug(f"Generated output filename: {output_file}")
-    return output_file
+    logger.debug(f"Generated output filename: {full_path}")
+    return full_path
 
 @click.command(
     context_settings={