diff --git a/packages/kbot/dist-in/commands/images.js b/packages/kbot/dist-in/commands/images.js index 83fa6cce..52be9a0f 100644 --- a/packages/kbot/dist-in/commands/images.js +++ b/packages/kbot/dist-in/commands/images.js @@ -12,6 +12,49 @@ import { getLogger } from '../index.js'; import { prompt as resolvePrompt } from '../prompt.js'; import { spawn } from 'node:child_process'; import { loadConfig } from '../config.js'; +function generateUniqueFilename(dst, genFiles) { + let dstDir; + if (dst) { + const absoluteDst = path.resolve(dst); + const dstStat = exists(absoluteDst) ? statSync(absoluteDst) : null; + if (dstStat && dstStat.isDirectory()) { + dstDir = absoluteDst; + } + else { + dstDir = path.dirname(absoluteDst); + } + } + else if (genFiles.length > 0) { + dstDir = path.dirname(genFiles[0]); + } + else { + dstDir = process.cwd(); // fallback to current working dir + } + let baseFileName; + let i = 0; + if (genFiles.length > 0) { + const originalBaseName = path.basename(genFiles[0], path.extname(genFiles[0])); + const match = originalBaseName.match(/_gen_(\d+)$/); + if (match && match.index) { + baseFileName = originalBaseName.substring(0, match.index); + i = parseInt(match[1], 10) + 1; + } + else { + baseFileName = originalBaseName; + } + } + else { + baseFileName = 'generated'; + } + let newFileName; + let finalDstPath; + do { + newFileName = `${baseFileName}_gen_${i}.png`; + finalDstPath = path.resolve(dstDir, newFileName); + i++; + } while (exists(finalDstPath)); + return finalDstPath; +} function getGuiAppPath() { // Get the directory of this script file, then navigate to the GUI app const scriptDir = path.dirname(new URL(import.meta.url).pathname); @@ -190,37 +233,9 @@ async function launchGuiAndGetPrompt(argv) { try { const genPrompt = message.prompt; const genFiles = message.files || []; - // --- New logic for destination path --- - let dstDir; - if (argv.dst) { - const absoluteDst = path.resolve(argv.dst); - const dstStat = exists(absoluteDst) ? statSync(absoluteDst) : null; - if (dstStat && dstStat.isDirectory()) { - dstDir = absoluteDst; - } - else { - dstDir = path.dirname(absoluteDst); - } - } - else if (genFiles.length > 0) { - dstDir = path.dirname(genFiles[0]); - } - else { - dstDir = process.cwd(); // fallback to current working dir - } - const baseFileName = genFiles.length > 0 - ? path.basename(genFiles[0], path.extname(genFiles[0])) - : 'generated'; - let i = 0; - let newFileName; - let finalDstPath; - do { - newFileName = `${baseFileName}_gen_${i}.png`; - finalDstPath = path.resolve(dstDir, newFileName); - i++; - } while (exists(finalDstPath)); + const genDst = message.dst; + const finalDstPath = generateUniqueFilename(genDst, genFiles); logger.info(`📝 Determined destination path for generated image: ${finalDstPath}`); - // --- End new logic --- logger.info(`🎨 Starting image generation: "${genPrompt}"`); let imageBuffer = null; if (genFiles.length > 0) { @@ -387,4 +402,4 @@ export const imageCommand = async (argv) => { logger.error('Failed to parse options or generate image:', error.message, error.issues, error.stack); } }; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"images.js","sourceRoot":"","sources":["../../src/commands/images.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"images.js","sourceRoot":"","sources":["../../src/commands/images.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/kbot/dist/win-64/tauri-app.exe b/packages/kbot/dist/win-64/tauri-app.exe index d4eb472a..9ea88ed5 100644 Binary files a/packages/kbot/dist/win-64/tauri-app.exe and b/packages/kbot/dist/win-64/tauri-app.exe differ diff --git a/packages/kbot/gui/tauri-app/src/App.tsx b/packages/kbot/gui/tauri-app/src/App.tsx index 00967b76..5cc45651 100644 --- a/packages/kbot/gui/tauri-app/src/App.tsx +++ b/packages/kbot/gui/tauri-app/src/App.tsx @@ -28,6 +28,7 @@ function App() { const [ipcInitialized, setIpcInitialized] = useState(false); const [messageToSend, setMessageToSend] = useState(""); const [generationTimeoutId, setGenerationTimeoutId] = useState(null); + const [currentIndex, setCurrentIndex] = useState(0); const deleteFilePermanently = async (pathToDelete: string) => { addDebugMessage('info', `Requesting deletion of file: ${pathToDelete}`); @@ -127,19 +128,30 @@ function App() { const addFiles = async (newPaths: string[]) => { const uniqueNewPaths = newPaths.filter(newPath => !files.some(f => f.path === newPath)); - const newImageFiles: ImageFile[] = []; + if (uniqueNewPaths.length === 0) { + return; + } + + // Update destination directory + const firstPath = uniqueNewPaths[0]; + const lastSeparatorIndex = Math.max(firstPath.lastIndexOf('/'), firstPath.lastIndexOf('\\')); + const newDir = firstPath.substring(0, lastSeparatorIndex); + const currentFilename = dst.split(/[/\\]/).pop() || generateDefaultDst(1, firstPath); + const newDst = `${newDir}${firstPath.includes('\\') ? '\\' : '/'}${currentFilename}`; + setDst(newDst); + + // Read files + const newImageFiles: ImageFile[] = []; for (const path of uniqueNewPaths) { try { const buffer = await tauriApi.fs.readFile(path); - const base64 = arrayBufferToBase64(Array.from(buffer)); const mimeType = path.toLowerCase().endsWith('.png') ? 'image/png' : path.toLowerCase().endsWith('.jpg') || path.toLowerCase().endsWith('.jpeg') ? 'image/jpeg' : 'image/png'; const src = `data:${mimeType};base64,${base64}`; - - newImageFiles.push({ path, src }); + newImageFiles.push({ path, src, selected: false, isGenerated: false }); } catch (e) { const errorMessage = e instanceof Error ? e.message : JSON.stringify(e); console.error(`Failed to read file: ${path}`, e); @@ -147,7 +159,20 @@ function App() { } } - setFiles(prevFiles => [...prevFiles, ...newImageFiles]); + const lastPath = uniqueNewPaths[uniqueNewPaths.length - 1]; + + setFiles(prevFiles => { + const combinedFiles = [...prevFiles, ...newImageFiles]; + const newIndex = combinedFiles.findIndex(f => f.path === lastPath); + if (newIndex !== -1) { + setCurrentIndex(newIndex); + } + + return combinedFiles.map(file => ({ + ...file, + selected: file.path === lastPath + })); + }); }; const removeFile = (pathToRemove: string) => { @@ -159,7 +184,7 @@ function App() { }; const handleImageSelection = (imagePath: string, isMultiSelect: boolean) => { - setFiles(prev => + setFiles(prev => prev.map(file => { if (file.path === imagePath) { // For multi-select, toggle the current state. For single-select, always select it. @@ -490,6 +515,8 @@ function App() { onImageDelete={deleteFilePermanently} onImageSaveAs={saveImageAs} addFiles={addFiles} + currentIndex={currentIndex} + setCurrentIndex={setCurrentIndex} /> {/* Debug Panel */} diff --git a/packages/kbot/gui/tauri-app/src/components/ImageGallery.tsx b/packages/kbot/gui/tauri-app/src/components/ImageGallery.tsx index 48e1870d..5bf1e287 100644 --- a/packages/kbot/gui/tauri-app/src/components/ImageGallery.tsx +++ b/packages/kbot/gui/tauri-app/src/components/ImageGallery.tsx @@ -8,6 +8,8 @@ interface ImageGalleryProps { onImageDelete?: (imagePath: string) => void; onImageSaveAs?: (imagePath: string) => void; showSelection?: boolean; + currentIndex: number; + setCurrentIndex: (index: number) => void; } export default function ImageGallery({ @@ -16,9 +18,10 @@ export default function ImageGallery({ onImageRemove, onImageDelete, onImageSaveAs, - showSelection = false + showSelection = false, + currentIndex, + setCurrentIndex }: ImageGalleryProps) { - const [currentIndex, setCurrentIndex] = useState(0); const [lightboxOpen, setLightboxOpen] = useState(false); const [lightboxLoaded, setLightboxLoaded] = useState(false); @@ -27,7 +30,7 @@ export default function ImageGallery({ if (images.length > 0 && currentIndex >= images.length) { setCurrentIndex(Math.max(0, images.length - 1)); } - }, [images.length, currentIndex]); + }, [images.length, currentIndex, setCurrentIndex]); // ESC key handler for lightbox useEffect(() => { @@ -51,7 +54,7 @@ export default function ImageGallery({ document.addEventListener('keydown', handleKeyDown); return () => document.removeEventListener('keydown', handleKeyDown); } - }, [lightboxOpen, currentIndex, images.length]); + }, [lightboxOpen, currentIndex, images.length, setCurrentIndex]); const preloadImage = (index: number) => { if (images.length === 0 || index < 0 || index >= images.length) return; diff --git a/packages/kbot/gui/tauri-app/src/components/PromptForm.tsx b/packages/kbot/gui/tauri-app/src/components/PromptForm.tsx index fcbeea0d..92afdee9 100644 --- a/packages/kbot/gui/tauri-app/src/components/PromptForm.tsx +++ b/packages/kbot/gui/tauri-app/src/components/PromptForm.tsx @@ -22,6 +22,8 @@ interface PromptFormProps { onImageDelete?: (path: string) => void; onImageSaveAs?: (path: string) => void; addFiles: (paths: string[]) => void; + currentIndex: number; + setCurrentIndex: (index: number) => void; } const PromptForm: React.FC = ({ @@ -42,7 +44,9 @@ const PromptForm: React.FC = ({ addImageFromUrl, onImageDelete, onImageSaveAs, - addFiles + addFiles, + currentIndex, + setCurrentIndex }) => { const selectedCount = getSelectedImages().length; const { ref: dropZoneRef, dragIn } = useDropZone({ onDrop: addFiles }); @@ -67,6 +71,12 @@ const PromptForm: React.FC = ({ placeholder="Describe the image you want to generate or edit..." className="w-full glass-input p-4 rounded-xl min-h-[120px] resize-none" rows={4} + onKeyDown={(e) => { + if (e.key === 'Enter' && (e.ctrlKey || e.metaKey)) { + e.preventDefault(); + submit(); + } + }} /> @@ -152,6 +162,8 @@ const PromptForm: React.FC = ({ onImageSaveAs={onImageSaveAs} showSelection={true} onImageDelete={onImageDelete} + currentIndex={currentIndex} + setCurrentIndex={setCurrentIndex} /> diff --git a/packages/kbot/gui/tauri-app/src/hooks/useDropZone.ts b/packages/kbot/gui/tauri-app/src/hooks/useDropZone.ts index 3472d4ae..df5070c2 100644 --- a/packages/kbot/gui/tauri-app/src/hooks/useDropZone.ts +++ b/packages/kbot/gui/tauri-app/src/hooks/useDropZone.ts @@ -15,7 +15,8 @@ const useDropZone = ({ onDrop }: { onDrop: (paths: string[]) => void }) => { useEffect(() => { const unlisten = listen("tauri://drag-drop", (e) => { const { x, y } = e.payload.position; - if (document.elementFromPoint(x, y) === ref.current) { + const element = document.elementFromPoint(x, y); + if (ref.current && element && ref.current.contains(element)) { onDrop(e.payload.paths); setDragIn(false); } @@ -29,7 +30,8 @@ const useDropZone = ({ onDrop }: { onDrop: (paths: string[]) => void }) => { useEffect(() => { const unlisten = listen("tauri://drag-over", (e) => { const { x, y } = e.payload.position; - if (document.elementFromPoint(x, y) === ref.current) { + const element = document.elementFromPoint(x, y); + if (ref.current && element && ref.current.contains(element)) { setDragIn(true); } else { setDragIn(false); diff --git a/packages/kbot/src/commands/images.ts b/packages/kbot/src/commands/images.ts index 80eae5bb..b0ff3641 100644 --- a/packages/kbot/src/commands/images.ts +++ b/packages/kbot/src/commands/images.ts @@ -19,6 +19,50 @@ import { prompt as resolvePrompt } from '../prompt.js'; import { spawn } from 'node:child_process'; import { loadConfig } from '../config.js'; +function generateUniqueFilename(dst: string | undefined, genFiles: string[]): string { + let dstDir: string; + + if (dst) { + const absoluteDst = path.resolve(dst); + const dstStat = exists(absoluteDst) ? statSync(absoluteDst) : null; + if (dstStat && dstStat.isDirectory()) { + dstDir = absoluteDst; + } else { + dstDir = path.dirname(absoluteDst); + } + } else if (genFiles.length > 0) { + dstDir = path.dirname(genFiles[0]); + } else { + dstDir = process.cwd(); // fallback to current working dir + } + + let baseFileName; + let i = 0; + + if (genFiles.length > 0) { + const originalBaseName = path.basename(genFiles[0], path.extname(genFiles[0])); + const match = originalBaseName.match(/_gen_(\d+)$/); + if (match && match.index) { + baseFileName = originalBaseName.substring(0, match.index); + i = parseInt(match[1], 10) + 1; + } else { + baseFileName = originalBaseName; + } + } else { + baseFileName = 'generated'; + } + + let newFileName; + let finalDstPath; + do { + newFileName = `${baseFileName}_gen_${i}.png`; + finalDstPath = path.resolve(dstDir, newFileName); + i++; + } while (exists(finalDstPath)); + + return finalDstPath; +} + function getGuiAppPath(): string { // Get the directory of this script file, then navigate to the GUI app @@ -217,39 +261,10 @@ async function launchGuiAndGetPrompt(argv: any): Promise { try { const genPrompt = message.prompt; const genFiles = message.files || []; + const genDst = message.dst; - // --- New logic for destination path --- - let dstDir: string; - - if (argv.dst) { - const absoluteDst = path.resolve(argv.dst); - const dstStat = exists(absoluteDst) ? statSync(absoluteDst) : null; - if (dstStat && dstStat.isDirectory()) { - dstDir = absoluteDst; - } else { - dstDir = path.dirname(absoluteDst); - } - } else if (genFiles.length > 0) { - dstDir = path.dirname(genFiles[0]); - } else { - dstDir = process.cwd(); // fallback to current working dir - } - - const baseFileName = genFiles.length > 0 - ? path.basename(genFiles[0], path.extname(genFiles[0])) - : 'generated'; - - let i = 0; - let newFileName; - let finalDstPath; - do { - newFileName = `${baseFileName}_gen_${i}.png`; - finalDstPath = path.resolve(dstDir, newFileName); - i++; - } while (exists(finalDstPath)); - + const finalDstPath = generateUniqueFilename(genDst, genFiles); logger.info(`📝 Determined destination path for generated image: ${finalDstPath}`); - // --- End new logic --- logger.info(`🎨 Starting image generation: "${genPrompt}"`); diff --git a/packages/kbot/tests/assets/DSC05427_gen_0.png b/packages/kbot/tests/assets/DSC05427_gen_0.png deleted file mode 100644 index f0c8f6fc..00000000 Binary files a/packages/kbot/tests/assets/DSC05427_gen_0.png and /dev/null differ