fixed stupid code

Author: datsom1

db_diff/cli.py

@@ -115,8 +115,7 @@ def load(filename: str, key: str, input_format: str, encoding: str = "utf-8") ->
         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: Optional[str] = None,
-                         use_timestamp: bool = True) -> str:
+                         output_path: Optional[str], timestamp: bool = False) -> str:
     """
     Generate an output filename for the diff result.
     
@@ -125,8 +124,7 @@ def generate_output_filename(previous: str, current: str, output_file: Optional[
         current: Path to the current file
         output_file: User-specified output filename (optional)
         output_path: User-specified output directory (optional)
-        timestamp: Timestamp to use (optional)
-        use_timestamp: Whether to include timestamp in filename (default: False)
+        timestamp: Whether to include timestamp in filename (default: False)
         
     Returns:
         Full path to the output file
@@ -135,10 +133,9 @@ def generate_output_filename(previous: str, current: str, output_file: Optional[
         click.ClickException: If the output path doesn't exist
     """
     timestamp_prefix = ""
-    if use_timestamp:
-        if timestamp is None:
-            timestamp = datetime.datetime.now().strftime("%Y-%m-%d_%H-%M-%S")
-        timestamp_prefix = f"{timestamp}_"
+    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]
@@ -148,11 +145,10 @@ def generate_output_filename(previous: str, current: str, output_file: Optional[
         # Default output filename
         output_file = f"{timestamp_prefix}diffs_{prev_basename}__vs__{curr_basename}.json"
     else:
-        # Prepend the timestamp to the user-specified filename if needed
-        output_file = f"{timestamp_prefix}diffs_{output_file}"
-        # Ensure the output file has a .json extension
-        if not output_file.endswith('.json'):
-            output_file += '.json'
+        # Remove .json 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"
 
     # Handle output path
     if output_path:
@@ -177,8 +173,8 @@ def generate_output_filename(previous: str, current: str, output_file: Optional[
            "\n     db-diff old.csv new.csv --key=Id\n"
            "\n Output to JSON file:\n"
            "\n     db-diff old.csv new.csv --output=jsonfile --outfilename=diff.json\n"
-           "\n Output without timestamp in filename:\n"
-           "\n     db-diff old.csv new.csv --output=jsonfile --timestamp=false\n"
+           "\n Output with timestamp in filename:\n"
+           "\n     db-diff old.csv new.csv --output=jsonfile --timestamp\n"
            "\n Compare only specific fields:\n"
            "\n     db-diff old.csv new.csv --fields=Id,Name,Email\n"
            "\n Ignore specific fields:\n"
@@ -275,9 +271,7 @@ def generate_output_filename(previous: str, current: str, output_file: Optional[
 )
 @click.option(
     "--timestamp",
-    type=click.Choice(["true", "false"], case_sensitive=False),
-    default="false",
-    show_default=True,
+    is_flag=True,
     help="Add timestamp to filename: YYYY-MM-DD_HH-MM-SS_diffs_<filename>.json",
 )
 @click.version_option()
@@ -339,8 +333,7 @@ def cli(
     # Set default output filename if needed
     if output == "jsonfile":
         try:
-            use_timestamp = timestamp.lower() == "true"
-            output_file = generate_output_filename(previous, current, output_file, output_path, use_timestamp=use_timestamp)
+            output_file = generate_output_filename(previous, current, output_file, output_path, timestamp)
         except Exception as e:
             raise click.ClickException(f"Failed to generate output filename: {e}")