feat(image-manipulator): redesign as Photoshop Lite with Visual Cropper, universal batch processing, and Black Obsidian Liquid Glass

This commit is contained in:
2026-10-27 11:45:04 +05:30
parent 8759183658
commit b16ede910a
10 changed files with 7221 additions and 4367 deletions
+1824 -1456
View File
File diff suppressed because it is too large Load Diff
+80 -1
View File
@@ -2,6 +2,7 @@ package main
import (
"archive/zip"
"bytes"
"encoding/base64"
"encoding/json"
"fmt"
@@ -48,6 +49,18 @@ type BatchResult struct {
Results []SingleResult `json:"results"`
}
func parseFormFloat(r *http.Request, key string, def float64) float64 {
val := r.FormValue(key)
if val == "" {
return def
}
f, err := strconv.ParseFloat(val, 64)
if err != nil {
return def
}
return f
}
func parseFormInt(r *http.Request, key string, def int) int {
val := r.FormValue(key)
if val == "" {
@@ -268,9 +281,23 @@ func cropHandler(w http.ResponseWriter, r *http.Request) {
top := parseFormInt(r, "top", 0)
right := parseFormInt(r, "right", 800)
bottom := parseFormInt(r, "bottom", 600)
leftPct := parseFormFloat(r, "left_pct", -1)
topPct := parseFormFloat(r, "top_pct", -1)
rightPct := parseFormFloat(r, "right_pct", -1)
bottomPct := parseFormFloat(r, "bottom_pct", -1)
handleProcessing(w, r, func(img image.Image, format string, idx int, filename string) (image.Image, string, float64) {
return cropImage(img, left, top, right, bottom), format, 0
bounds := img.Bounds()
l, t, rVal, b := left, top, right, bottom
if leftPct >= 0 && rightPct > leftPct && topPct >= 0 && bottomPct > topPct {
wDx := float64(bounds.Dx())
hDy := float64(bounds.Dy())
l = int(wDx * leftPct / 100.0)
rVal = int(wDx * rightPct / 100.0)
t = int(hDy * topPct / 100.0)
b = int(hDy * bottomPct / 100.0)
}
return cropImage(img, l, t, rVal, b), format, 0
})
}
@@ -430,3 +457,55 @@ func downloadAllHandler(w http.ResponseWriter, r *http.Request) {
writer.Write(imageBytes)
}
}
func adjustHandler(w http.ResponseWriter, r *http.Request) {
brightness := parseFormFloat(r, "brightness", 0)
contrast := parseFormFloat(r, "contrast", 0)
saturation := parseFormFloat(r, "saturation", 0)
gamma := parseFormFloat(r, "gamma", 1.0)
handleProcessing(w, r, func(img image.Image, format string, idx int, filename string) (image.Image, string, float64) {
return adjustColor(img, brightness, contrast, saturation, gamma), format, 0
})
}
func borderHandler(w http.ResponseWriter, r *http.Request) {
borderWidth := parseFormInt(r, "border_width", 20)
borderColor := r.FormValue("border_color")
if borderColor == "" {
borderColor = "#ffffff"
}
padAspect := r.FormValue("pad_aspect")
handleProcessing(w, r, func(img image.Image, format string, idx int, filename string) (image.Image, string, float64) {
return addBorderCanvas(img, borderWidth, borderColor, padAspect), format, 0
})
}
func roundCornersHandler(w http.ResponseWriter, r *http.Request) {
radius := parseFormInt(r, "radius", 30)
isCircle := r.FormValue("is_circle") == "true"
handleProcessing(w, r, func(img image.Image, format string, idx int, filename string) (image.Image, string, float64) {
return roundCorners(img, radius, isCircle), "PNG", 0
})
}
func stripMetadataHandler(w http.ResponseWriter, r *http.Request) {
quality := parseFormInt(r, "quality", 95)
targetFormat := strings.ToLower(r.FormValue("format"))
handleProcessing(w, r, func(img image.Image, format string, idx int, filename string) (image.Image, string, float64) {
fmtTarget := targetFormat
if fmtTarget == "" || fmtTarget == "original" {
fmtTarget = format
}
buf, finalFmt := compressLogic(img, fmtTarget, quality)
sizeKB := float64(len(buf)) / 1024.0
cleanImg, _, _ := image.Decode(bytes.NewReader(buf))
if cleanImg == nil {
cleanImg = img
}
return cleanImg, finalFmt, sizeKB
})
}
+70 -10
View File
@@ -1,6 +1,8 @@
package main
import (
"bytes"
"encoding/base64"
"encoding/json"
"fmt"
"image"
@@ -459,11 +461,25 @@ func batchProcessSessionHandler(w http.ResponseWriter, r *http.Request) {
buf, finalFmt = compressLogic(img, targetFmt, q)
}
case "crop":
l, t, r, b := 0, 0, 800, 600
if val, ok := data.Params["left"].(float64); ok { l = int(val) }
if val, ok := data.Params["top"].(float64); ok { t = int(val) }
if val, ok := data.Params["right"].(float64); ok { r = int(val) }
if val, ok := data.Params["bottom"].(float64); ok { b = int(val) }
bounds := img.Bounds()
wDx, hDy := float64(bounds.Dx()), float64(bounds.Dy())
l, t, r, b := 0, 0, bounds.Dx(), bounds.Dy()
if lp, ok := data.Params["left_pct"].(float64); ok {
rp, _ := data.Params["right_pct"].(float64)
tp, _ := data.Params["top_pct"].(float64)
bp, _ := data.Params["bottom_pct"].(float64)
if rp > lp && bp > tp {
l = int(wDx * lp / 100.0)
r = int(wDx * rp / 100.0)
t = int(hDy * tp / 100.0)
b = int(hDy * bp / 100.0)
}
} else {
if val, ok := data.Params["left"].(float64); ok { l = int(val) }
if val, ok := data.Params["top"].(float64); ok { t = int(val) }
if val, ok := data.Params["right"].(float64); ok { r = int(val) }
if val, ok := data.Params["bottom"].(float64); ok { b = int(val) }
}
processed := cropImage(img, l, t, r, b)
buf, finalFmt = compressLogic(processed, format, 95)
case "filter":
@@ -479,25 +495,69 @@ func batchProcessSessionHandler(w http.ResponseWriter, r *http.Request) {
buf, finalFmt = compressLogic(processed, format, 95)
case "watermark":
wmPath, _ := data.Params["watermark_path"].(string)
wmBase64, _ := data.Params["watermark_base64"].(string)
pos := "bottom_right"
if p, ok := data.Params["position"].(string); ok && p != "" { pos = p }
op := 50
if o, ok := data.Params["opacity"].(float64); ok { op = int(o) }
if wmPath != "" {
var wmImg image.Image
if wmBase64 != "" {
if commaIdx := strings.Index(wmBase64, ","); commaIdx != -1 {
wmBase64 = wmBase64[commaIdx+1:]
}
if decoded, err := base64.StdEncoding.DecodeString(wmBase64); err == nil {
wmImg, _, _ = image.Decode(bytes.NewReader(decoded))
}
} else if wmPath != "" {
if wmFile, err := os.Open(wmPath); err == nil {
if wmImg, _, err := image.Decode(wmFile); err == nil {
img = watermarkImage(img, wmImg, pos, op)
}
wmImg, _, _ = image.Decode(wmFile)
wmFile.Close()
}
}
if wmImg != nil {
img = watermarkImage(img, wmImg, pos, op)
}
buf, finalFmt = compressLogic(img, format, 95)
case "adjust":
brightness, contrast, saturation := 0.0, 0.0, 0.0
gamma := 1.0
if b, ok := data.Params["brightness"].(float64); ok { brightness = b }
if c, ok := data.Params["contrast"].(float64); ok { contrast = c }
if s, ok := data.Params["saturation"].(float64); ok { saturation = s }
if g, ok := data.Params["gamma"].(float64); ok && g > 0 { gamma = g }
processed := adjustColor(img, brightness, contrast, saturation, gamma)
buf, finalFmt = compressLogic(processed, format, 95)
case "border":
borderWidth := 20
if bw, ok := data.Params["border_width"].(float64); ok { borderWidth = int(bw) }
borderColor := "#ffffff"
if bc, ok := data.Params["border_color"].(string); ok && bc != "" { borderColor = bc }
padAspect := ""
if pa, ok := data.Params["pad_aspect"].(string); ok { padAspect = pa }
processed := addBorderCanvas(img, borderWidth, borderColor, padAspect)
buf, finalFmt = compressLogic(processed, format, 95)
case "round_corners":
radius := 30
if r, ok := data.Params["radius"].(float64); ok { radius = int(r) }
isCircle := false
if c, ok := data.Params["is_circle"].(bool); ok { isCircle = c }
processed := roundCorners(img, radius, isCircle)
buf, finalFmt = compressLogic(processed, "PNG", 95)
case "strip_metadata":
targetFmt := format
if f, ok := data.Params["format"].(string); ok && f != "" && f != "original" {
targetFmt = f
}
q := 95
if qval, ok := data.Params["quality"].(float64); ok { q = int(qval) }
buf, finalFmt = compressLogic(img, targetFmt, q)
default:
buf, finalFmt = compressLogic(img, format, 95)
}
relPath, _ := filepath.Rel(uploadsDir, file)
if data.Operation == "convert" || (data.Operation == "compress" && data.Params["format"] != nil && data.Params["format"] != "original" && data.Params["format"] != "") {
if data.Operation == "convert" || data.Operation == "round_corners" || (data.Operation == "compress" && data.Params["format"] != nil && data.Params["format"] != "original" && data.Params["format"] != "") {
ext := strings.ToLower(finalFmt)
if ext == "jpeg" {
ext = "jpg"
+317 -241
View File
@@ -1,263 +1,339 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>ImagePro Toolkit | Professional Image Manipulation</title>
<!-- Google Fonts -->
<link
href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&display=swap"
rel="stylesheet"
/>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<meta name="theme-color" content="#000000">
<meta name="color-scheme" content="dark">
<title>Photoshop Lite · Obsidian Liquid Studio</title>
<!-- Google Fonts: Inter & JetBrains Mono -->
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700;800&family=JetBrains+Mono:wght@400;500;600;700&display=swap" rel="stylesheet">
<!-- Font Awesome -->
<link
rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css"
/>
<link rel="stylesheet" href="/styles.css" />
</head>
</head>
<body>
<!-- Ambient lights -->
<div class="ambient-light light-1"></div>
<div class="ambient-light light-2"></div>
<div class="ambient-light light-3"></div>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
<link rel="stylesheet" href="/styles.css?v=2.5">
</head>
<body>
<!-- Ambient Obsidian Caustics -->
<div class="ambient-canvas"></div>
<!-- Sidebar -->
<div class="sidebar">
<div class="logo">
<i class="fa-solid fa-layer-group"></i>
<span>ImagePro</span>
</div>
<div class="ps-app-root">
<!-- ═══════════════════════════════════════════════════════════
TOP APPLICATION BAR & CONTEXTUAL OPTIONS STRIP
═══════════════════════════════════════════════════════════ -->
<header class="ps-app-header">
<div class="ps-header-left">
<div class="ps-brand-badge" onclick="resetWorkspace()" title="Reset workspace">
<div class="ps-logo-icon">Ps</div>
<div class="ps-brand-text">
<h1>Photoshop Lite</h1>
<span>Obsidian Studio</span>
</div>
</div>
<div class="nav-links">
<div class="section-title">Single File Tools</div>
<div class="nav-item active" data-tool="resize" onclick="switchTool('resize', this)">
<i class="fa-solid fa-ruler-combined"></i> Resize
</div>
<div class="nav-item" data-tool="convert" onclick="switchTool('convert', this)">
<i class="fa-solid fa-rotate"></i> Convert
</div>
<div class="nav-item" data-tool="compress" onclick="switchTool('compress', this)">
<i class="fa-solid fa-file-zipper"></i> Compress
</div>
<div class="nav-item" data-tool="crop" onclick="switchTool('crop', this)">
<i class="fa-solid fa-crop-simple"></i> Crop
</div>
<div class="nav-item" data-tool="filter" onclick="switchTool('filter', this)">
<i class="fa-solid fa-wand-magic-sparkles"></i> Filters
</div>
<div class="nav-item" data-tool="rotate" onclick="switchTool('rotate', this)">
<i class="fa-solid fa-arrows-rotate"></i> Rotate
</div>
<div class="nav-item" data-tool="watermark" onclick="switchTool('watermark', this)">
<i class="fa-solid fa-stamp"></i> Watermark
</div>
<div class="nav-item" data-tool="masker" onclick="switchTool('masker', this)">
<i class="fa-solid fa-mask"></i> Masker
</div>
<div class="ps-menu-divider"></div>
<div class="divider"></div>
<div class="ps-file-btns">
<button class="btn btn-secondary btn-sm" onclick="document.getElementById('file-input-multi').click()" title="Open multiple images (Ctrl+O)">
<i class="fa-solid fa-folder-open"></i> Open Files
</button>
<button class="btn btn-secondary btn-sm" onclick="document.getElementById('folder-input-tree').click()" title="Open whole folder hierarchy">
<i class="fa-solid fa-folder-tree"></i> Open Folder
</button>
<button class="btn btn-secondary btn-sm" onclick="resetWorkspace()" title="Clear workspace">
<i class="fa-solid fa-rotate-left"></i>
</button>
</div>
<div class="section-title">Batch Operations</div>
<div class="nav-item" data-tool="batch" onclick="switchTool('batch', this)">
<i class="fa-solid fa-folder-tree"></i> Batch Process
<input type="file" id="file-input-multi" multiple accept="image/*,.heic,.avif" style="display:none;" onchange="handleFileInputChange(this)">
<input type="file" id="folder-input-tree" webkitdirectory directory multiple style="display:none;" onchange="handleFileInputChange(this)">
</div>
<!-- Dynamic Contextual Options Bar (Photoshop Top Controls) -->
<div class="ps-tool-options-strip" id="ps-tool-options">
<!-- Dynamically updated by app.js depending on active tool -->
</div>
<div class="ps-header-right">
<div class="ps-counter-pill" id="ps-file-counter">
<i class="fa-regular fa-images"></i> <span>0 images</span>
</div>
<button class="btn btn-secondary btn-sm" id="btn-apply-active" onclick="executeActiveImage()" title="Execute on current image (Ctrl+Enter)">
<i class="fa-solid fa-bolt"></i> Apply Active
</button>
<button class="btn btn-sm btn-cyan" id="btn-batch-all" onclick="executeBatchAll()" style="display: none;" title="Execute active tool on all loaded files">
<i class="fa-solid fa-layer-group"></i> Batch All (0)
</button>
</div>
</header>
<!-- ═══════════════════════════════════════════════════════════
MAIN BODY: LEFT TOOL DOCK + CANVAS VIEWPORT + INSPECTOR
═══════════════════════════════════════════════════════════ -->
<div class="ps-main-body">
<!-- Left Slim Tool Dock -->
<nav class="ps-tool-dock" id="ps-dock">
<button class="ps-tool-btn active" data-tool="crop" data-tooltip="Visual Crop (C)" onclick="selectTool('crop', this)">
<i class="fa-solid fa-crop-simple"></i>
<span class="ps-tool-shortcut">C</span>
</button>
<button class="ps-tool-btn" data-tool="resize" data-tooltip="Resize & Canvas (M)" onclick="selectTool('resize', this)">
<i class="fa-solid fa-ruler-combined"></i>
<span class="ps-tool-shortcut">M</span>
</button>
<button class="ps-tool-btn" data-tool="rotate" data-tooltip="Rotate & Straighten (R)" onclick="selectTool('rotate', this)">
<i class="fa-solid fa-arrows-rotate"></i>
<span class="ps-tool-shortcut">R</span>
</button>
<button class="ps-tool-btn" data-tool="adjust" data-tooltip="Color Grading (A)" onclick="selectTool('adjust', this)">
<i class="fa-solid fa-sliders"></i>
<span class="ps-tool-shortcut">A</span>
</button>
<button class="ps-tool-btn" data-tool="filter" data-tooltip="Artistic Filters (F)" onclick="selectTool('filter', this)">
<i class="fa-solid fa-wand-magic-sparkles"></i>
<span class="ps-tool-shortcut">F</span>
</button>
<button class="ps-tool-btn" data-tool="round_corners" data-tooltip="Round / Avatar (O)" onclick="selectTool('round_corners', this)">
<i class="fa-solid fa-circle-notch"></i>
<span class="ps-tool-shortcut">O</span>
</button>
<button class="ps-tool-btn" data-tool="border" data-tooltip="Border & Canvas (D)" onclick="selectTool('border', this)">
<i class="fa-regular fa-square"></i>
<span class="ps-tool-shortcut">D</span>
</button>
<button class="ps-tool-btn" data-tool="watermark" data-tooltip="Watermark Stamp (T)" onclick="selectTool('watermark', this)">
<i class="fa-solid fa-stamp"></i>
<span class="ps-tool-shortcut">T</span>
</button>
<button class="ps-tool-btn" data-tool="masker" data-tooltip="Inpaint Mask Brush (B)" onclick="selectTool('masker', this)">
<i class="fa-solid fa-paintbrush"></i>
<span class="ps-tool-shortcut">B</span>
</button>
<div class="ps-dock-divider"></div>
<button class="ps-tool-btn" data-tool="convert" data-tooltip="Transcode / Export (E)" onclick="selectTool('convert', this)">
<i class="fa-solid fa-repeat"></i>
<span class="ps-tool-shortcut">E</span>
</button>
<button class="ps-tool-btn" data-tool="compress" data-tooltip="Optimize Compress (Z)" onclick="selectTool('compress', this)">
<i class="fa-solid fa-file-zipper"></i>
<span class="ps-tool-shortcut">Z</span>
</button>
<button class="ps-tool-btn" data-tool="strip_metadata" data-tooltip="EXIF Privacy Strip (S)" onclick="selectTool('strip_metadata', this)">
<i class="fa-solid fa-shield-halved"></i>
<span class="ps-tool-shortcut">S</span>
</button>
</nav>
<!-- Center Stage: Viewport Canvas -->
<main class="ps-workspace" id="ps-workspace">
<div class="ps-viewport" id="ps-viewport">
<!-- Empty State Dropzone -->
<div class="ps-dropzone-empty" id="ps-empty-dropzone" onclick="document.getElementById('file-input-multi').click()">
<div class="ps-dropzone-icon">
<i class="fa-solid fa-cloud-arrow-up"></i>
</div>
<h2>Drop Images or Folders Here</h2>
<p>High-throughput local processing · Zero telemetry · Real-time proxy chunking</p>
<div class="ps-dropzone-actions" onclick="event.stopPropagation()">
<button class="btn btn-secondary" onclick="document.getElementById('file-input-multi').click()">
<i class="fa-solid fa-images"></i> Select Multiple Files
</button>
<button class="btn btn-secondary" onclick="document.getElementById('folder-input-tree').click()">
<i class="fa-solid fa-folder-tree"></i> Select Folder Tree
</button>
</div>
</div>
<!-- Active Image Stage (Populated when image is selected) -->
<div class="ps-stage-container" id="ps-stage-container" style="display: none;">
<img id="ps-active-img" class="ps-active-img" alt="Stage Image">
<!-- Visual Interactive Cropper Layer -->
<div class="ps-crop-overlay" id="ps-crop-overlay" style="display: none;">
<div class="crop-scrim crop-scrim-top" id="crop-scrim-t"></div>
<div class="crop-scrim crop-scrim-bottom" id="crop-scrim-b"></div>
<div class="crop-scrim crop-scrim-left" id="crop-scrim-l"></div>
<div class="crop-scrim crop-scrim-right" id="crop-scrim-r"></div>
<div class="crop-box" id="crop-box">
<div class="crop-dim-badge" id="crop-dim-badge">0 × 0 px</div>
<div class="crop-grid">
<div class="crop-grid-h1"></div>
<div class="crop-grid-h2"></div>
<div class="crop-grid-v1"></div>
<div class="crop-grid-v2"></div>
</div>
<div class="crop-handle crop-handle-nw" data-handle="nw"></div>
<div class="crop-handle crop-handle-n" data-handle="n"></div>
<div class="crop-handle crop-handle-ne" data-handle="ne"></div>
<div class="crop-handle crop-handle-e" data-handle="e"></div>
<div class="crop-handle crop-handle-se" data-handle="se"></div>
<div class="crop-handle crop-handle-s" data-handle="s"></div>
<div class="crop-handle crop-handle-sw" data-handle="sw"></div>
<div class="crop-handle crop-handle-w" data-handle="w"></div>
</div>
</div>
<!-- Mask Painting Canvas Layer -->
<canvas class="ps-mask-canvas" id="ps-mask-canvas" style="display: none;"></canvas>
</div>
<!-- Viewport HUD: Zoom & Fit -->
<div class="ps-viewport-hud" id="ps-viewport-hud">
<button class="ps-hud-btn" onclick="zoomViewport(-0.15)" title="Zoom Out (-)"><i class="fa-solid fa-minus"></i></button>
<span class="ps-hud-val" id="ps-zoom-val">100%</span>
<button class="ps-hud-btn" onclick="zoomViewport(0.15)" title="Zoom In (+)"><i class="fa-solid fa-plus"></i></button>
<button class="ps-hud-btn" onclick="resetZoom()" title="Fit Screen (Ctrl+0)"><i class="fa-solid fa-expand"></i></button>
<button class="ps-hud-btn" onclick="actualSizeZoom()" title="100% Actual Size"><i class="fa-solid fa-compress"></i></button>
</div>
</div>
<!-- Bottom Filmstrip / Queue Tray -->
<div class="ps-filmstrip" id="ps-filmstrip" style="display: none;">
<div class="ps-filmstrip-left">
<button class="btn btn-secondary btn-sm" onclick="document.getElementById('file-input-multi').click()" title="Add more images">
<i class="fa-solid fa-plus"></i> Add
</button>
<button class="btn btn-secondary btn-sm" onclick="resetWorkspace()" title="Clear all loaded images">
<i class="fa-solid fa-trash-can"></i>
</button>
</div>
<div class="ps-filmstrip-scroll" id="ps-filmstrip-tray">
<!-- Populated by app.js -->
</div>
</div>
</main>
<!-- Right Inspector Panel (Properties & Batch Hub) -->
<aside class="ps-inspector">
<div class="ps-inspector-tabs">
<div class="ps-inspector-tab active" data-tab="controls" onclick="switchInspectorTab('controls', this)">
<i class="fa-solid fa-sliders"></i> Tool Controls
</div>
<div class="ps-inspector-tab" data-tab="info" onclick="switchInspectorTab('info', this)">
<i class="fa-solid fa-circle-info"></i> Image Info
</div>
<div class="ps-inspector-tab" data-tab="batch" onclick="switchInspectorTab('batch', this)">
<i class="fa-solid fa-layer-group"></i> Batch Hub
</div>
</div>
<div class="ps-inspector-content">
<!-- Tab 1: Tool Parameters -->
<div id="inspector-tab-controls">
<!-- Populated dynamically depending on active tool -->
</div>
<!-- Tab 2: Image Info -->
<div id="inspector-tab-info" style="display: none;">
<div class="ps-section-title">Active Image Specs</div>
<div style="display: flex; flex-direction: column; gap: 10px; font-size: 12px; margin-top: 10px;">
<div style="display: flex; justify-content: space-between; padding: 6px 10px; background: var(--bg-input); border-radius: var(--r-sm);">
<span style="color: var(--text-3);">File Name</span>
<span id="info-filename" style="font-family: var(--font-mono); font-weight: 600; color: #fff; max-width: 170px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">--</span>
</div>
<div style="display: flex; justify-content: space-between; padding: 6px 10px; background: var(--bg-input); border-radius: var(--r-sm);">
<span style="color: var(--text-3);">Resolution</span>
<span id="info-dimensions" style="font-family: var(--font-mono); font-weight: 600; color: var(--accent-cyan);">--</span>
</div>
<div style="display: flex; justify-content: space-between; padding: 6px 10px; background: var(--bg-input); border-radius: var(--r-sm);">
<span style="color: var(--text-3);">Aspect Ratio</span>
<span id="info-aspect" style="font-family: var(--font-mono); font-weight: 600; color: #fff;">--</span>
</div>
<div style="display: flex; justify-content: space-between; padding: 6px 10px; background: var(--bg-input); border-radius: var(--r-sm);">
<span style="color: var(--text-3);">File Size</span>
<span id="info-filesize" style="font-family: var(--font-mono); font-weight: 600; color: #fff;">--</span>
</div>
<div style="display: flex; justify-content: space-between; padding: 6px 10px; background: var(--bg-input); border-radius: var(--r-sm);">
<span style="color: var(--text-3);">MIME Type</span>
<span id="info-mimetype" style="font-family: var(--font-mono); font-weight: 600; color: #fff;">--</span>
</div>
</div>
</div>
<!-- Tab 3: Batch Hub -->
<div id="inspector-tab-batch" style="display: none;">
<div class="ps-section-title">Queue & Proxy Status</div>
<div style="background: var(--bg-input); border: 1px solid var(--border-1); border-radius: var(--r-md); padding: 14px; margin-top: 10px; font-size: 12px; display: flex; flex-direction: column; gap: 8px;">
<div style="display: flex; justify-content: space-between;">
<span style="color: var(--text-3);">Queued Images:</span>
<span id="batch-hub-count" style="font-weight: 700; color: var(--primary);">0</span>
</div>
<div style="display: flex; justify-content: space-between;">
<span style="color: var(--text-3);">Total Size:</span>
<span id="batch-hub-size" style="font-weight: 700; font-family: var(--font-mono); color: #fff;">0 MB</span>
</div>
<div style="display: flex; justify-content: space-between;">
<span style="color: var(--text-3);">Proxy Chunk Size:</span>
<span style="font-weight: 600; font-family: var(--font-mono); color: var(--accent-cyan);">8 MB / 15 files</span>
</div>
<div style="display: flex; justify-content: space-between;">
<span style="color: var(--text-3);">Retry Strategy:</span>
<span style="font-weight: 600; color: var(--accent-emerald);">3-Attempt Backoff</span>
</div>
</div>
<div style="margin-top: 16px;">
<button class="btn btn-cyan" style="width: 100%;" onclick="executeBatchAll()">
<i class="fa-solid fa-play"></i> Process All Queued Files
</button>
</div>
</div>
</div>
<!-- Inspector Action Footer -->
<div class="ps-action-footer">
<button class="btn" style="width: 100%;" onclick="executeActiveImage()">
<i class="fa-solid fa-bolt"></i> Apply to Active Image
</button>
<button class="btn btn-secondary btn-sm" id="btn-batch-footer" style="width: 100%; display: none;" onclick="executeBatchAll()">
<i class="fa-solid fa-layer-group"></i> Apply to All (0 Files)
</button>
</div>
</aside>
</div>
</div>
</div>
<!-- Main Content -->
<div class="main-content">
<!-- Header -->
<div class="header">
<div class="page-title">
<h2 id="tool-title">Resize Images</h2>
<p id="tool-desc">
Change image dimensions while maintaining quality.
</p>
</div>
</div>
<!-- Live Brush Cursor Indicator -->
<div id="brush-cursor-ring"></div>
<!-- Single File Tools (Generic Wrapper) -->
<div id="single-tool-wrapper">
<div class="upload-area" id="drop-zone" onclick="triggerFileInput()">
<div id="upload-content">
<div class="upload-icon">
<i class="fa-solid fa-cloud-arrow-up"></i>
<!-- Batch Processing Modal Dialog -->
<div class="ps-modal-backdrop" id="batch-modal" style="display: none;">
<div class="ps-modal-card">
<div class="ps-progress-header">
<h3><i class="fa-solid fa-bolt" style="color: var(--primary);"></i> Processing Batch</h3>
<span class="ps-progress-pct" id="batch-modal-pct">0%</span>
</div>
<h3>Drag & Drop images here</h3>
<p style="color: var(--text-secondary); margin-top: 8px">
or click to browse from computer
</p>
<div style="margin-top: 16px; font-size: 0.8rem; color: #64748b">
Supported: PNG, JPG, WEBP, HEIC, BMP, TIFF, ICO
<div class="ps-progress-track">
<div class="ps-progress-fill" id="batch-modal-fill"></div>
</div>
</div>
</div>
<input
type="file"
id="file-input"
multiple
accept="image/*,.heic"
style="display: none"
onchange="handleFileSelect(this)"
/>
<!-- Dynamic Controls Section -->
<div class="controls-panel" id="controls-area">
<!-- Injected via JS based on selected tool -->
</div>
<button class="btn" onclick="executeProcess()">
<i class="fa-solid fa-bolt"></i> Process Images
</button>
<div
class="results-grid"
id="results-area"
style="margin-top: 40px"
></div>
</div>
<!-- Batch Tool View -->
<div id="batch-view" class="tool-view">
<div class="controls-panel">
<div class="input-group">
<label
><i class="fa-solid fa-cloud-upload"></i> Upload Images for Batch
Processing</label
>
<input
type="file"
id="batch-files"
multiple
accept="image/*"
hidden
/>
<input
type="file"
id="batch-folder"
webkitdirectory
directory
multiple
hidden
/>
<div style="display: flex; gap: 10px; margin: 10px 0">
<button
class="btn"
onclick="document.getElementById('batch-files').click()"
style="flex: 1"
>
<i class="fa-solid fa-images"></i> Select Files
</button>
<button
class="btn"
onclick="document.getElementById('batch-folder').click()"
style="flex: 1"
>
<i class="fa-solid fa-folder-open"></i> Select Folder
</button>
<div class="ps-progress-stats">
<span id="batch-modal-status">Preparing files...</span>
<span class="ps-progress-speed" id="batch-modal-speed">0.0 MB/s</span>
</div>
<div
id="batchUploadZone"
style="
min-height: 80px;
border: 2px dashed var(--border);
border-radius: 12px;
padding: 20px;
text-align: center;
background: rgba(255, 255, 255, 0.03);
"
>
<i
class="fa-solid fa-cloud-upload-alt"
style="font-size: 2em; color: var(--primary)"
></i>
<div
style="
color: var(--text-secondary);
font-size: 0.85em;
margin-top: 8px;
"
>
Or drag & drop files/folders here
</div>
<div
id="batchFileInfo"
style="
margin-top: 10px;
color: var(--primary);
font-weight: 500;
"
></div>
<div class="ps-console-box" id="batch-modal-console">
<div class="ps-console-line">> Initializing Obsidian batch engine...</div>
</div>
<p style="font-size: 0.8rem; color: #64748b; margin-top: 8px">
Files will be uploaded and processed. Results will download as a
ZIP file.
</p>
</div>
<div class="grid-2">
<div class="input-group">
<label>Operation</label>
<select id="batch-operation" onchange="updateBatchControls()">
<option value="resize">Resize</option>
<option value="convert">Convert</option>
<option value="compress">Compress</option>
<option value="crop">Crop</option>
<option value="filter">Filter</option>
<option value="rotate">Rotate</option>
<option value="watermark">Watermark</option>
</select>
<div style="display: flex; justify-content: flex-end; gap: 10px; margin-top: 6px;">
<button class="btn btn-secondary btn-sm" id="btn-modal-close" onclick="closeBatchModal()" style="display: none;">
Close
</button>
</div>
</div>
<!-- Dynamic Batch Params -->
<div id="batch-params"></div>
<div
style="
display: grid;
grid-template-columns: 1fr 2fr;
gap: 12px;
margin-top: 20px;
"
>
<button class="btn outline" onclick="previewBatch()">
<i class="fa-solid fa-eye"></i> Preview Files
</button>
<button class="btn" onclick="executeBatch()">
<i class="fa-solid fa-play"></i> Start Batch Processing
</button>
</div>
</div>
<div class="console" id="batch-console">
<div class="console-line">> Ready to process...</div>
</div>
<!-- Progress Bar -->
<div id="batch-progress-container" style="display: none; margin-top: 12px; padding: 16px; background: rgba(15, 23, 42, 0.8); border: 1px solid var(--border); border-radius: 10px;">
<div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 8px;">
<span id="batch-progress-label" style="color: var(--text-main); font-weight: 600; font-size: 0.95rem;">Processing...</span>
<span id="batch-progress-percent" style="color: var(--primary); font-weight: 700; font-size: 1.1rem;">0%</span>
</div>
<div style="width: 100%; height: 10px; background: rgba(100,116,139,0.2); border-radius: 5px; overflow: hidden;">
<div id="batch-progress-bar" style="height: 100%; width: 0%; background: linear-gradient(90deg, var(--primary), var(--secondary)); border-radius: 5px; transition: width 0.3s ease;"></div>
</div>
<div id="batch-progress-detail" style="color: var(--text-secondary); font-size: 0.85rem; margin-top: 8px;"></div>
</div>
</div>
</div>
<!-- Loading Overlay -->
<div class="loader" id="loader">
<div class="spinner"></div>
<h3 style="color: white">Processing...</h3>
</div>
<!-- Toast Container -->
<!-- Toast Notifications -->
<div class="toast-container" id="toast-container"></div>
<script src="/app.js" defer></script>
</body>
</html>
<script src="/app.js?v=2.5" defer></script>
</body>
</html>
+7
View File
@@ -96,6 +96,7 @@ func main() {
r.Get("/", indexHandler)
r.Get("/styles.css", func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "text/css; charset=utf-8")
w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
for _, p := range []string{
"cmd/image-manipulator/styles.css",
"web/image-manipulator/styles.css",
@@ -109,6 +110,7 @@ func main() {
})
r.Get("/app.js", func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/javascript; charset=utf-8")
w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
for _, p := range []string{
"cmd/image-manipulator/app.js",
"web/image-manipulator/app.js",
@@ -133,6 +135,10 @@ func main() {
r.Post("/rotate", rotateHandler)
r.Post("/watermark", watermarkHandler)
r.Post("/mask", maskHandler)
r.Post("/adjust", adjustHandler)
r.Post("/border", borderHandler)
r.Post("/round-corners", roundCornersHandler)
r.Post("/strip-metadata", stripMetadataHandler)
r.Post("/download-all", downloadAllHandler)
r.Post("/create-session", createSessionHandler)
@@ -172,6 +178,7 @@ func main() {
func indexHandler(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "text/html; charset=utf-8")
w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
for _, p := range []string{
"web/image-manipulator/index.html",
"cmd/image-manipulator/index.html",
+184 -4
View File
@@ -9,6 +9,7 @@ import (
"image/gif"
"image/jpeg"
"image/png"
"math"
"os"
"os/exec"
"strconv"
@@ -45,9 +46,9 @@ func resizeImage(img image.Image, width, height int, maintainAspect bool) image.
}
func filterImage(img image.Image, filterType string) image.Image {
switch filterType {
switch strings.ToUpper(filterType) {
case "BLUR":
return imaging.Blur(img, 2.0)
return imaging.Blur(img, 2.5)
case "SHARPEN":
return imaging.Sharpen(img, 2.0)
case "GRAYSCALE":
@@ -57,24 +58,203 @@ func filterImage(img image.Image, filterType string) image.Image {
case "SEPIA":
gray := imaging.Grayscale(img)
return imaging.AdjustSaturation(imaging.AdjustSigmoid(gray, 0.5, 3.0), 50)
case "EMBOSS":
kernel := [9]float64{
-2, -1, 0,
-1, 1, 1,
0, 1, 2,
}
return imaging.Convolve3x3(img, kernel, nil)
case "CONTOUR", "EDGE_ENHANCE":
kernel := [9]float64{
-1, -1, -1,
-1, 8, -1,
-1, -1, -1,
}
return imaging.Convolve3x3(img, kernel, nil)
case "WARM":
return imaging.AdjustFunc(img, func(c color.NRGBA) color.NRGBA {
r := int(c.R) + 25
b := int(c.B) - 15
if r > 255 { r = 255 }
if b < 0 { b = 0 }
return color.NRGBA{R: uint8(r), G: c.G, B: uint8(b), A: c.A}
})
case "COOL":
return imaging.AdjustFunc(img, func(c color.NRGBA) color.NRGBA {
r := int(c.R) - 15
b := int(c.B) + 30
if r < 0 { r = 0 }
if b > 255 { b = 255 }
return color.NRGBA{R: uint8(r), G: c.G, B: uint8(b), A: c.A}
})
case "VINTAGE":
sepia := imaging.AdjustSaturation(imaging.AdjustSigmoid(imaging.Grayscale(img), 0.5, 2.5), 35)
return imaging.AdjustContrast(sepia, 15)
default:
return img
}
}
func parseHexColor(hexStr string) color.NRGBA {
hexStr = strings.TrimPrefix(strings.TrimSpace(hexStr), "#")
if len(hexStr) == 3 {
hexStr = string([]byte{hexStr[0], hexStr[0], hexStr[1], hexStr[1], hexStr[2], hexStr[2]})
}
if len(hexStr) == 6 {
val, err := strconv.ParseUint(hexStr, 16, 32)
if err == nil {
return color.NRGBA{
R: uint8(val >> 16),
G: uint8((val >> 8) & 0xFF),
B: uint8(val & 0xFF),
A: 255,
}
}
} else if len(hexStr) == 8 {
val, err := strconv.ParseUint(hexStr, 16, 32)
if err == nil {
return color.NRGBA{
R: uint8(val >> 24),
G: uint8((val >> 16) & 0xFF),
B: uint8((val >> 8) & 0xFF),
A: uint8(val & 0xFF),
}
}
}
return color.NRGBA{0, 0, 0, 255}
}
func adjustColor(img image.Image, brightness, contrast, saturation, gamma float64) image.Image {
res := img
if brightness != 0 {
res = imaging.AdjustBrightness(res, brightness)
}
if contrast != 0 {
res = imaging.AdjustContrast(res, contrast)
}
if saturation != 0 {
res = imaging.AdjustSaturation(res, saturation)
}
if gamma > 0 && gamma != 1.0 {
res = imaging.AdjustGamma(res, gamma)
}
return res
}
func roundCorners(img image.Image, radius int, isCircle bool) image.Image {
bounds := img.Bounds()
w, h := bounds.Dx(), bounds.Dy()
if isCircle {
radius = w / 2
if h/2 < radius {
radius = h / 2
}
}
if radius <= 0 {
return img
}
dst := image.NewNRGBA(image.Rect(0, 0, w, h))
rSq := float64(radius * radius)
innerRSq := float64((radius - 1) * (radius - 1))
for y := 0; y < h; y++ {
for x := 0; x < w; x++ {
c := color.NRGBAModel.Convert(img.At(bounds.Min.X+x, bounds.Min.Y+y)).(color.NRGBA)
var dx, dy float64
inCorner := false
if x < radius && y < radius {
dx, dy = float64(radius-x), float64(radius-y)
inCorner = true
} else if x >= w-radius && y < radius {
dx, dy = float64(x-(w-radius-1)), float64(radius-y)
inCorner = true
} else if x < radius && y >= h-radius {
dx, dy = float64(radius-x), float64(y-(h-radius-1))
inCorner = true
} else if x >= w-radius && y >= h-radius {
dx, dy = float64(x-(w-radius-1)), float64(y-(h-radius-1))
inCorner = true
}
if inCorner {
distSq := dx*dx + dy*dy
if distSq > rSq {
c.A = 0
} else if distSq > innerRSq {
dist := math.Sqrt(distSq)
factor := float64(radius) - dist
if factor < 0 {
factor = 0
} else if factor > 1 {
factor = 1
}
c.A = uint8(float64(c.A) * factor)
}
}
dst.SetNRGBA(x, y, c)
}
}
return dst
}
func addBorderCanvas(img image.Image, borderWidth int, borderColorHex string, padAspect string) image.Image {
bounds := img.Bounds()
w, h := bounds.Dx(), bounds.Dy()
borderColor := parseHexColor(borderColorHex)
newW := w + borderWidth*2
newH := h + borderWidth*2
if padAspect != "" && padAspect != "none" {
var targetRatio float64
switch padAspect {
case "1:1":
targetRatio = 1.0
case "16:9":
targetRatio = 16.0 / 9.0
case "9:16":
targetRatio = 9.0 / 16.0
case "4:5":
targetRatio = 4.0 / 5.0
case "4:3":
targetRatio = 4.0 / 3.0
}
if targetRatio > 0 {
curRatio := float64(newW) / float64(newH)
if curRatio < targetRatio {
newW = int(float64(newH) * targetRatio)
} else if curRatio > targetRatio {
newH = int(float64(newW) / targetRatio)
}
}
}
canvas := imaging.New(newW, newH, borderColor)
posX := (newW - w) / 2
posY := (newH - h) / 2
return imaging.Paste(canvas, img, image.Pt(posX, posY))
}
func rotateImage(img image.Image, op string) image.Image {
switch op {
case "90":
return imaging.Rotate270(img) // Python's -90 is Rotate270
return imaging.Rotate270(img) // Clockwise 90
case "180":
return imaging.Rotate180(img)
case "270":
return imaging.Rotate90(img) // Python's 90 is Rotate90
return imaging.Rotate90(img) // Clockwise 270
case "FLIP_H":
return imaging.FlipH(img)
case "FLIP_V":
return imaging.FlipV(img)
default:
if angle, err := strconv.ParseFloat(op, 64); err == nil {
return imaging.Rotate(img, -angle, color.Transparent)
}
return img
}
}
File diff suppressed because it is too large Load Diff