PyPI - lyrics-transcriber - Versions diffs - 0.46.0__py3-none-any.whl → 0.47.0__py3-none-any.whl - Mend

lyrics-transcriber 0.46.0py3-none-any.whl → 0.47.0py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

lyrics_transcriber/frontend/dist/index.html CHANGED Viewed

@@ -5,7 +5,7 @@
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Lyrics Transcriber Analyzer</title>
-    <script type="module" crossorigin src="/assets/index-BXOpmKq-.js"></script>
+    <script type="module" crossorigin src="/assets/index-2vK-qVJS.js"></script>
   </head>
   <body>
     <div id="root"></div>

lyrics_transcriber/frontend/src/components/EditModal.tsx CHANGED Viewed

@@ -185,15 +185,15 @@ export default function EditModal({
     isGlobal = false,
     isLoading = false
 }: EditModalProps) {
-    console.log('EditModal - Render', {
-        open,
-        isGlobal,
-        isLoading,
-        hasSegment: !!segment,
-        segmentIndex,
-        hasOriginalSegment: !!originalSegment,
-        hasOriginalTranscribedSegment: !!originalTranscribedSegment
-    });
+    // console.log('EditModal - Render', {
+    //     open,
+    //     isGlobal,
+    //     isLoading,
+    //     hasSegment: !!segment,
+    //     segmentIndex,
+    //     hasOriginalSegment: !!originalSegment,
+    //     hasOriginalTranscribedSegment: !!originalTranscribedSegment
+    // });
     const [editedSegment, setEditedSegment] = useState<LyricsSegment | null>(segment)
     const [isPlaying, setIsPlaying] = useState(false)
@@ -233,7 +233,7 @@ export default function EditModal({
     })
     const handleClose = useCallback(() => {
-        console.log('EditModal - handleClose called');
+        // console.log('EditModal - handleClose called');
         cleanupManualSync()
         onClose()
     }, [onClose, cleanupManualSync])
@@ -243,12 +243,12 @@ export default function EditModal({
         const spacebarHandler = handleSpacebar // Capture the current handler
         if (open) {
-            console.log('EditModal - Setting up modal spacebar handler', {
-                hasPlaySegment: !!onPlaySegment,
-                editedSegmentId: editedSegment?.id,
-                handlerFunction: spacebarHandler.toString().slice(0, 100),
-                isLoading
-            })
+            // console.log('EditModal - Setting up modal spacebar handler', {
+            //     hasPlaySegment: !!onPlaySegment,
+            //     editedSegmentId: editedSegment?.id,
+            //     handlerFunction: spacebarHandler.toString().slice(0, 100),
+            //     isLoading
+            // })
             // Create a function that will be called by the global event listeners
             const handleKeyEvent = (e: KeyboardEvent) => {
@@ -262,7 +262,7 @@ export default function EditModal({
             // Only cleanup when the effect is re-run or the modal is closed
             return () => {
                 if (!open) {
-                    console.log('EditModal - Cleanup: clearing modal spacebar handler')
+                    // console.log('EditModal - Cleanup: clearing modal spacebar handler')
                     setModalSpacebarHandler(undefined)
                 }
             }
@@ -289,11 +289,11 @@ export default function EditModal({
     // All useEffect hooks
     useEffect(() => {
-        console.log('EditModal - segment changed', {
-            hasSegment: !!segment,
-            segmentId: segment?.id,
-            wordCount: segment?.words.length
-        });
+        // console.log('EditModal - segment changed', {
+        //     hasSegment: !!segment,
+        //     segmentId: segment?.id,
+        //     wordCount: segment?.words.length
+        // });
         setEditedSegment(segment)
     }, [segment])
@@ -304,7 +304,7 @@ export default function EditModal({
         const endTime = editedSegment.end_time ?? 0
         if (window.isAudioPlaying && currentTime > endTime) {
-            console.log('Stopping playback: current time exceeded end time')
+            // console.log('Stopping playback: current time exceeded end time')
             window.toggleAudioPlayback?.()
             cleanupManualSync()
         }
@@ -519,7 +519,7 @@ export default function EditModal({
     // Memoize the dialog title to prevent re-renders
     const dialogTitle = useMemo(() => {
-        console.log('EditModal - Rendering dialog title', { isLoading, isGlobal });
+        // console.log('EditModal - Rendering dialog title', { isLoading, isGlobal });
         if (isLoading) {
             return (
@@ -563,24 +563,24 @@ export default function EditModal({
     // Early return after all hooks and function definitions
     if (!isLoading && (!segment || !editedSegment || !originalSegment)) {
-        console.log('EditModal - Early return: missing required data', {
-            hasSegment: !!segment,
-            hasEditedSegment: !!editedSegment,
-            hasOriginalSegment: !!originalSegment,
-            isLoading
-        });
+        // console.log('EditModal - Early return: missing required data', {
+        //     hasSegment: !!segment,
+        //     hasEditedSegment: !!editedSegment,
+        //     hasOriginalSegment: !!originalSegment,
+        //     isLoading
+        // });
         return null;
     }
     if (!isLoading && !isGlobal && segmentIndex === null) {
-        console.log('EditModal - Early return: non-global mode with null segmentIndex');
+        // console.log('EditModal - Early return: non-global mode with null segmentIndex');
         return null;
     }
-    console.log('EditModal - Rendering dialog content', {
-        isLoading,
-        hasEditedSegment: !!editedSegment,
-        hasOriginalSegment: !!originalSegment
-    });
+    // console.log('EditModal - Rendering dialog content', {
+    //     isLoading,
+    //     hasEditedSegment: !!editedSegment,
+    //     hasOriginalSegment: !!originalSegment
+    // });
     return (
         <Dialog

lyrics_transcriber/frontend/src/components/EditWordList.tsx CHANGED Viewed

@@ -33,7 +33,8 @@ const WordRow = memo(function WordRow({
     onWordUpdate,
     onSplitWord,
     onRemoveWord,
-    wordsLength
+    wordsLength,
+    onTabNavigation
 }: {
     word: Word
     index: number
@@ -41,7 +42,17 @@ const WordRow = memo(function WordRow({
     onSplitWord: (index: number) => void
     onRemoveWord: (index: number) => void
     wordsLength: number
+    onTabNavigation: (currentIndex: number) => void
 }) {
+    const handleKeyDown = (e: React.KeyboardEvent) => {
+        // console.log('KeyDown event:', e.key, 'Shift:', e.shiftKey, 'Index:', index);
+        if (e.key === 'Tab' && !e.shiftKey) {
+            // console.log('Tab key detected, preventing default and navigating');
+            e.preventDefault();
+            onTabNavigation(index);
+        }
+    };
     return (
         <Box sx={{
             display: 'flex',
@@ -53,8 +64,10 @@ const WordRow = memo(function WordRow({
                 label={`Word ${index}`}
                 value={word.text}
                 onChange={(e) => onWordUpdate(index, { text: e.target.value })}
+                onKeyDown={handleKeyDown}
                 fullWidth
                 size="small"
+                id={`word-text-${index}`}
             />
             <TextField
                 label="Start Time"
@@ -108,7 +121,8 @@ const WordItem = memo(function WordItem({
     onAddSegment,
     onMergeSegment,
     wordsLength,
-    isGlobal
+    isGlobal,
+    onTabNavigation
 }: {
     word: Word
     index: number
@@ -122,6 +136,7 @@ const WordItem = memo(function WordItem({
     onMergeSegment?: (mergeWithNext: boolean) => void
     wordsLength: number
     isGlobal: boolean
+    onTabNavigation: (currentIndex: number) => void
 }) {
     return (
         <Box key={word.id}>
@@ -132,6 +147,7 @@ const WordItem = memo(function WordItem({
                 onSplitWord={onSplitWord}
                 onRemoveWord={onRemoveWord}
                 wordsLength={wordsLength}
+                onTabNavigation={onTabNavigation}
             />
             {/* Word divider with merge/split functionality */}
@@ -210,6 +226,60 @@ export default function EditWordList({
         setPage(value);
     };
+    // Handle tab navigation between word text fields
+    const handleTabNavigation = (currentIndex: number) => {
+        // console.log('handleTabNavigation called with index:', currentIndex);
+        const nextIndex = (currentIndex + 1) % words.length;
+        // console.log('Next index calculated:', nextIndex, 'Total words:', words.length);
+        // If the next word is on a different page, change the page
+        if (isGlobal && (nextIndex < startIndex || nextIndex >= endIndex)) {
+            // console.log('Next word is on different page. Current page:', page, 'startIndex:', startIndex, 'endIndex:', endIndex);
+            const nextPage = Math.floor(nextIndex / pageSize) + 1;
+            // console.log('Changing to page:', nextPage);
+            setPage(nextPage);
+            // Use setTimeout to allow the page change to render before focusing
+            setTimeout(() => {
+                // console.log('Timeout callback executing, trying to focus element with ID:', `word-text-${nextIndex}`);
+                focusWordTextField(nextIndex);
+            }, 50);
+        } else {
+            // console.log('Next word is on same page, trying to focus element with ID:', `word-text-${nextIndex}`);
+            focusWordTextField(nextIndex);
+        }
+    };
+    // Helper function to focus a word text field by index
+    const focusWordTextField = (index: number) => {
+        // Material-UI TextField uses a more complex structure
+        // The actual input is inside the TextField component
+        const element = document.getElementById(`word-text-${index}`);
+        // console.log('Element found:', !!element);
+        if (element) {
+            // Try different selectors to find the input element
+            // First try the standard input selector
+            let input = element.querySelector('input');
+            // If that doesn't work, try the MUI-specific selector
+            if (!input) {
+                input = element.querySelector('.MuiInputBase-input');
+            }
+            // console.log('Input element found:', !!input);
+            if (input) {
+                input.focus();
+                input.select();
+                // console.log('Focus and select called on input');
+            } else {
+                // As a fallback, try to focus the TextField itself
+                // console.log('Trying to focus the TextField itself');
+                element.focus();
+            }
+        }
+    };
     return (
         <Box sx={{ display: 'flex', flexDirection: 'column', gap: 1, flexGrow: 1, minHeight: 0 }}>
             {/* Initial divider with Add Segment Before button */}
@@ -265,6 +335,7 @@ export default function EditWordList({
                             onMergeSegment={onMergeSegment}
                             wordsLength={words.length}
                             isGlobal={isGlobal}
+                            onTabNavigation={handleTabNavigation}
                         />
                     );
                 })}

lyrics_transcriber/frontend/src/components/LyricsAnalyzer.tsx CHANGED Viewed

@@ -22,7 +22,8 @@ import {
     deleteSegment,
     updateSegment,
     mergeSegment,
-    findAndReplace
+    findAndReplace,
+    deleteWord
 } from './shared/utils/segmentOperations'
 import { loadSavedData, saveData, clearSavedData } from './shared/utils/localStorage'
 import { setupKeyboardHandlers, setModalHandler, getModalState } from './shared/utils/keyboardHandlers'
@@ -237,6 +238,7 @@ export default function LyricsAnalyzer({ data: initialData, onFileLoad, apiClien
     const [originalData] = useState(() => JSON.parse(JSON.stringify(initialData)))
     const [interactionMode, setInteractionMode] = useState<InteractionMode>('edit')
     const [isShiftPressed, setIsShiftPressed] = useState(false)
+    const [isCtrlPressed, setIsCtrlPressed] = useState(false)
     const [editModalSegment, setEditModalSegment] = useState<{
         segment: LyricsSegment
         index: number
@@ -302,8 +304,9 @@ export default function LyricsAnalyzer({ data: initialData, onFileLoad, apiClien
             })
         }
-        const { handleKeyDown, handleKeyUp } = setupKeyboardHandlers({
+        const { handleKeyDown, handleKeyUp, cleanup } = setupKeyboardHandlers({
             setIsShiftPressed,
+            setIsCtrlPressed
         })
         // Always add keyboard listeners
@@ -316,6 +319,7 @@ export default function LyricsAnalyzer({ data: initialData, onFileLoad, apiClien
         // Reset modifier states when a modal opens
         if (isAnyModalOpen) {
             setIsShiftPressed(false)
+            setIsCtrlPressed(false)
         }
         // Cleanup function
@@ -326,8 +330,10 @@ export default function LyricsAnalyzer({ data: initialData, onFileLoad, apiClien
             window.removeEventListener('keydown', handleKeyDown)
             window.removeEventListener('keyup', handleKeyUp)
             document.body.style.userSelect = ''
+            // Call the cleanup function to remove window blur/focus listeners
+            cleanup()
         }
-    }, [setIsShiftPressed, isAnyModalOpen])
+    }, [setIsShiftPressed, setIsCtrlPressed, isAnyModalOpen])
     // Update modal state tracking
     useEffect(() => {
@@ -343,7 +349,7 @@ export default function LyricsAnalyzer({ data: initialData, onFileLoad, apiClien
     }, [modalContent, editModalSegment, isReviewModalOpen, isAddLyricsModalOpen, isFindReplaceModalOpen, isEditAllModalOpen])
     // Calculate effective mode based on modifier key states
-    const effectiveMode = isShiftPressed ? 'highlight' : interactionMode
+    const effectiveMode = isCtrlPressed ? 'delete_word' : (isShiftPressed ? 'highlight' : interactionMode)
     const handleFlash = useCallback((type: FlashType, info?: HighlightInfo) => {
         setFlashingType(null)
@@ -368,6 +374,16 @@ export default function LyricsAnalyzer({ data: initialData, onFileLoad, apiClien
             console.log('LyricsAnalyzer handleWordClick:', { info });
         }
+        if (effectiveMode === 'delete_word') {
+            // Use the shared deleteWord utility function
+            const newData = deleteWord(data, info.word_id);
+            setData(newData);
+            // Flash to indicate the word was deleted
+            handleFlash('word');
+            return;
+        }
         if (effectiveMode === 'highlight') {
             // Find if this word is part of a correction
             const correction = data.corrections?.find(c =>
@@ -492,7 +508,7 @@ export default function LyricsAnalyzer({ data: initialData, onFileLoad, apiClien
                 });
             }
         }
-    }, [data, effectiveMode, setModalContent]);
+    }, [data, effectiveMode, setModalContent, handleFlash, deleteWord]);
     const handleUpdateSegment = useCallback((updatedSegment: LyricsSegment) => {
         if (!editModalSegment) return

lyrics_transcriber/frontend/src/components/ModeSelector.tsx CHANGED Viewed

@@ -1,6 +1,7 @@
-import { ToggleButton, ToggleButtonGroup, Box, Typography } from '@mui/material';
+import { ToggleButton, ToggleButtonGroup, Box, Typography, Tooltip } from '@mui/material';
 import HighlightIcon from '@mui/icons-material/Highlight';
 import EditIcon from '@mui/icons-material/Edit';
+import DeleteIcon from '@mui/icons-material/Delete';
 import { InteractionMode } from '../types';
 interface ModeSelectorProps {
@@ -17,7 +18,7 @@ export default function ModeSelector({ effectiveMode, onChange }: ModeSelectorPr
             <ToggleButtonGroup
                 value={effectiveMode}
                 exclusive
-                onChange={(_, newMode) => newMode && onChange(newMode)}
+                onChange={(_, newMode) => newMode === 'edit' && onChange(newMode)}
                 size="small"
                 sx={{
                     height: '32px',
@@ -28,20 +29,38 @@ export default function ModeSelector({ effectiveMode, onChange }: ModeSelectorPr
                     }
                 }}
             >
-                <ToggleButton
-                    value="edit"
-                    title="Click to edit segments and make corrections in the transcription view"
-                >
-                    <EditIcon sx={{ mr: 0.5, fontSize: '1rem' }} />
-                    Edit
-                </ToggleButton>
-                <ToggleButton
-                    value="highlight"
-                    title="Click words in the transcription view to highlight the matching anchor sequence in the reference lyrics. You can also hold SHIFT to temporarily activate this mode."
-                >
-                    <HighlightIcon sx={{ mr: 0.5, fontSize: '1rem' }} />
-                    Highlight
-                </ToggleButton>
+                <Tooltip title="Default mode; click words to edit that lyrics segment">
+                    <ToggleButton
+                        value="edit"
+                    >
+                        <EditIcon sx={{ mr: 0.5, fontSize: '1rem' }} />
+                        Edit
+                    </ToggleButton>
+                </Tooltip>
+                <Tooltip title="Hold SHIFT and click words to highlight the matching anchor sequence in the reference lyrics">
+                    <span>
+                        <ToggleButton
+                            value="highlight"
+                            disabled
+                        >
+                            <HighlightIcon sx={{ mr: 0.5, fontSize: '1rem' }} />
+                            Highlight
+                        </ToggleButton>
+                    </span>
+                </Tooltip>
+                <Tooltip title="Hold CTRL and click words to delete them">
+                    <span>
+                        <ToggleButton
+                            value="delete_word"
+                            disabled
+                        >
+                            <DeleteIcon sx={{ mr: 0.5, fontSize: '1rem' }} />
+                            Delete
+                        </ToggleButton>
+                    </span>
+                </Tooltip>
             </ToggleButtonGroup>
         </Box>
     );

lyrics_transcriber/frontend/src/components/shared/hooks/useWordClick.ts CHANGED Viewed

@@ -97,7 +97,7 @@ export function useWordClick({
             }
         }
-        if (mode === 'highlight' || mode === 'edit') {
+        if (mode === 'highlight' || mode === 'edit' || mode === 'delete_word') {
             if (belongsToAnchor && anchor) {
                 onWordClick?.({
                     word_id: wordId,
@@ -131,7 +131,8 @@ export function useWordClick({
                     gap: undefined
                 })
             }
-        } else if (mode === 'details') {
+        } else {
+            // This is a fallback for any future modes
             if (belongsToAnchor && anchor) {
                 onElementClick({
                     type: 'anchor',

lyrics_transcriber/frontend/src/components/shared/utils/keyboardHandlers.ts CHANGED Viewed

@@ -35,6 +35,16 @@ export const setupKeyboardHandlers = (state: KeyboardState) => {
         console.log(`Setting up keyboard handlers [${handlerId}]`)
     }
+    // Function to reset modifier key states
+    const resetModifierStates = () => {
+        if (debugLog) {
+            console.log(`Resetting modifier states [${handlerId}]`)
+        }
+        state.setIsShiftPressed(false)
+        state.setIsCtrlPressed?.(false)
+        document.body.style.userSelect = ''
+    }
     const handleKeyDown = (e: KeyboardEvent) => {
         if (debugLog) {
             console.log(`Keyboard event captured [${handlerId}]`, {
@@ -59,7 +69,7 @@ export const setupKeyboardHandlers = (state: KeyboardState) => {
         if (e.key === 'Shift') {
             state.setIsShiftPressed(true)
             document.body.style.userSelect = 'none'
-        } else if (e.key === 'Meta') {
+        } else if (e.key === 'Control' || e.key === 'Ctrl' || e.key === 'Meta') {
             state.setIsCtrlPressed?.(true)
         } else if (e.key === ' ' || e.code === 'Space') {
             if (debugLog) {
@@ -102,12 +112,11 @@ export const setupKeyboardHandlers = (state: KeyboardState) => {
             })
         }
-        if (e.key === 'Shift') {
-            state.setIsShiftPressed(false)
-            document.body.style.userSelect = ''
-        } else if (e.key === 'Meta') {
-            state.setIsCtrlPressed?.(false)
-        } else if (e.key === ' ' || e.code === 'Space') {
+        // Always reset the modifier states regardless of the key which was released
+        // to help prevent accidentally getting stuck in a mode or accidentally deleting words
+        resetModifierStates()
+        if (e.key === ' ' || e.code === 'Space') {
             if (debugLog) {
                 console.log('Keyboard handler - Spacebar released', {
                     modalOpen: isModalOpen,
@@ -128,7 +137,35 @@ export const setupKeyboardHandlers = (state: KeyboardState) => {
         }
     }
-    return { handleKeyDown, handleKeyUp }
+    // Handle window blur event (user switches tabs or apps)
+    const handleWindowBlur = () => {
+        if (debugLog) {
+            console.log(`Window blur detected [${handlerId}], resetting modifier states`)
+        }
+        resetModifierStates()
+    }
+    // Handle window focus event (user returns to the app)
+    const handleWindowFocus = () => {
+        if (debugLog) {
+            console.log(`Window focus detected [${handlerId}], ensuring modifier states are reset`)
+        }
+        resetModifierStates()
+    }
+    // Add window event listeners
+    window.addEventListener('blur', handleWindowBlur)
+    window.addEventListener('focus', handleWindowFocus)
+    // Return a cleanup function that includes removing the window event listeners
+    return {
+        handleKeyDown,
+        handleKeyUp,
+        cleanup: () => {
+            window.removeEventListener('blur', handleWindowBlur)
+            window.removeEventListener('focus', handleWindowFocus)
+        }
+    }
 }
 // Export these for external use

lyrics_transcriber/frontend/src/components/shared/utils/segmentOperations.ts CHANGED Viewed

@@ -310,4 +310,51 @@ export function findAndReplace(
     newData.corrected_segments = newData.corrected_segments.filter(segment => segment.words.length > 0);
     return newData
+}
+/**
+ * Deletes a word from a segment in the correction data
+ * @param data The correction data
+ * @param wordId The ID of the word to delete
+ * @returns Updated correction data with the word removed
+ */
+export function deleteWord(
+    data: CorrectionData,
+    wordId: string
+): CorrectionData {
+    // Find the segment containing this word
+    const segmentIndex = data.corrected_segments.findIndex(segment =>
+        segment.words.some(word => word.id === wordId)
+    );
+    if (segmentIndex === -1) {
+        // Word not found, return data unchanged
+        return data;
+    }
+    const segment = data.corrected_segments[segmentIndex];
+    const wordIndex = segment.words.findIndex(word => word.id === wordId);
+    if (wordIndex === -1) {
+        // Word not found in segment (shouldn't happen), return data unchanged
+        return data;
+    }
+    // Create a new segment with the word removed
+    const updatedWords = segment.words.filter((_, index) => index !== wordIndex);
+    if (updatedWords.length > 0) {
+        // Update the segment with the word removed
+        const updatedSegment = {
+            ...segment,
+            words: updatedWords,
+            text: updatedWords.map(w => w.text).join(' ')
+        };
+        // Update the data
+        return updateSegment(data, segmentIndex, updatedSegment);
+    } else {
+        // If the segment would be empty, delete the entire segment
+        return deleteSegment(data, segmentIndex);
+    }
 }

lyrics_transcriber/frontend/src/types.ts CHANGED Viewed

@@ -136,4 +136,4 @@ export interface HighlightInfo {
     correction?: WordCorrection
 }
-export type InteractionMode = 'highlight' | 'edit'
+export type InteractionMode = 'highlight' | 'edit' | 'delete_word'

{lyrics_transcriber-0.46.0.dist-info → lyrics_transcriber-0.47.0.dist-info}/METADATA RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lyrics-transcriber
-Version: 0.46.0
+Version: 0.47.0
 Summary: Automatically create synchronised lyrics files in ASS and MidiCo LRC formats with word-level timestamps, using Whisper and lyrics from Genius and Spotify
 License: MIT
 Author: Andrew Beveridge

lyrics-transcriber 0.46.0__py3-none-any.whl → 0.47.0__py3-none-any.whl

lyrics-transcriber 0.46.0py3-none-any.whl → 0.47.0py3-none-any.whl