release v0.2.2

umlx5h · umlx5h · commit 878511b03360 · 2025-05-24T23:58:07.000+09:00
diff --git a/FlyleafLib/MediaPlayer/SubtitlesManager.cs b/FlyleafLib/MediaPlayer/SubtitlesManager.cs
@@ -67,7 +67,7 @@ public class SubManager : INotifyPropertyChanged
 {
     private readonly Lock _locker = new();
     private CancellationTokenSource? _cts;
-    public SubtitleData? SelectedSub { get; set => Set(ref field, value); } = null;
+    public SubtitleData? SelectedSub { get; set => Set(ref field, value); }
     public int CurrentIndex { get; private set => Set(ref field, value); } = -1;
 
     public PositionState State
@@ -94,7 +94,7 @@ private set
     /// <summary>
     /// True when addition to Subs is running... (Reading all subtitles, OCR, ASR)
     /// </summary>
-    public bool IsLoading { get; private set => Set(ref field, value); } = false;
+    public bool IsLoading { get; private set => Set(ref field, value); }
 
     // LanguageSource with fallback
     public Language? Language
@@ -776,7 +776,7 @@ public void ReadAll(bool useBitmap, Action<SubtitleData> addSub, CancellationTok
                     string text = Utils.BytePtrToStringUTF8(sub.rects[0]->ass).Trim();
                     avsubtitle_free(&sub);
 
-                    subData.Text = ParseSubtitles.SSAtoSubStyles(text, out var subStyles);
+                    subData.Text = ParseSubtitles.SSAtoSubStyles(text, out var subStyles).Trim();
                     subData.SubStyles = subStyles;
 
                     if (string.IsNullOrEmpty(subData.Text))
@@ -1183,8 +1183,7 @@ protected override void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
 
     public void AddRange(IEnumerable<T> list)
     {
-        if (list == null)
-            ArgumentNullException.ThrowIfNull(list);
+        ArgumentNullException.ThrowIfNull(list);
 
         _suppressNotification = true;
 
diff --git a/LLPlayer/LLPlayer.csproj b/LLPlayer/LLPlayer.csproj
@@ -13,7 +13,7 @@
     <ApplicationIcon>LLPlayer.ico</ApplicationIcon>
     <Description>The media player for language learning.</Description>
     <PackageProjectUrl>https://llplayer.com</PackageProjectUrl>
-    <Version>0.2.1</Version>
+    <Version>0.2.2</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/LLPlayer/ViewModels/SubtitlesDownloaderDialogVM.cs b/LLPlayer/ViewModels/SubtitlesDownloaderDialogVM.cs
@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using System.IO;
 using FlyleafLib;
+using FlyleafLib.MediaFramework.MediaPlaylist;
 using FlyleafLib.MediaPlayer;
 using LLPlayer.Extensions;
 using LLPlayer.Services;
@@ -211,12 +212,24 @@ private void Playlist_OnPropertyChanged(object? sender, PropertyChangedEventArgs
             FL.Player.Playlist.Selected != null)
         {
             // Update query when video changes
-            string? title = FL.Player.Playlist.Selected.Title;
-            if (Query != title)
+            UpdateQuery(FL.Player.Playlist.Selected);
+        }
+    }
+
+    private void UpdateQuery(PlaylistItem selected)
+    {
+        string title = selected.Title;
+        if (title == selected.OriginalTitle && File.Exists(selected.Url))
+        {
+            FileInfo fi = new(selected.Url);
+            if (!string.IsNullOrEmpty(fi.Extension) && title.EndsWith(fi.Extension))
             {
-                Query = title;
+                // remove extension part
+                title = title[..^fi.Extension.Length];
             }
         }
+
+        Query = title;
     }
 
     #region IDialogAware
@@ -241,18 +254,7 @@ public void OnDialogOpened(IDialogParameters parameters)
         var selected = FL.Player.Playlist.Selected;
         if (selected != null)
         {
-            string title = selected.Title;
-            if (title == selected.OriginalTitle && File.Exists(selected.Url))
-            {
-                FileInfo fi = new(selected.Url);
-                if (!string.IsNullOrEmpty(fi.Extension) && title.EndsWith(fi.Extension))
-                {
-                    // remove extension part
-                    title = title[..^fi.Extension.Length];
-                }
-            }
-
-            Query = title;
+            UpdateQuery(selected);
         }
 
         // Register update playlist event
diff --git a/Plugins/YoutubeDL/YoutubeDL.cs b/Plugins/YoutubeDL/YoutubeDL.cs
@@ -380,7 +380,7 @@ private void NewPlaylistItem(string path)
                         const string suffix = "-orig";
 
                         string langCode = subtitle1.Key;
-                        bool isOriginal = langCode.EndsWith(suffix);
+                        bool isOriginal = langCode.EndsWith(suffix, StringComparison.OrdinalIgnoreCase);
 
                         if (isOriginal)
                         {
diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ LLPlayer has many features for language learning that are not available in norma
 - **Real-time Translation:** Supports [many translation engines](https://github.com/umlx5h/LLPlayer/wiki/Translation-Engine), such as Google, DeepL, Ollama, LM Studio, OpenAI.
 - **Context-aware Translation:** Highly accurate translation by recognizing the context of subtitles using LLM.
 - **Real-time OCR subtitles:** Can convert bitmap subtitles to text subtitles in real time, powered by [Tesseract OCR](https://github.com/tesseract-ocr/tesseract) and Microsoft OCR.
-- **Subtitles Sidebar:** Both text and bitmap are supported. Seek and word lookup available. Has anti-spoiler functionality.
+- **Subtitles Sidebar:** Both text and bitmap are supported. Seek and word lookup available. Also supports incremental subtitle search.
 - **Instant word lookup:** Word lookup and browser searches can be performed on subtitle text.
 - **Customizable Browser Search:** Browser searches can be performed from the context menu of a word, and the search site can be completely customized.
 - **Plays online videos:** With [yt-dlp](https://github.com/yt-dlp/yt-dlp) integration, any online video can be played back in real time, with AI subtitle generation, word lookups!
@@ -314,17 +314,20 @@ If you want to update, please download and copy it to the specified path.
 VLC is a general-purpose media player.  
 In contrast, LLPlayer has many useful features especially for language learning.
 
-|                                  | VLC                            | LLPlayer                          |
-| -------------------------------- | ------------------------------ | --------------------------------- |
-| Cross-Platform (Win, Linux, Mac) | ✔️                              | ❌                                 |
-| Auto-generated subtitles         | not yet (whisper.cpp)          | ✔️ (whisper.cpp, faster-whisper)   |
-| Real-time translation            | not yet (probably SeamlessM4T) | ✔️ (Google, DeepL, Ollama, OpenAI) |
-| Context-aware translation        | ❌ (probably)                   | ✔️ (by LLM)                        |
-| Word Translation                 | ❌                              | ✔️                                 |
-| Word Search                      | ❌                              | ✔️                                 |
-| Subtitle Sidebar                 | ❌                              | ✔️                                 |
-| Subtitle Seeking                 | ❌                              | ✔️                                 |
-| Dual Subtitles                   | ✔️ (awkward to use)             | ✔️                                 |
+|                                  | VLC                    | LLPlayer                        |
+| -------------------------------- | ---------------------- | ------------------------------- |
+| Cross-Platform (Win, Linux, Mac) | ✔️                      | ❌                               |
+| Auto-generated subtitles         | not yet (whisper.cpp)  | ✔️ (whisper.cpp, faster-whisper) |
+| Real-time translation            | not yet                | ✔️                               |
+| Local translation                | not yet (SeamlessM4t?) | ✔️ (Ollama, LM Studio)           |
+| Online translation               | ❌                      | ✔️ (Google, DeepL, OpenAI)       |
+| Context-aware translation        | ❌                      | ✔️ (by LLM)                      |
+| Word Translation                 | ❌                      | ✔️                               |
+| Word Search                      | ❌                      | ✔️                               |
+| Subtitle Sidebar                 | ❌                      | ✔️                               |
+| Incremental Subtitle Search      | ❌                      | ✔️                               |
+| Subtitle Seeking                 | ❌                      | ✔️                               |
+| Dual Subtitles                   | ✔️ (awkward to use)     | ✔️                               |
 
 #### Q: Why perform subtitle generation and translation in real time?
 

Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,7 @@ private void NewPlaylistItem(string path)`
`380`	`380`	`const string suffix = "-orig";`
`381`	`381`
`382`	`382`	`string langCode = subtitle1.Key;`
`383`		`- bool isOriginal = langCode.EndsWith(suffix);`
	`383`	`+ bool isOriginal = langCode.EndsWith(suffix, StringComparison.OrdinalIgnoreCase);`
`384`	`384`
`385`	`385`	`if (isOriginal)`
`386`	`386`	`{`