From a2f63664b0036926a4e444db6a441180eabc246f Mon Sep 17 00:00:00 2001 From: Chesterkxng Date: Sat, 24 May 2025 02:50:38 +0200 Subject: [PATCH 01/11] feat: insert csv columns --- src/components/options/TextareaWithDesc.tsx | 46 +++ src/pages/tools/csv/index.ts | 4 +- .../tools/csv/insert-csv-columns/index.tsx | 283 ++++++++++++++++++ .../insert-csv-columns.service.test.ts | 87 ++++++ .../tools/csv/insert-csv-columns/meta.ts | 15 + .../tools/csv/insert-csv-columns/service.ts | 81 +++++ .../tools/csv/insert-csv-columns/types.ts | 15 + src/utils/array.ts | 11 +- 8 files changed, 539 insertions(+), 3 deletions(-) create mode 100644 src/components/options/TextareaWithDesc.tsx create mode 100644 src/pages/tools/csv/insert-csv-columns/index.tsx create mode 100644 src/pages/tools/csv/insert-csv-columns/insert-csv-columns.service.test.ts create mode 100644 src/pages/tools/csv/insert-csv-columns/meta.ts create mode 100644 src/pages/tools/csv/insert-csv-columns/service.ts create mode 100644 src/pages/tools/csv/insert-csv-columns/types.ts diff --git a/src/components/options/TextareaWithDesc.tsx b/src/components/options/TextareaWithDesc.tsx new file mode 100644 index 0000000..9e48dca --- /dev/null +++ b/src/components/options/TextareaWithDesc.tsx @@ -0,0 +1,46 @@ +import { Box, TextField, TextFieldProps } from '@mui/material'; +import Typography from '@mui/material/Typography'; +import React from 'react'; + +type OwnProps = { + description?: string; + value: string; + onOwnChange: (value: string) => void; + placeholder?: string; + rows?: number; +}; + +const TextareaWithDesc = ({ + description, + value, + onOwnChange, + placeholder, + minRows = 3, + ...props +}: TextFieldProps & OwnProps) => { + return ( + + onOwnChange(event.target.value)} + sx={{ + backgroundColor: 'background.paper', + '& .MuiInputBase-root': { + overflow: 'hidden' // ✨ Prevent scrollbars + } + }} + {...props} + /> + {description && ( + + {description} + + )} + + ); +}; + +export default TextareaWithDesc; diff --git a/src/pages/tools/csv/index.ts b/src/pages/tools/csv/index.ts index 3e0a9da..69e29be 100644 --- a/src/pages/tools/csv/index.ts +++ b/src/pages/tools/csv/index.ts @@ -1,3 +1,4 @@ +import { tool as insertCsvColumns } from './insert-csv-columns/meta'; import { tool as transposeCsv } from './transpose-csv/meta'; import { tool as findIncompleteCsvRecords } from './find-incomplete-csv-records/meta'; import { tool as ChangeCsvDelimiter } from './change-csv-separator/meta'; @@ -17,5 +18,6 @@ export const csvTools = [ csvToYaml, ChangeCsvDelimiter, findIncompleteCsvRecords, - transposeCsv + transposeCsv, + insertCsvColumns ]; diff --git a/src/pages/tools/csv/insert-csv-columns/index.tsx b/src/pages/tools/csv/insert-csv-columns/index.tsx new file mode 100644 index 0000000..0c6b76e --- /dev/null +++ b/src/pages/tools/csv/insert-csv-columns/index.tsx @@ -0,0 +1,283 @@ +import { Box } from '@mui/material'; +import React, { useState } from 'react'; +import ToolContent from '@components/ToolContent'; +import { ToolComponentProps } from '@tools/defineTool'; +import ToolTextInput from '@components/input/ToolTextInput'; +import ToolTextResult from '@components/result/ToolTextResult'; +import { GetGroupsType } from '@components/options/ToolOptions'; +import { CardExampleType } from '@components/examples/ToolExamples'; +import { main } from './service'; +import { getCsvHeaders } from '@utils/csv'; +import { InitialValuesType } from './types'; +import TextFieldWithDesc from '@components/options/TextFieldWithDesc'; +import TextareaWithDesc from '@components/options/TextareaWithDesc'; +import SelectWithDesc from '@components/options/SelectWithDesc'; + +const initialValues: InitialValuesType = { + csvToInsert: '', + commentCharacter: '#', + separator: ',', + quoteChar: '"', + insertingPosition: 'append', + customFill: false, + customFillValue: '', + customPostionOptions: 'headerName', + headerName: '', + rowNumber: 1 +}; + +const exampleCards: CardExampleType[] = [ + { + title: 'Add One Column to a CSV File', + description: + 'In this example, we insert a column with the title "city" into a CSV file that already contains two other columns with titles "name" and "age". The new column consists of three values: "city", "dallas", and "houston", corresponding to the height of the input CSV data. The value "city" is the header value (appearing on the first row) and values "dallas" and "houston" are data values (appearing on rows two and three). We specify the position of the new column by an ordinal number and set it to 1 in the options. This value indicates that the new "city" column should be placed after the first column.', + sampleText: `name,age +john,25 +emma,22`, + sampleResult: `name,city,age +john,dallas,25 +emma,houston,22`, + sampleOptions: { + csvToInsert: `city +dallas +houston`, + commentCharacter: '#', + separator: ',', + quoteChar: '"', + insertingPosition: 'custom', + customFill: true, + customFillValue: 'k', + customPostionOptions: 'rowNumber', + headerName: '', + rowNumber: 1 + } + }, + { + title: 'Append Multiple columns by header Name', + description: + 'In this example, we append two data columns to the end of CSV data. The input CSV has data about cars, including the "Brand" and "Model" of the car. We now add two more columns at the end: "Year" and "Price". To do this, we enter these two data columns in the comma-separated format in the "New Column" option, and to quickly add the new columns to the end of the CSV, then we specify the name of the header they should be put after.', + sampleText: `Brand,Model +Toyota,Camry +Ford,Mustang +Honda,Accord +Chevrolet,Malibu`, + sampleResult: `Brand,Model,Year,Price +Toyota,Camry,2022,25000 +Ford,Mustang,2021,35000 +Honda,Accord,2022,27000 +Chevrolet,Malibu,2021,28000`, + sampleOptions: { + csvToInsert: `Year,Price +2022,25000 +2021,35000 +2022,27000 +2021,28000`, + commentCharacter: '#', + separator: ',', + quoteChar: '"', + insertingPosition: 'custom', + customFill: false, + customFillValue: 'x', + customPostionOptions: 'headerName', + headerName: 'Model', + rowNumber: 1 + } + }, + { + title: 'Append Multiple columns', + description: + 'In this example, we append two data columns to the end of CSV data. The input CSV has data about cars, including the "Brand" and "Model" of the car. We now add two more columns at the end: "Year" and "Price". To do this, we enter these two data columns in the comma-separated format in the "New Column" option, and to quickly add the new columns to the end of the CSV, then we select append.', + sampleText: `Brand,Model +Toyota,Camry +Ford,Mustang +Honda,Accord +Chevrolet,Malibu`, + sampleResult: `Brand,Model,Year,Price +Toyota,Camry,2022,25000 +Ford,Mustang,2021,35000 +Honda,Accord,2022,27000 +Chevrolet,Malibu,2021,28000`, + sampleOptions: { + csvToInsert: `Year,Price +2022,25000 +2021,35000 +2022,27000 +2021,28000`, + commentCharacter: '#', + separator: ',', + quoteChar: '"', + insertingPosition: 'append', + customFill: false, + customFillValue: 'x', + customPostionOptions: 'rowNumber', + headerName: '', + rowNumber: 1 + } + } +]; +export default function InsertCsvColumns({ + title, + longDescription +}: ToolComponentProps) { + const [input, setInput] = useState(''); + const [result, setResult] = useState(''); + + const compute = (values: InitialValuesType, input: string) => { + setResult(main(input, values)); + }; + + const headers = getCsvHeaders(input); + const headerOptions = + headers.length > 0 + ? headers.map((item) => ({ + label: `${item}`, + value: item + })) + : []; + + const getGroups: GetGroupsType | null = ({ + values, + updateField + }) => [ + { + title: 'CSV to insert', + component: ( + + updateField('csvToInsert', val)} + title="CSV separator" + description={`Enter one or more columns you want to insert into the CSV. + the character used to delimit columns has to be the same with the one in the CSV input file. + Ps: Blank lines will be ignored`} + /> + + ) + }, + { + title: 'CSV Options', + component: ( + + updateField('separator', val)} + description={ + 'Enter the character used to delimit columns in the CSV input file.' + } + /> + updateField('quoteChar', val)} + description={ + 'Enter the quote character used to quote the CSV input fields.' + } + /> + updateField('commentCharacter', val)} + description={ + 'Enter the character indicating the start of a comment line. Lines starting with this symbol will be skipped.' + } + /> + { + updateField('customFill', value); + if (!value) { + updateField('customFillValue', ''); // Reset custom fill value + } + }} + description={ + 'If the input CSV file is incomplete (missing values), then add empty fields or custom symbols to records to make a well-formed CSV?' + } + /> + {values.customFill && ( + updateField('customFillValue', val)} + description={ + 'Use this custom value to fill in missing fields. (Works only with "Custom Values" mode above.)' + } + /> + )} + + ) + }, + { + title: 'Position Options', + component: ( + + updateField('insertingPosition', value)} + description={'Specify where to insert the columns in the CSV file.'} + /> + + {values.insertingPosition === 'custom' && ( + updateField('customPostionOptions', value)} + description={ + 'Select the method to insert the columns in the CSV file.' + } + /> + )} + + {values.insertingPosition === 'custom' && + values.customPostionOptions === 'headerName' && ( + updateField('headerName', value)} + description={ + 'Header of the column you want to insert columns after.' + } + /> + )} + + {values.insertingPosition === 'custom' && + values.customPostionOptions === 'rowNumber' && ( + updateField('rowNumber', Number(val))} + inputProps={{ min: 1, max: headers.length }} + type="number" + description={ + 'Number of the column you want to insert columns after.' + } + /> + )} + + ) + } + ]; + return ( + + } + resultComponent={} + initialValues={initialValues} + exampleCards={exampleCards} + getGroups={getGroups} + setInput={setInput} + compute={compute} + toolInfo={{ title: `What is a ${title}?`, description: longDescription }} + /> + ); +} diff --git a/src/pages/tools/csv/insert-csv-columns/insert-csv-columns.service.test.ts b/src/pages/tools/csv/insert-csv-columns/insert-csv-columns.service.test.ts new file mode 100644 index 0000000..c02abd2 --- /dev/null +++ b/src/pages/tools/csv/insert-csv-columns/insert-csv-columns.service.test.ts @@ -0,0 +1,87 @@ +import { describe, it, expect } from 'vitest'; +import { main } from './service'; +import type { InitialValuesType } from './types'; + +describe('main function', () => { + const baseOptions: Omit = { + commentCharacter: '#', + separator: ',', + quoteChar: '"', + insertingPosition: 'append', + customFill: false, + customFillValue: '', + customPostionOptions: 'headerName', + headerName: 'age', + rowNumber: 1 + }; + + const originalCsv = `name,age\nAlice,30\nBob,25`; + + it('should return empty string if input or csvToInsert is empty', () => { + expect(main('', { ...baseOptions, csvToInsert: '' })).toBe(''); + expect(main(originalCsv, { ...baseOptions, csvToInsert: '' })).toBe(''); + }); + + it('should append columns at the end', () => { + const csvToInsert = `email\nalice@mail.com\nbob@mail.com`; + const result = main(originalCsv, { + ...baseOptions, + insertingPosition: 'append', + csvToInsert + }); + expect(result).toBe( + 'name,age,email\nAlice,30,alice@mail.com\nBob,25,bob@mail.com' + ); + }); + + it('should prepend columns at the beginning', () => { + const csvToInsert = `email\nalice@mail.com\nbob@mail.com`; + const result = main(originalCsv, { + ...baseOptions, + insertingPosition: 'prepend', + csvToInsert + }); + expect(result).toBe( + 'email,name,age\nalice@mail.com,Alice,30\nbob@mail.com,Bob,25' + ); + }); + + it('should insert columns after a header name', () => { + const csvToInsert = `email\nalice@mail.com\nbob@mail.com`; + const result = main(originalCsv, { + ...baseOptions, + insertingPosition: 'custom', + customPostionOptions: 'headerName', + headerName: 'name', + csvToInsert + }); + expect(result).toBe( + 'name,email,age\nAlice,alice@mail.com,30\nBob,bob@mail.com,25' + ); + }); + + it('should insert columns after a row number (column index)', () => { + const csvToInsert = `email\nalice@mail.com\nbob@mail.com`; + const result = main(originalCsv, { + ...baseOptions, + insertingPosition: 'custom', + customPostionOptions: 'rowNumber', + rowNumber: 0, + csvToInsert + }); + expect(result).toBe( + 'name,email,age\nAlice,alice@mail.com,30\nBob,bob@mail.com,25' + ); + }); + + it('should handle missing values and fill with empty string by default', () => { + const csv = `name\nAlice\nBob`; + const csvToInsert = `email\nalice@mail.com\n`; // second row is missing + const result = main(csv, { + ...baseOptions, + insertingPosition: 'append', + csvToInsert + }); + expect(result).toBe('name,email\nAlice,alice@mail.com\nBob,'); + }); +}); diff --git a/src/pages/tools/csv/insert-csv-columns/meta.ts b/src/pages/tools/csv/insert-csv-columns/meta.ts new file mode 100644 index 0000000..7a002ed --- /dev/null +++ b/src/pages/tools/csv/insert-csv-columns/meta.ts @@ -0,0 +1,15 @@ +import { defineTool } from '@tools/defineTool'; +import { lazy } from 'react'; + +export const tool = defineTool('csv', { + name: 'Insert CSV columns', + path: 'insert-csv-columns', + icon: 'hugeicons:column-insert', + description: + 'Just upload your CSV file in the form below, paste the new column in the options, and it will automatically get inserted in your CSV. In the tool options, you can also specify more than one column to insert, set the insertion position, and optionally skip the empty and comment lines.', + shortDescription: + 'Quickly insert one or more new columns anywhere in a CSV file.', + keywords: ['insert', 'csv', 'columns', 'append', 'prepend'], + longDescription: '', + component: lazy(() => import('./index')) +}); diff --git a/src/pages/tools/csv/insert-csv-columns/service.ts b/src/pages/tools/csv/insert-csv-columns/service.ts new file mode 100644 index 0000000..5d9cf3c --- /dev/null +++ b/src/pages/tools/csv/insert-csv-columns/service.ts @@ -0,0 +1,81 @@ +import { InitialValuesType } from './types'; +import { splitCsv } from '@utils/csv'; +import { transpose, normalizeAndFill } from '@utils/array'; + +export function main(input: string, options: InitialValuesType): string { + if (!input || !options.csvToInsert) return ''; + + // Parse input CSV and insert CSV + const inputRows = splitCsv( + input, + true, + options.commentCharacter, + true, + options.separator, + options.quoteChar + ); + + const filledRows = options.customFill + ? normalizeAndFill(inputRows, options.customFillValue) + : normalizeAndFill(inputRows, ''); + + let columns = transpose(filledRows); + + const csvToInsertRows = splitCsv( + options.csvToInsert, + true, + options.commentCharacter, + true, + options.separator, + options.quoteChar + ); + + const filledCsvToInsertRows = options.customFill + ? normalizeAndFill(csvToInsertRows, options.customFillValue) + : normalizeAndFill(csvToInsertRows, ''); + + const columnsToInsert = transpose(filledCsvToInsertRows); + + switch (options.insertingPosition) { + case 'prepend': + columns = [...columnsToInsert, ...columns]; + break; + + case 'append': + columns = [...columns, ...columnsToInsert]; + break; + + case 'custom': + if (options.customPostionOptions === 'headerName') { + const headerName = options.headerName; + const index = filledRows[0].indexOf(headerName); + if (index !== -1) { + columns = [ + ...columns.slice(0, index + 1), + ...columnsToInsert, + ...columns.slice(index + 1) + ]; + } // else: keep original columns + } else if (options.customPostionOptions === 'rowNumber') { + const index = options.rowNumber; + if (index >= 0 && index <= columns.length) { + columns = [ + ...columns.slice(0, index), + ...columnsToInsert, + ...columns.slice(index) + ]; + } // else: keep original columns + } + break; + + default: + // no-op, keep original columns + break; + } + + // Transpose back to rows + const normalizedColumns = normalizeAndFill(columns, options.customFillValue); + const finalRows = transpose(normalizedColumns); + + return finalRows.map((row) => row.join(options.separator)).join('\n'); +} diff --git a/src/pages/tools/csv/insert-csv-columns/types.ts b/src/pages/tools/csv/insert-csv-columns/types.ts new file mode 100644 index 0000000..7cfd711 --- /dev/null +++ b/src/pages/tools/csv/insert-csv-columns/types.ts @@ -0,0 +1,15 @@ +export type insertingPosition = 'prepend' | 'append' | 'custom'; +export type customPostion = 'headerName' | 'rowNumber'; + +export type InitialValuesType = { + csvToInsert: string; + separator: string; + quoteChar: string; + commentCharacter: string; + customFill: boolean; + customFillValue: string; + insertingPosition: insertingPosition; + customPostionOptions: customPostion; + headerName: string; + rowNumber: number; +}; diff --git a/src/utils/array.ts b/src/utils/array.ts index 3ab7c50..41e36f4 100644 --- a/src/utils/array.ts +++ b/src/utils/array.ts @@ -12,10 +12,17 @@ export function transpose(matrix: T[][]): any[][] { * Normalize and fill a 2D array to ensure all rows have the same length. * @param {any[][]} matrix - The 2D array to normalize and fill. * @param {any} fillValue - The value to fill in for missing elements. + * @param {number} desiredLength - The target length of the array. if given take it as maxLength. * @returns {any[][]} - The normalized and filled 2D array. * **/ -export function normalizeAndFill(matrix: T[][], fillValue: T): T[][] { - const maxLength = Math.max(...matrix.map((row) => row.length)); +export function normalizeAndFill( + matrix: T[][], + fillValue: T, + desiredLength?: number +): T[][] { + const maxLength = !desiredLength + ? Math.max(...matrix.map((row) => row.length)) + : desiredLength; return matrix.map((row) => { const filledRow = [...row]; while (filledRow.length < maxLength) { From 577530e6f6cf284c7465f5223e64883ddde74743 Mon Sep 17 00:00:00 2001 From: Chesterkxng Date: Sat, 24 May 2025 03:04:49 +0200 Subject: [PATCH 02/11] fix: test file fix since function behaviour improved --- .../csv/insert-csv-columns/insert-csv-columns.service.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/tools/csv/insert-csv-columns/insert-csv-columns.service.test.ts b/src/pages/tools/csv/insert-csv-columns/insert-csv-columns.service.test.ts index c02abd2..7803244 100644 --- a/src/pages/tools/csv/insert-csv-columns/insert-csv-columns.service.test.ts +++ b/src/pages/tools/csv/insert-csv-columns/insert-csv-columns.service.test.ts @@ -70,7 +70,7 @@ describe('main function', () => { csvToInsert }); expect(result).toBe( - 'name,email,age\nAlice,alice@mail.com,30\nBob,bob@mail.com,25' + 'email,name,age\nalice@mail.com,Alice,30\nbob@mail.com,Bob,25' ); }); From 37c8b30a118240ff981dd5fa6519ee0ee06c6454 Mon Sep 17 00:00:00 2001 From: nevolodia Date: Sun, 25 May 2025 13:38:23 +0200 Subject: [PATCH 03/11] Crop video logic added. --- src/pages/tools/video/crop-video/service.ts | 63 +++++++++++++++++++++ src/pages/tools/video/crop-video/types.ts | 6 ++ 2 files changed, 69 insertions(+) create mode 100644 src/pages/tools/video/crop-video/service.ts create mode 100644 src/pages/tools/video/crop-video/types.ts diff --git a/src/pages/tools/video/crop-video/service.ts b/src/pages/tools/video/crop-video/service.ts new file mode 100644 index 0000000..0d16341 --- /dev/null +++ b/src/pages/tools/video/crop-video/service.ts @@ -0,0 +1,63 @@ +import { FFmpeg } from '@ffmpeg/ffmpeg'; +import { fetchFile } from '@ffmpeg/util'; +import { InitialValuesType } from './types'; + +const ffmpeg = new FFmpeg(); + +export async function getVideoDimensions( + file: File +): Promise<{ width: number; height: number }> { + return new Promise((resolve, reject) => { + const video = document.createElement('video'); + const url = URL.createObjectURL(file); + + video.onloadedmetadata = () => { + URL.revokeObjectURL(url); + resolve({ + width: video.videoWidth, + height: video.videoHeight + }); + }; + + video.onerror = () => { + URL.revokeObjectURL(url); + reject(new Error('Failed to load video metadata')); + }; + + video.src = url; + }); +} + +export async function cropVideo( + input: File, + options: InitialValuesType +): Promise { + if (!ffmpeg.loaded) { + await ffmpeg.load({ + wasmURL: + 'https://cdn.jsdelivr.net/npm/@ffmpeg/core@0.12.9/dist/esm/ffmpeg-core.wasm' + }); + } + + const inputName = 'input.mp4'; + const outputName = 'output.mp4'; + await ffmpeg.writeFile(inputName, await fetchFile(input)); + + const args = []; + + args.push('-i', inputName); + args.push( + '-vf', + `crop=${options.width}:${options.height}:${options.x}:${options.y}` + ); + args.push('-c:v', 'libx264', '-preset', 'ultrafast', outputName); + + await ffmpeg.exec(args); + + const croppedData = await ffmpeg.readFile(outputName); + return await new File( + [new Blob([croppedData], { type: 'video/mp4' })], + `${input.name.replace(/\.[^/.]+$/, '')}_cropped.mp4`, + { type: 'video/mp4' } + ); +} diff --git a/src/pages/tools/video/crop-video/types.ts b/src/pages/tools/video/crop-video/types.ts new file mode 100644 index 0000000..60ee53d --- /dev/null +++ b/src/pages/tools/video/crop-video/types.ts @@ -0,0 +1,6 @@ +export type InitialValuesType = { + x: number; + y: number; + width: number; + height: number; +}; From 8d2e0ab8fd96fc19e7cb02dd5ae3615aeb99aeee Mon Sep 17 00:00:00 2001 From: nevolodia Date: Sun, 25 May 2025 13:38:43 +0200 Subject: [PATCH 04/11] Crop video meta added. --- src/pages/tools/video/crop-video/meta.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/pages/tools/video/crop-video/meta.ts diff --git a/src/pages/tools/video/crop-video/meta.ts b/src/pages/tools/video/crop-video/meta.ts new file mode 100644 index 0000000..184c809 --- /dev/null +++ b/src/pages/tools/video/crop-video/meta.ts @@ -0,0 +1,14 @@ +import { defineTool } from '@tools/defineTool'; +import { lazy } from 'react'; + +export const tool = defineTool('video', { + name: 'Crop video', + path: 'crop-video', + icon: 'mdi:crop', + description: 'Crop a video by specifying coordinates and dimensions', + shortDescription: 'Crop video to specific area', + keywords: ['crop', 'video', 'trim', 'cut', 'resize'], + longDescription: + 'Remove unwanted parts from the edges of your video by cropping it to a specific rectangular area. Define the starting coordinates (X, Y) and the width and height of the area you want to keep.', + component: lazy(() => import('./index')) +}); From fd28651c78a96f3eb9beb0ae93199d15fb8dc508 Mon Sep 17 00:00:00 2001 From: nevolodia Date: Sun, 25 May 2025 13:39:21 +0200 Subject: [PATCH 05/11] Crop video main page added. --- src/pages/tools/video/crop-video/index.tsx | 167 +++++++++++++++++++++ 1 file changed, 167 insertions(+) create mode 100644 src/pages/tools/video/crop-video/index.tsx diff --git a/src/pages/tools/video/crop-video/index.tsx b/src/pages/tools/video/crop-video/index.tsx new file mode 100644 index 0000000..e756fdc --- /dev/null +++ b/src/pages/tools/video/crop-video/index.tsx @@ -0,0 +1,167 @@ +import { Box, TextField, Typography, Alert } from '@mui/material'; +import { useCallback, useState, useEffect } from 'react'; +import ToolFileResult from '@components/result/ToolFileResult'; +import ToolContent from '@components/ToolContent'; +import { ToolComponentProps } from '@tools/defineTool'; +import { GetGroupsType } from '@components/options/ToolOptions'; +import { debounce } from 'lodash'; +import ToolVideoInput from '@components/input/ToolVideoInput'; +import { cropVideo, getVideoDimensions } from './service'; +import { InitialValuesType } from './types'; + +export const initialValues: InitialValuesType = { + x: 0, + y: 0, + width: 100, + height: 100 +}; + +export default function CropVideo({ title }: ToolComponentProps) { + const [input, setInput] = useState(null); + const [result, setResult] = useState(null); + const [loading, setLoading] = useState(false); + const [videoDimensions, setVideoDimensions] = useState<{ + width: number; + height: number; + } | null>(null); + + useEffect(() => { + if (input) { + getVideoDimensions(input) + .then((dimensions) => { + setVideoDimensions(dimensions); + }) + .catch((error) => { + console.error('Error getting video dimensions:', error); + }); + } else { + setVideoDimensions(null); + } + }, [input]); + + const compute = async ( + optionsValues: InitialValuesType, + input: File | null + ) => { + if (!input) return; + + setLoading(true); + + try { + const croppedFile = await cropVideo(input, optionsValues); + setResult(croppedFile); + } catch (error) { + console.error('Error cropping video:', error); + } finally { + setLoading(false); + } + }; + + const debouncedCompute = useCallback(debounce(compute, 1000), [ + videoDimensions + ]); + + const getGroups: GetGroupsType = ({ + values, + updateField + }) => [ + { + title: 'Video Information', + component: ( + + {videoDimensions ? ( + + Video dimensions: {videoDimensions.width} ×{' '} + {videoDimensions.height} pixels + + ) : ( + + Load a video to see dimensions + + )} + + ) + }, + { + title: 'Crop Coordinates', + component: ( + + + updateField('x', parseInt(e.target.value) || 0)} + size="small" + inputProps={{ min: 0 }} + /> + updateField('y', parseInt(e.target.value) || 0)} + size="small" + inputProps={{ min: 0 }} + /> + + + + updateField('width', parseInt(e.target.value) || 0) + } + size="small" + inputProps={{ min: 1 }} + /> + + updateField('height', parseInt(e.target.value) || 0) + } + size="small" + inputProps={{ min: 1 }} + /> + + + ) + } + ]; + + return ( + + } + resultComponent={ + loading ? ( + + ) : ( + + ) + } + initialValues={initialValues} + getGroups={getGroups} + compute={debouncedCompute} + setInput={setInput} + /> + ); +} From 13a566566f806f30b6d5d9b3384a53d8400ce5ed Mon Sep 17 00:00:00 2001 From: nevolodia Date: Sun, 25 May 2025 13:39:38 +0200 Subject: [PATCH 06/11] Crop video added to video tools page. --- src/pages/tools/video/index.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/tools/video/index.ts b/src/pages/tools/video/index.ts index 3e6659d..569665f 100644 --- a/src/pages/tools/video/index.ts +++ b/src/pages/tools/video/index.ts @@ -6,6 +6,7 @@ import { tool as rotateVideo } from './rotate/meta'; import { tool as compressVideo } from './compress/meta'; import { tool as loopVideo } from './loop/meta'; import { tool as flipVideo } from './flip/meta'; +import { tool as cropVideo } from './crop-video/meta'; export const videoTools = [ ...gifTools, @@ -13,5 +14,6 @@ export const videoTools = [ rotateVideo, compressVideo, loopVideo, - flipVideo + flipVideo, + cropVideo ]; From 2f104f5a1b1339d3b8ff17d262175563f8ab2396 Mon Sep 17 00:00:00 2001 From: nevolodia Date: Sun, 25 May 2025 14:14:01 +0200 Subject: [PATCH 07/11] Check for valid coordinates added, bugs fixed. --- src/pages/tools/video/crop-video/index.tsx | 44 ++++++++++++++++++++- src/pages/tools/video/crop-video/service.ts | 4 ++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/src/pages/tools/video/crop-video/index.tsx b/src/pages/tools/video/crop-video/index.tsx index e756fdc..b1bcbb6 100644 --- a/src/pages/tools/video/crop-video/index.tsx +++ b/src/pages/tools/video/crop-video/index.tsx @@ -24,27 +24,60 @@ export default function CropVideo({ title }: ToolComponentProps) { width: number; height: number; } | null>(null); + const [processingError, setProcessingError] = useState(''); useEffect(() => { if (input) { getVideoDimensions(input) .then((dimensions) => { setVideoDimensions(dimensions); + setProcessingError(''); }) .catch((error) => { console.error('Error getting video dimensions:', error); + setProcessingError('Failed to load video dimensions'); }); } else { setVideoDimensions(null); + setProcessingError(''); } }, [input]); + const validateDimensions = (values: InitialValuesType): string => { + if (!videoDimensions) return ''; + + if (values.x < 0 || values.y < 0) { + return 'X and Y coordinates must be non-negative'; + } + + if (values.width <= 0 || values.height <= 0) { + return 'Width and height must be positive'; + } + + if (values.x + values.width > videoDimensions.width) { + return `Crop area extends beyond video width (${videoDimensions.width}px)`; + } + + if (values.y + values.height > videoDimensions.height) { + return `Crop area extends beyond video height (${videoDimensions.height}px)`; + } + + return ''; + }; + const compute = async ( optionsValues: InitialValuesType, input: File | null ) => { if (!input) return; + const error = validateDimensions(optionsValues); + if (error) { + setProcessingError(error); + return; + } + + setProcessingError(''); setLoading(true); try { @@ -52,12 +85,16 @@ export default function CropVideo({ title }: ToolComponentProps) { setResult(croppedFile); } catch (error) { console.error('Error cropping video:', error); + setProcessingError( + 'Error cropping video. Please check parameters and video file.' + ); } finally { setLoading(false); } }; - const debouncedCompute = useCallback(debounce(compute, 1000), [ + // 2 seconds to avoid starting job half way through + const debouncedCompute = useCallback(debounce(compute, 2000), [ videoDimensions ]); @@ -86,6 +123,11 @@ export default function CropVideo({ title }: ToolComponentProps) { title: 'Crop Coordinates', component: ( + {processingError && ( + + {processingError} + + )} Date: Sun, 25 May 2025 16:31:31 +0200 Subject: [PATCH 08/11] Right mouse click on logo bug fixed. --- src/components/Navbar/index.tsx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/components/Navbar/index.tsx b/src/components/Navbar/index.tsx index 8fcf132..2451e58 100644 --- a/src/components/Navbar/index.tsx +++ b/src/components/Navbar/index.tsx @@ -100,12 +100,13 @@ const Navbar: React.FC = ({ onSwitchTheme }) => { alignItems: 'center' }} > - navigate('/')} - style={{ cursor: 'pointer' }} - src={logo} - width={isMobile ? '80px' : '150px'} - /> + + + {isMobile ? ( <> Date: Mon, 26 May 2025 19:14:46 +0100 Subject: [PATCH 09/11] chore: remove TextareaWithDesc.tsx --- .idea/workspace.xml | 82 +++++++++++-------- src/components/options/TextareaWithDesc.tsx | 46 ----------- .../tools/csv/insert-csv-columns/index.tsx | 7 +- 3 files changed, 53 insertions(+), 82 deletions(-) delete mode 100644 src/components/options/TextareaWithDesc.tsx diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8b52a7f..4ec7c35 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,10 +4,10 @@