feat: update version to 4.0.0 and enhance image processing features with new conversion, resizing, rotation, and cropping functionalities

hariharen9 · hariharen9 · commit 014d99378fe4 · 2025-11-26T18:13:33.000+05:30
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "peg_this"
-version = "3.0.6"
+version = "4.0.0"
 authors = [
   { name="Hariharen S S", email="thisishariharen@gmail.com" },
 ]
diff --git a/src/peg_this/features/convert.py b/src/peg_this/features/convert.py
@@ -91,3 +91,135 @@ def convert_file(file_path):
         os.remove(f"palette_{Path(file_path).stem}.png")
         
     questionary.press_any_key_to_continue().ask()
+
+
+def convert_image(file_path):
+    """Convert an image to a different format."""
+    output_format = questionary.select(
+        "Select the output format:",
+        choices=["jpg", "png", "webp", "bmp", "tiff"],
+        use_indicator=True
+    ).ask()
+    if not output_format: return
+
+    output_file = f"{Path(file_path).stem}_converted.{output_format}"
+    kwargs = {'y': None}
+    
+    # For JPG and WEBP, allow quality selection
+    if output_format in ['jpg', 'webp']:
+        quality_preset = questionary.select(
+            "Select quality preset:",
+            choices=["High (95%)", "Medium (80%)", "Low (60%)"],
+            use_indicator=True
+        ).ask()
+        if not quality_preset: return
+
+        quality_map = {"High (95%)": "95", "Medium (80%)": "80", "Low (60%)": "60"}
+        quality = quality_map[quality_preset]
+
+        if output_format == 'jpg':
+            q_scale = int(31 - (int(quality) / 100.0) * 30)
+            kwargs['q:v'] = q_scale
+        elif output_format == 'webp':
+            kwargs['quality'] = quality
+
+    stream = ffmpeg.input(file_path).output(output_file, **kwargs)
+    
+    if run_command(stream, f"Converting to {output_format.upper()}..."):
+        console.print(f"[bold green]Successfully converted image to {output_file}[/bold green]")
+    else:
+        console.print("[bold red]Image conversion failed.[/bold red]")
+    
+    questionary.press_any_key_to_continue().ask()
+
+
+def resize_image(file_path):
+    """Resize an image to new dimensions."""
+    console.print("Enter new dimensions. Use [bold]-1[/bold] for one dimension to preserve aspect ratio.")
+    width = questionary.text("Enter new width (e.g., 1280 or -1):").ask()
+    if not width: return
+    height = questionary.text("Enter new height (e.g., 720 or -1):").ask()
+    if not height: return
+
+    try:
+        if int(width) == -1 and int(height) == -1:
+            console.print("[bold red]Error: Width and Height cannot both be -1.[/bold red]")
+            questionary.press_any_key_to_continue().ask()
+            return
+    except ValueError:
+        console.print("[bold red]Error: Invalid dimensions. Please enter numbers.[/bold red]")
+        questionary.press_any_key_to_continue().ask()
+        return
+
+    output_file = f"{Path(file_path).stem}_resized{Path(file_path).suffix}"
+    
+    stream = ffmpeg.input(file_path).filter('scale', w=width, h=height).output(output_file, y=None)
+    
+    if run_command(stream, "Resizing image..."):
+        console.print(f"[bold green]Successfully resized image to {output_file}[/bold green]")
+    else:
+        console.print("[bold red]Image resizing failed.[/bold red]")
+        
+    questionary.press_any_key_to_continue().ask()
+
+
+def rotate_image(file_path):
+    """Rotate an image."""
+    rotation = questionary.select(
+        "Select rotation:",
+        choices=[
+            "90 degrees clockwise",
+            "90 degrees counter-clockwise",
+            "180 degrees"
+        ],
+        use_indicator=True
+    ).ask()
+    if not rotation: return
+
+    output_file = f"{Path(file_path).stem}_rotated{Path(file_path).suffix}"
+    
+    stream = ffmpeg.input(file_path)
+    if rotation == "90 degrees clockwise":
+        stream = stream.filter('transpose', 1)
+    elif rotation == "90 degrees counter-clockwise":
+        stream = stream.filter('transpose', 2)
+    elif rotation == "180 degrees":
+        # Apply 90-degree rotation twice for 180 degrees
+        stream = stream.filter('transpose', 2).filter('transpose', 2)
+
+    output_stream = stream.output(output_file, y=None)
+    
+    if run_command(output_stream, "Rotating image..."):
+        console.print(f"[bold green]Successfully rotated image and saved to {output_file}[/bold green]")
+    else:
+        console.print("[bold red]Image rotation failed.[/bold red]")
+        
+    questionary.press_any_key_to_continue().ask()
+
+
+def flip_image(file_path):
+    """Flip an image horizontally or vertically."""
+    flip_direction = questionary.select(
+        "Select flip direction:",
+        choices=["Horizontal", "Vertical"],
+        use_indicator=True
+    ).ask()
+    if not flip_direction: return
+
+    output_file = f"{Path(file_path).stem}_flipped{Path(file_path).suffix}"
+    
+    stream = ffmpeg.input(file_path)
+    if flip_direction == "Horizontal":
+        stream = stream.filter('hflip')
+    else:
+        stream = stream.filter('vflip')
+
+    output_stream = stream.output(output_file, y=None)
+    
+    if run_command(output_stream, "Flipping image..."):
+        console.print(f"[bold green]Successfully flipped image and saved to {output_file}[/bold green]")
+    else:
+        console.print("[bold red]Image flipping failed.[/bold red]")
+        
+    questionary.press_any_key_to_continue().ask()
+
diff --git a/src/peg_this/features/crop.py b/src/peg_this/features/crop.py
@@ -104,3 +104,75 @@ def on_drag(event):
         if os.path.exists(preview_frame):
             os.remove(preview_frame)
         questionary.press_any_key_to_continue().ask()
+
+
+def crop_image(file_path):
+    """Visually crop an image by selecting an area."""
+    if not tk:
+        console.print("[bold red]Cannot perform visual cropping: tkinter & Pillow are not installed.[/bold red]")
+        console.print("Please install them with: [bold]pip install tk Pillow[/bold]")
+        questionary.press_any_key_to_continue().ask()
+        return
+
+    try:
+        # --- Tkinter GUI for Cropping ---
+        root = tk.Tk()
+        root.title("Crop Image - Drag to select area, close window to confirm")
+        root.attributes("-topmost", True)
+
+        img = Image.open(file_path)
+        
+        max_width = root.winfo_screenwidth() - 100
+        max_height = root.winfo_screenheight() - 100
+        img.thumbnail((max_width, max_height), Image.Resampling.LANCZOS)
+        
+        img_tk = ImageTk.PhotoImage(img)
+
+        canvas = tk.Canvas(root, width=img.width, height=img.height, cursor="cross")
+        canvas.pack()
+        canvas.create_image(0, 0, anchor=tk.NW, image=img_tk)
+
+        rect_coords = {"x1": 0, "y1": 0, "x2": 0, "y2": 0}
+        rect_id = None
+
+        def on_press(event):
+            nonlocal rect_id
+            rect_coords['x1'], rect_coords['y1'] = event.x, event.y
+            rect_id = canvas.create_rectangle(0, 0, 1, 1, outline='red', width=2)
+
+        def on_drag(event):
+            rect_coords['x2'], rect_coords['y2'] = event.x, event.y
+            canvas.coords(rect_id, rect_coords['x1'], rect_coords['y1'], rect_coords['x2'], rect_coords['y2'])
+
+        canvas.bind("<ButtonPress-1>", on_press)
+        canvas.bind("<B1-Motion>", on_drag)
+        
+        messagebox.showinfo("Instructions", "Click and drag to draw a cropping rectangle.\nClose this window when you are done.", parent=root)
+        root.mainloop()
+
+        # --- Cropping Logic ---
+        crop_w = abs(rect_coords['x2'] - rect_coords['x1'])
+        crop_h = abs(rect_coords['y2'] - rect_coords['y1'])
+        crop_x = min(rect_coords['x1'], rect_coords['x2'])
+        crop_y = min(rect_coords['y1'], rect_coords['y2'])
+
+        if crop_w < 2 or crop_h < 2:
+            console.print("[bold yellow]Cropping cancelled as no valid area was selected.[/bold yellow]")
+            questionary.press_any_key_to_continue().ask()
+            return
+
+        console.print(f"Selected crop area: [bold]width={crop_w} height={crop_h} at (x={crop_x}, y={crop_y})[/bold]")
+
+        output_file = f"{Path(file_path).stem}_cropped{Path(file_path).suffix}"
+        
+        stream = ffmpeg.input(file_path).filter('crop', w=crop_w, h=crop_h, x=crop_x, y=crop_y).output(output_file, y=None)
+
+        if run_command(stream, "Applying crop to image..."):
+            console.print(f"[bold green]Successfully cropped image and saved to {output_file}[/bold green]")
+        else:
+            console.print("[bold red]Image cropping failed.[/bold red]")
+
+    except Exception as e:
+        console.print(f"[bold red]An error occurred during cropping: {e}[/bold red]")
+    finally:
+        questionary.press_any_key_to_continue().ask()
diff --git a/src/peg_this/peg_this.py b/src/peg_this/peg_this.py
@@ -1,15 +1,16 @@
 import os
 import sys
 import logging
+from pathlib import Path
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
 
 import questionary
 from rich.console import Console
 
 from peg_this.features.audio import extract_audio, remove_audio
 from peg_this.features.batch import batch_convert
-from peg_this.features.convert import convert_file
-from peg_this.features.crop import crop_video
+from peg_this.features.convert import convert_file, convert_image, resize_image, rotate_image, flip_image
+from peg_this.features.crop import crop_video, crop_image
 from peg_this.features.inspect import inspect_file
 from peg_this.features.join import join_videos
 from peg_this.features.trim import trim_video
@@ -29,9 +30,44 @@
 
 # Initialize Rich Console
 console = Console()
+IMAGE_EXTENSIONS = [".jpg", ".jpeg", ".png", ".webp", ".bmp", ".tiff"]
 # --- End Global Configuration ---
 
 
+def image_action_menu(file_path):
+    """Display the menu of actions for a selected image file."""
+    while True:
+        console.rule(f"[bold]Actions for Image: {os.path.basename(file_path)}[/bold]")
+        action = questionary.select(
+            "Choose an action:",
+            choices=[
+                "Inspect File Details",
+                "Convert Format",
+                "Resize",
+                "Rotate",
+                "Flip",
+                "Crop (Visual)",
+                questionary.Separator(),
+                "Back to File List"
+            ],
+            use_indicator=True
+        ).ask()
+
+        if action is None or action == "Back to File List":
+            break
+
+        actions = {
+            "Inspect File Details": inspect_file,
+            "Convert Format": convert_image,
+            "Resize": resize_image,
+            "Rotate": rotate_image,
+            "Flip": flip_image,
+            "Crop (Visual)": crop_image,
+        }
+        if action in actions:
+            actions[action](file_path)
+
+
 def action_menu(file_path):
     """Display the menu of actions for a selected file."""
     while True:
@@ -90,7 +126,10 @@ def main_menu():
         elif choice == "Process a Single Media File":
             selected_file = select_media_file()
             if selected_file:
-                action_menu(selected_file)
+                if Path(selected_file).suffix.lower() in IMAGE_EXTENSIONS:
+                    image_action_menu(selected_file)
+                else:
+                    action_menu(selected_file)
         elif choice == "Join Multiple Videos":
             join_videos()
         elif choice == "Batch Convert All Media in Directory":
diff --git a/src/peg_this/utils/ffmpeg_utils.py b/src/peg_this/utils/ffmpeg_utils.py
@@ -37,37 +37,34 @@ def run_command(stream_spec, description="Processing...", show_progress=False):
     Runs an ffmpeg command using ffmpeg-python.
     - For simple commands, it runs directly.
     - For commands with a progress bar, it generates the ffmpeg arguments,
-      runs them as a subprocess, and parses stderr to show progress,
-      mimicking the logic from the original script for accuracy.
+      runs them as a subprocess, and parses stderr to show progress.
+    Returns True on success, False on failure.
     """
     console.print(f"[bold cyan]{description}[/bold cyan]")
     
-    # Get the full command arguments from the ffmpeg-python stream object
     args = stream_spec.get_args()
     full_command = ['ffmpeg'] + args
     logging.info(f"Executing command: {' '.join(full_command)}")
 
     if not show_progress:
         try:
             # Use ffmpeg.run() for simple, non-progress tasks. It's cleaner.
-            out, err = ffmpeg.run(stream_spec, capture_stdout=True, capture_stderr=True, quiet=True)
+            ffmpeg.run(stream_spec, capture_stdout=True, capture_stderr=True, quiet=True)
             logging.info("Command successful (no progress bar).")
-            return out.decode('utf-8')
+            return True
         except ffmpeg.Error as e:
             error_message = e.stderr.decode('utf-8')
             console.print("[bold red]An error occurred:[/bold red]")
             console.print(error_message)
             logging.error(f"ffmpeg error:{error_message}")
-            return None
+            return False
     else:
         # For the progress bar, we must run ffmpeg as a subprocess and parse stderr.
         duration = 0
         try:
-            # Find the primary input file from the command arguments to probe it.
             input_file_path = None
             for i, arg in enumerate(full_command):
                 if arg == '-i' and i + 1 < len(full_command):
-                    # This is a robust way to find the first input file.
                     input_file_path = full_command[i+1]
                     break
             
@@ -90,7 +87,6 @@ def run_command(stream_spec, description="Processing...", show_progress=False):
         ) as progress:
             task = progress.add_task(description, total=100)
             
-            # Run the command as a subprocess to capture stderr in real-time
             process = subprocess.Popen(
                 full_command,
                 stdout=subprocess.PIPE,
@@ -110,19 +106,18 @@ def run_command(stream_spec, description="Processing...", show_progress=False):
                         percent_complete = (elapsed_time / duration) * 100
                         progress.update(task, completed=min(percent_complete, 100))
                     except Exception:
-                        pass # Ignore any parsing errors
+                        pass
 
             process.wait()
             progress.update(task, completed=100)
             
             if process.returncode != 0:
-                # The error was already logged line-by-line, but we can add a final message.
                 log_file = logging.getLogger().handlers[0].baseFilename
                 console.print(f"[bold red]An error occurred during processing. Check {log_file} for details.[/bold red]")
-                return None
+                return False
         
         logging.info("Command successful (with progress bar).")
-        return "Success"
+        return True
 
 
 def has_audio_stream(file_path):
diff --git a/src/peg_this/utils/ui_utils.py b/src/peg_this/utils/ui_utils.py
@@ -16,7 +16,16 @@
 
 def get_media_files():
     """Scan the current directory for media files."""
-    media_extensions = [".mkv", ".mp4", ".avi", ".mov", ".webm", ".flv", ".wmv", ".mp3", ".flac", ".wav", ".ogg", ".gif"]
+    media_extensions = [
+        # Video
+        ".mkv", ".mp4", ".avi", ".mov", ".webm", ".flv", ".wmv", 
+        # Audio
+        ".mp3", ".flac", ".wav", ".ogg", 
+        # GIF
+        ".gif",
+        # Image
+        ".jpg", ".jpeg", ".png", ".webp", ".bmp", ".tiff"
+    ]
     files = [f for f in os.listdir('.') if os.path.isfile(f) and Path(f).suffix.lower() in media_extensions]
     return files
 
@@ -31,7 +40,7 @@ def select_media_file():
             root.withdraw()
             file_path = filedialog.askopenfilename(
                 title="Select a media file",
-                filetypes=[("Media Files", "*.mkv *.mp4 *.avi *.mov *.webm *.flv *.wmv *.mp3 *.flac *.wav *.ogg *.gif"), ("All Files", "*.*")]
+                filetypes=[("Media Files", "*.mkv *.mp4 *.avi *.mov *.webm *.flv *.wmv *.mp3 *.flac *.wav *.ogg *.gif *.jpg *.jpeg *.png *.webp *.bmp *.tiff"), ("All Files", "*.*")]
             )
             return file_path if file_path else None
         return None

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"`
`4`	`4`
`5`	`5`	`[project]`
`6`	`6`	`name = "peg_this"`
`7`		`-version = "3.0.6"`
	`7`	`+version = "4.0.0"`
`8`	`8`	`authors = [`
`9`	`9`	`{ name="Hariharen S S", email="thisishariharen@gmail.com" },`
`10`	`10`	`]`