Fix Bookmark pinning numbers

mrfragger · mrfragger · commit 9fbda0758316 · 2026-01-03T16:51:33.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -56,6 +56,14 @@ windows/runner/Resources/bin/
 **/generated_plugins.cmake
 **/GeneratedPluginRegistrant.swift
 
+# Ignore all binaries in assets
+assets/bin/**/*
+assets/whisper/**/*
+
+# But keep the .gitkeep files
+!assets/bin/**/.gitkeep
+!assets/whisper/**/.gitkeep
+
 # macOS Pods
 macos/Pods/
 macos/Podfile.lock
diff --git a/lib/models/bookmark.dart b/lib/models/bookmark.dart
@@ -28,6 +28,7 @@ class Bookmark {
     DateTime? created,
     String? note,
     int? pinNumber,
+    bool clearPin = false,
   }) {
     return Bookmark(
       audiobookPath: audiobookPath ?? this.audiobookPath,
@@ -37,7 +38,7 @@ class Bookmark {
       position: position ?? this.position,
       created: created ?? this.created,
       note: note ?? this.note,
-      pinNumber: pinNumber ?? this.pinNumber,
+      pinNumber: clearPin ? null : (pinNumber ?? this.pinNumber),
     );
   }
 
diff --git a/lib/models/encoding_config.dart b/lib/models/encoding_config.dart
@@ -23,10 +23,14 @@ class EncodingConfig {
     final filters = <String>[];
     
     if (removeSilence && silenceDb != null) {
+      // Remove silence from START of audio
       filters.add(
-        'silenceremove=start_periods=0:stop_periods=-1:'
-        'start_threshold=-${silenceDb}dB:stop_threshold=-${silenceDb}dB:'
-        'start_silence=1:start_duration=0:stop_duration=1:detection=rms'
+        'silenceremove=start_periods=1:start_threshold=-${silenceDb}dB:start_silence=0:start_duration=0:detection=rms'
+      );
+      
+      // Remove silence from END and MIDDLE of audio
+      filters.add(
+        'silenceremove=start_periods=0:stop_periods=-1:stop_threshold=-${silenceDb}dB:stop_duration=1:detection=rms'
       );
     }
     
diff --git a/lib/screens/player_screen.dart b/lib/screens/player_screen.dart
@@ -305,7 +305,6 @@ class _PlayerScreenState extends State<PlayerScreen> {
         _currentPosition = position;
       });
       _checkChapterBoundary(position);
-      _checkSleepTimer();
       _checkPauseTrigger();
       _updateCurrentSubtitle();
       if (_isPlaying && position.inSeconds % 10 == 0) {
@@ -849,46 +848,81 @@ class _PlayerScreenState extends State<PlayerScreen> {
     }).toList();
   }
 
-  void _checkSleepTimer() {
-    if (_sleepDuration == null) return;
-    if (_sleepDuration == Duration.zero) {
-      final chapter = _currentAudiobook!.chapters[_currentChapterIndex];
-      if (_currentPosition >= chapter.endTime) {
-        exit(0);
-      }
-    } else if (_sleepDuration!.inMinutes == -1) {
-      if (_currentPosition >= _totalDuration) {
-        exit(0);
-      }
-    }
-  }
-
   void _setSleepTimer(Duration? duration) {
     _sleepTimer?.cancel();
-    if (duration == null) {
+    _sleepTimer = null;
+    
+    if (duration == null || duration.inSeconds == -1) {
       setState(() {
         _sleepDuration = null;
       });
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(
+            content: Text('Sleep timer off'),
+            duration: Duration(seconds: 1),
+          ),
+        );
+      }
       return;
     }
+    
     if (duration == Duration.zero) {
+      if (_currentAudiobook == null) return;
+      final currentChapter = _currentAudiobook!.chapters[_currentChapterIndex];
+      final timeUntilChapterEnd = currentChapter.endTime - _currentPosition;
       setState(() {
         _sleepDuration = Duration.zero;
       });
+      _sleepTimer = Timer(timeUntilChapterEnd, () {
+        exit(0);
+      });
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(
+            content: Text('Sleep timer: Chapter end'),
+            duration: Duration(seconds: 1),
+          ),
+        );
+      }
       return;
     }
+    
     if (duration.inMinutes == -1) {
+      if (_currentAudiobook == null) return;
+      final lastChapter = _currentAudiobook!.chapters.last;
+      final timeUntilBookEnd = lastChapter.endTime - _currentPosition;
       setState(() {
         _sleepDuration = Duration(minutes: -1);
       });
+      _sleepTimer = Timer(timeUntilBookEnd, () {
+        exit(0);
+      });
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(
+            content: Text('Sleep timer: End of audiobook'),
+            duration: Duration(seconds: 1),
+          ),
+        );
+      }
       return;
     }
+    
     setState(() {
       _sleepDuration = duration;
     });
     _sleepTimer = Timer(duration, () {
       exit(0);
     });
+    if (mounted) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text('Sleep timer: ${duration.inMinutes} minutes'),
+          duration: const Duration(seconds: 1),
+        ),
+      );
+    }
   }
 
   Color _adjustColorIfBright(String hexColor) {
@@ -1820,18 +1854,28 @@ class _PlayerScreenState extends State<PlayerScreen> {
 
   Future<void> _addBookmark() async {
     if (_currentAudiobook == null) return;
+    
     final currentChapter = _currentAudiobook!.chapters[_currentChapterIndex];
+    final timeFromChapterStart = _currentPosition - currentChapter.startTime;
     final timeUntilChapterEnd = currentChapter.endTime - _currentPosition;
+    
     Duration bookmarkPosition = _currentPosition;
     int bookmarkChapterIndex = _currentChapterIndex;
     String bookmarkChapterTitle = currentChapter.title;
-    if (timeUntilChapterEnd.inSeconds <= 10 && 
+    
+    if (timeFromChapterStart.inSeconds <= 10) {
+      bookmarkPosition = currentChapter.startTime;
+      bookmarkChapterTitle = currentChapter.title;
+      bookmarkChapterIndex = _currentChapterIndex;
+    }
+    else if (timeUntilChapterEnd.inSeconds <= 10 && 
         _currentChapterIndex < _currentAudiobook!.chapters.length - 1) {
       bookmarkChapterIndex = _currentChapterIndex + 1;
       final nextChapter = _currentAudiobook!.chapters[bookmarkChapterIndex];
       bookmarkPosition = nextChapter.startTime;
       bookmarkChapterTitle = nextChapter.title;
     }
+    
     final bookmark = Bookmark(
       audiobookPath: _currentAudiobook!.path,
       audiobookTitle: _currentAudiobook!.title,
@@ -1840,15 +1884,21 @@ class _PlayerScreenState extends State<PlayerScreen> {
       position: bookmarkPosition,
       created: DateTime.now(),
     );
+    
     setState(() {
       _bookmarks.insert(0, bookmark);
     });
     await _saveBookmarks();
+    
     if (mounted) {
       ScaffoldMessenger.of(context).showSnackBar(
-        const SnackBar(
-          content: Text('Bookmark added'),
-          duration: Duration(seconds: 1),
+        SnackBar(
+          content: Text(
+            timeFromChapterStart.inSeconds <= 10 || timeUntilChapterEnd.inSeconds <= 10
+                ? 'Bookmark added (snapped to chapter start)'
+                : 'Bookmark added'
+          ),
+          duration: const Duration(seconds: 1),
         ),
       );
     }
@@ -3357,6 +3407,9 @@ class _PlayerScreenState extends State<PlayerScreen> {
           } else if (event.logicalKey == LogicalKeyboardKey.keyY && event is KeyDownEvent) {
             _toggleFullscreen();
             return KeyEventResult.handled;
+          } else if (event.logicalKey == LogicalKeyboardKey.keyZ && event is KeyDownEvent) {
+            _setSleepTimer(Duration.zero);
+            return KeyEventResult.handled;
           } else if (event.logicalKey == LogicalKeyboardKey.keyA && event is KeyDownEvent) {
             _applyDefaultSettings();
             return KeyEventResult.handled;
@@ -4525,12 +4578,65 @@ class _PlayerScreenState extends State<PlayerScreen> {
     return '';
   }
 
-  Future<void> _setPinNumber(int bookmarkIndex, int? pinNumber) async {
-    final bookmark = _bookmarks[bookmarkIndex].copyWith(pinNumber: pinNumber);
+  Future<void> _setPinNumber(int displayIndex, int? pinNumber) async {
+    // Get the filtered bookmarks list
+    final filteredBookmarks = _getFilteredBookmarks();
+    
+    // The displayIndex from the UI might be 1-indexed or include a header
+    // Let's use the actual index directly
+    if (displayIndex >= filteredBookmarks.length) return;
+    
+    // Get the actual bookmark from the filtered list
+    final targetBookmark = filteredBookmarks[displayIndex];
+    
+    // Find the index of this bookmark in the full _bookmarks list
+    final actualIndex = _bookmarks.indexWhere((b) => 
+      b.audiobookPath == targetBookmark.audiobookPath &&
+      b.chapterIndex == targetBookmark.chapterIndex &&
+      b.position == targetBookmark.position &&
+      b.created == targetBookmark.created
+    );
+    
+    if (actualIndex == -1) return;
+    
+    // Debug print to verify
+    print('Display index: $displayIndex, Actual index: $actualIndex');
+    print('Target bookmark: ${targetBookmark.chapterTitle}');
+    
     setState(() {
-      _bookmarks[bookmarkIndex] = bookmark;
+      // If setting a pin number (not null), first check if another bookmark already has this pin
+      if (pinNumber != null) {
+        // Find if any other bookmark has this pin number
+        for (int i = 0; i < _bookmarks.length; i++) {
+          if (i != actualIndex && _bookmarks[i].pinNumber == pinNumber) {
+            // Remove the pin from the other bookmark
+            _bookmarks[i] = _bookmarks[i].copyWith(clearPin: true);
+          }
+        }
+      }
+      
+      // Now set the pin for the requested bookmark
+      if (pinNumber == null) {
+        _bookmarks[actualIndex] = _bookmarks[actualIndex].copyWith(clearPin: true);
+      } else {
+        _bookmarks[actualIndex] = _bookmarks[actualIndex].copyWith(pinNumber: pinNumber);
+      }
     });
+    
     await _saveBookmarks();
+    
+    if (mounted) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text(
+            pinNumber == null 
+              ? 'Bookmark unpinned: ${targetBookmark.chapterTitle}' 
+              : 'Bookmark pinned to $pinNumber: ${targetBookmark.chapterTitle}'
+          ),
+          duration: const Duration(seconds: 2),
+        ),
+      );
+    }
   }
 
   Future<void> _jumpToPinnedBookmark(int pinNumber) async {
@@ -4546,7 +4652,6 @@ class _PlayerScreenState extends State<PlayerScreen> {
   Future<void> _skipToPreviousSubtitle() async {
     if (_subtitles.isEmpty) return;
     
-    // Find current subtitle index first
     int currentIndex = -1;
     for (int i = 0; i < _subtitles.length; i++) {
       if (_subtitles[i].startTime <= _currentPosition && 
@@ -4556,7 +4661,6 @@ class _PlayerScreenState extends State<PlayerScreen> {
       }
     }
     
-    // Go to previous subtitle if it exists
     if (currentIndex > 0) {
       await _seekTo(_subtitles[currentIndex - 1].startTime);
     } else if (currentIndex == 0) {
diff --git a/lib/services/cjk_tokenizer.dart b/lib/services/cjk_tokenizer.dart
@@ -61,7 +61,6 @@ class CJKTokenizer {
       }
     }
     
-    // Determine language with priority
     TextLanguage detected;
     if (hasJapanese) {
       detected = TextLanguage.japanese;
@@ -70,7 +69,6 @@ class CJKTokenizer {
     } else if (hasChinese) {
       detected = TextLanguage.chinese;
     } else if (hasArabic && hasLatin) {
-      // Mixed Arabic/English - treat as Arabic so we don't filter short words
       detected = TextLanguage.arabic;
     } else if (hasLatin) {
       detected = TextLanguage.english;
@@ -80,7 +78,7 @@ class CJKTokenizer {
       detected = TextLanguage.unknown;
     }
     
-    print('🔍 Language Detection: "${text.substring(0, text.length > 50 ? 50 : text.length)}" -> $detected (hasArabic: $hasArabic, hasLatin: $hasLatin)');
+    // print('🔍 Language Detection: "${text.substring(0, text.length > 50 ? 50 : text.length)}" -> $detected (hasArabic: $hasArabic, hasLatin: $hasLatin)');
     
     return detected;
   }
diff --git a/lib/services/whisper_service.dart b/lib/services/whisper_service.dart
@@ -2,6 +2,7 @@ import 'dart:io';
 import 'dart:async';
 import 'package:path/path.dart' as path;
 import 'package:shared_preferences/shared_preferences.dart';
+import 'whisper_bundled.dart'; 
 
 class WhisperService {
   String? whisperExecutablePath;
@@ -23,7 +24,16 @@ class WhisperService {
   
   Future<void> initialize() async {
     final prefs = await SharedPreferences.getInstance();
-    whisperExecutablePath = prefs.getString('whisperExecutablePath');
+    
+    try {
+      whisperExecutablePath = await WhisperBundled.getWhisperExecutablePath();
+      await prefs.setString('whisperExecutablePath', whisperExecutablePath!);
+      print('✅ Using bundled whisper: $whisperExecutablePath');
+    } catch (e) {
+      print('⚠️ Could not find bundled whisper: $e');
+      whisperExecutablePath = prefs.getString('whisperExecutablePath');
+    }
+    
     modelDirectory = prefs.getString('whisperModelDirectory');
     language = prefs.getString('whisperLanguage') ?? 'auto';
     selectedModel = prefs.getString('whisperModel') ?? 'large-v3-turbo';
@@ -35,7 +45,7 @@ class WhisperService {
     customPrompt = prefs.getString('whisperPrompt') ?? customPrompt;
     translateToEnglish = prefs.getBool('whisperTranslate') ?? false;
   }
-  
+
   Future<void> saveSettings() async {
     final prefs = await SharedPreferences.getInstance();
     if (whisperExecutablePath != null) {
@@ -53,7 +63,7 @@ class WhisperService {
     await prefs.setString('whisperPrompt', customPrompt);
     await prefs.setBool('whisperTranslate', translateToEnglish);
   }
-  
+      
   Future<void> setWhisperExecutable(String path) async {
     whisperExecutablePath = path;
     await saveSettings();
@@ -449,7 +459,6 @@ class WhisperService {
     await _addWebvttHeader(stitchedTemp4, stitchedTemp2);
   
     final chapterName = path.basenameWithoutExtension(originalOpusPath);
-    // Return path in working dir (will be copied to encodedchapters root by caller)
     final finalVtt = path.join(workingDir, '$chapterName.vtt');
     await File(stitchedTemp2).copy(finalVtt);
   
diff --git a/lib/widgets/player_controls.dart b/lib/widgets/player_controls.dart
@@ -488,7 +488,7 @@ class PlayerControls extends StatelessWidget {
           onSelected: onSetSleepTimer,
           itemBuilder: (context) => [
             const PopupMenuItem(
-              value: null,
+              value: Duration(seconds: -1), 
               child: Text('Off'),
             ),
             const PopupMenuItem(
@@ -521,7 +521,7 @@ class PlayerControls extends StatelessWidget {
             ),
             const PopupMenuItem(
               value: Duration.zero,
-              child: Text('Chapter end'),
+              child: Text('Chapter end (z)'),
             ),
           ],
         ),
diff --git a/lib/widgets/side_panel.dart b/lib/widgets/side_panel.dart

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,6 @@ class CJKTokenizer {`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`64`		`- // Determine language with priority`
`65`	`64`	`TextLanguage detected;`
`66`	`65`	`if (hasJapanese) {`
`67`	`66`	`detected = TextLanguage.japanese;`
`@@ -70,7 +69,6 @@ class CJKTokenizer {`
`70`	`69`	`} else if (hasChinese) {`
`71`	`70`	`detected = TextLanguage.chinese;`
`72`	`71`	`} else if (hasArabic && hasLatin) {`
`73`		`- // Mixed Arabic/English - treat as Arabic so we don't filter short words`
`74`	`72`	`detected = TextLanguage.arabic;`
`75`	`73`	`} else if (hasLatin) {`
`76`	`74`	`detected = TextLanguage.english;`
`@@ -80,7 +78,7 @@ class CJKTokenizer {`
`80`	`78`	`detected = TextLanguage.unknown;`
`81`	`79`	`}`
`82`	`80`
`83`		`- print('🔍 Language Detection: "${text.substring(0, text.length > 50 ? 50 : text.length)}" -> $detected (hasArabic: $hasArabic, hasLatin: $hasLatin)');`
	`81`	`+ // print('🔍 Language Detection: "${text.substring(0, text.length > 50 ? 50 : text.length)}" -> $detected (hasArabic: $hasArabic, hasLatin: $hasLatin)');`
`84`	`82`
`85`	`83`	`return detected;`
`86`	`84`	`}`