Release v0.1.3

Author: sioaeko

.gitignore

@@ -22,3 +22,6 @@ Thumbs.db
 
 # Temp
 package-lock.json
+
+# Local private notes
+LOCAL_WORKLOG.md

README.md

@@ -32,13 +32,12 @@
 |:-:|:-:|
 | ![Settings](docs/screenshots/setting.png) | ![macOS](docs/screenshots/macos.png) |
 
-## What's New In v0.1.2
+## What's New In v0.1.3
 
-- **Audio Playback Support** — Play local audio files with artwork detection and the same Handy/funscript workflow
-- **Default Timeline Visibility Settings** — Choose whether the timeline and heatmap start enabled when opening scripted media
-- **Cleaner First Launch** — New installs start with both timeline and heatmap turned off by default
-- **Custom Windows App Icon** — Restored custom executable icon and updated Windows metadata/version info
-- **Refined Player UI** — Improved title bar version badge and updated settings to match the new playback options
+- **Edge-To-Edge Fullscreen Video** — Fullscreen playback now fills the screen instead of leaving unused letterboxed space
+- **Auto-Hiding Fullscreen Controls** — The playback bar and scripted overlays fade away while playing so the video can use the full area
+- **Expanded Subtitle Detection** — Matching `.vtt`, `.srt`, or timestamped `.txt` files can now be detected from the media folder and common subtitle/script subfolders
+- **Version Sync Cleanup** — UI version badges now read directly from the app package version to keep releases aligned
 
 ## Features
 
@@ -66,7 +65,7 @@
 
 ### Windows
 
-1. Download the latest `ScriptPlayerPlus-0.1.2-Windows-x64.zip` from [Releases](https://github.com/sioaeko/scriptplayer-plus/releases)
+1. Download the latest `ScriptPlayerPlus-0.1.3-Windows-x64.zip` from [Releases](https://github.com/sioaeko/scriptplayer-plus/releases)
 2. Extract and run `ScriptPlayerPlus.exe` — no installation required
 
 ### macOS

docs/README_JA.md

@@ -32,13 +32,12 @@
 |:-:|:-:|
 | ![設定](screenshots/setting.png) | ![macOS](screenshots/macos.png) |
 
-## v0.1.2 の追加内容
+## v0.1.3 の追加内容
 
-- **オーディオ再生対応** — アートワーク検出付きでローカル音声ファイルを再生し、既存の Handy / funscript ワークフローをそのまま使えます
-- **タイムライン / ヒートマップの初期表示設定** — スクリプト付きメディアを開いたときに、タイムラインとヒートマップを初期表示するか設定できます
-- **初回状態の整理** — 新規インストール時はタイムラインとヒートマップがどちらもオフで始まります
-- **Windows アイコンの復元** — カスタム実行ファイルアイコンと Windows メタデータを再適用しました
-- **プレーヤー UI の調整** — バージョンバッジと設定画面を新機能に合わせて改善しました
+- **全画面表示の改善** — 全画面再生時に映像がより画面いっぱいに表示されるようになりました
+- **全画面コントロールの自動非表示** — 再生中は再生バーとスクリプトオーバーレイが徐々に消え、映像を全面で表示できます
+- **字幕検出の拡張** — メディアフォルダや字幕/スクリプト用サブフォルダ内の `.vtt`、`.srt`、タイムスタンプ付き `.txt` を自動検出して表示します
+- **バージョン表示の同期** — タイトルバーと設定画面のバージョン表記をアプリのパッケージ版数と同期しました
 
 ## 主な機能
 
@@ -66,7 +65,7 @@
 
 ### Windows
 
-1. [Releases](https://github.com/sioaeko/scriptplayer-plus/releases)から最新の `ScriptPlayerPlus-0.1.2-Windows-x64.zip` をダウンロード
+1. [Releases](https://github.com/sioaeko/scriptplayer-plus/releases)から最新の `ScriptPlayerPlus-0.1.3-Windows-x64.zip` をダウンロード
 2. 解凍して`ScriptPlayerPlus.exe`を実行 — インストール不要
 
 ### macOS

docs/README_KO.md

@@ -32,13 +32,12 @@
 |:-:|:-:|
 | ![설정](screenshots/setting_kor.png) | ![macOS](screenshots/macos.png) |
 
-## v0.1.2에서 추가된 내용
+## v0.1.3에서 추가된 내용
 
-- **오디오 재생 지원** — 앨범 아트 감지와 함께 로컬 오디오 파일을 재생하고 기존 Handy / funscript 흐름을 그대로 사용할 수 있습니다
-- **기본 타임라인 / 히트맵 표시 설정** — 스크립트가 있는 미디어를 열 때 타임라인과 히트맵을 기본으로 켤지 설정에서 선택할 수 있습니다
-- **더 깔끔한 초기 상태** — 새 설치 기준으로 타임라인과 히트맵은 둘 다 꺼진 상태에서 시작합니다
-- **커스텀 Windows 아이콘 복원** — 실행 파일 아이콘과 Windows 메타데이터를 다시 정리했습니다
-- **플레이어 UI 정리** — 버전 배지와 설정 화면이 새 기능에 맞게 다듬어졌습니다
+- **전체화면 영상 채우기 개선** — 전체화면 재생 시 영상이 화면을 더 꽉 채우도록 표시 방식을 조정했습니다
+- **전체화면 컨트롤 자동 숨김** — 재생 중에는 재생바와 스크립트 오버레이가 서서히 사라져 영상 영역을 온전히 사용할 수 있습니다
+- **확장된 자막 탐지** — 미디어 폴더와 자막/스크립트 하위 폴더의 `.vtt`, `.srt`, 타임스탬프형 `.txt` 자막을 자동으로 찾아 표시합니다
+- **버전 표시 동기화** — 타이틀바와 설정 화면의 버전 배지가 앱 패키지 버전과 항상 같도록 정리했습니다
 
 ## 주요 기능
 
@@ -66,7 +65,7 @@
 
 ### Windows
 
-1. [Releases](https://github.com/sioaeko/scriptplayer-plus/releases)에서 최신 `ScriptPlayerPlus-0.1.2-Windows-x64.zip` 다운로드
+1. [Releases](https://github.com/sioaeko/scriptplayer-plus/releases)에서 최신 `ScriptPlayerPlus-0.1.3-Windows-x64.zip` 다운로드
 2. 압축 해제 후 `ScriptPlayerPlus.exe` 실행 — 설치 불필요
 
 ### macOS

docs/README_ZH.md

@@ -32,13 +32,12 @@
 |:-:|:-:|
 | ![设置](screenshots/setting.png) | ![macOS](screenshots/macos.png) |
 
-## v0.1.2 新增内容
+## v0.1.3 新增内容
 
-- **音频播放支持** — 现在可以播放本地音频文件，并自动检测封面图，同时保留原有 Handy / funscript 工作流
-- **时间线 / 热力图默认显示设置** — 可以在设置中决定打开带脚本的媒体时是否默认显示时间线和热力图
-- **更干净的初始状态** — 新安装时，时间线和热力图默认都处于关闭状态
-- **恢复自定义 Windows 图标** — 重新应用了自定义可执行文件图标和 Windows 元数据
-- **播放器 UI 调整** — 版本徽标和设置界面已经根据新功能做了整理
+- **全屏铺满显示** — 全屏播放时，视频现在会更完整地铺满整个屏幕
+- **全屏控件自动隐藏** — 播放过程中，进度条和脚本叠层会逐渐淡出，让视频占满可用区域
+- **扩展字幕检测** — 现在会自动从媒体文件夹以及常见字幕/脚本子文件夹中查找 `.vtt`、`.srt` 和带时间戳的 `.txt` 字幕
+- **版本显示同步** — 标题栏和设置页中的版本徽标现在会直接跟随应用包版本
 
 ## 主要功能
 
@@ -66,7 +65,7 @@
 
 ### Windows
 
-1. 从 [Releases](https://github.com/sioaeko/scriptplayer-plus/releases) 下载最新的 `ScriptPlayerPlus-0.1.2-Windows-x64.zip`
+1. 从 [Releases](https://github.com/sioaeko/scriptplayer-plus/releases) 下载最新的 `ScriptPlayerPlus-0.1.3-Windows-x64.zip`
 2. 解压后运行 `ScriptPlayerPlus.exe` — 无需安装
 
 ### macOS

electron/main.ts

@@ -10,6 +10,33 @@ const VIDEO_EXTS = ['.mp4', '.mkv', '.avi', '.webm', '.mov', '.wmv']
 const AUDIO_EXTS = ['.mp3', '.wav', '.flac', '.m4a', '.aac', '.ogg', '.opus', '.wma']
 const MEDIA_EXTS = [...VIDEO_EXTS, ...AUDIO_EXTS]
 const IMAGE_EXTS = ['.jpg', '.jpeg', '.png', '.webp', '.gif', '.bmp']
+const SUBTITLE_EXTS = ['.vtt', '.srt', '.txt']
+const SUBTITLE_DIR_KEYWORDS = [
+  'script',
+  'scripts',
+  'subtitle',
+  'subtitles',
+  'subs',
+  'caption',
+  'captions',
+  'lyric',
+  'lyrics',
+  'transcript',
+  'translation',
+  'translated',
+  '자막',
+  '대본',
+  '번역',
+  '스크립트',
+  '가사',
+  '字幕',
+  '翻译',
+  '翻譯',
+  '脚本',
+  '歌詞',
+  '歌词',
+]
+const MAX_SUBTITLE_SEARCH_DEPTH = 2
 
 let mainWindow: BrowserWindow | null = null
 
@@ -176,6 +203,25 @@ ipcMain.handle('fs:findArtwork', async (_event, mediaPath: string) => {
   }
 })
 
+ipcMain.handle('fs:readSubtitles', async (_event, mediaPath: string) => {
+  try {
+    return findSubtitleFilesForMedia(mediaPath)
+      .map((subtitlePath) => {
+        try {
+          return {
+            path: subtitlePath,
+            content: readSubtitleContent(subtitlePath),
+          }
+        } catch {
+          return null
+        }
+      })
+      .filter((entry): entry is { path: string; content: string } => entry !== null)
+  } catch {
+    return []
+  }
+})
+
 // ============================================================
 // NAS (WebDAV / FTP) Service
 // ============================================================
@@ -227,6 +273,110 @@ function findArtworkForMedia(mediaPath: string): string | null {
   return path.join(dir, images[0])
 }
 
+function findSubtitleFilesForMedia(mediaPath: string): string[] {
+  const mediaDir = path.dirname(mediaPath)
+  const ext = path.extname(mediaPath)
+  const baseName = path.basename(mediaPath, ext).toLowerCase()
+
+  return collectSubtitleCandidates(mediaDir)
+    .map((filePath) => ({
+      filePath,
+      score: scoreSubtitleCandidate(filePath, mediaDir, baseName),
+    }))
+    .sort((a, b) => b.score - a.score || a.filePath.localeCompare(b.filePath))
+    .map(({ filePath }) => filePath)
+}
+
+function collectSubtitleCandidates(rootDir: string): string[] {
+  const results = new Set<string>()
+  const visited = new Set<string>()
+
+  const walk = (currentDir: string, depth: number, matchedKeyword: boolean) => {
+    if (visited.has(currentDir)) return
+    visited.add(currentDir)
+
+    let entries: fs.Dirent[]
+    try {
+      entries = fs.readdirSync(currentDir, { withFileTypes: true })
+    } catch {
+      return
+    }
+
+    for (const entry of entries) {
+      if (!entry.isFile()) continue
+      const ext = path.extname(entry.name).toLowerCase()
+      if (SUBTITLE_EXTS.includes(ext)) {
+        results.add(path.join(currentDir, entry.name))
+      }
+    }
+
+    if (depth >= MAX_SUBTITLE_SEARCH_DEPTH) return
+
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue
+      const nextMatchedKeyword = matchedKeyword || directoryLooksLikeSubtitle(entry.name)
+      const shouldDescend = depth === 0 || nextMatchedKeyword
+      if (!shouldDescend) continue
+      walk(path.join(currentDir, entry.name), depth + 1, nextMatchedKeyword)
+    }
+  }
+
+  walk(rootDir, 0, false)
+  return Array.from(results)
+}
+
+function directoryLooksLikeSubtitle(name: string): boolean {
+  const normalized = name.toLowerCase()
+  return SUBTITLE_DIR_KEYWORDS.some((keyword) => normalized.includes(keyword))
+}
+
+function scoreSubtitleCandidate(filePath: string, mediaDir: string, baseName: string): number {
+  const ext = path.extname(filePath).toLowerCase()
+  const stem = path.basename(filePath, ext).toLowerCase()
+  const fileName = path.basename(filePath).toLowerCase()
+  const relativeDir = path.relative(mediaDir, path.dirname(filePath)).toLowerCase()
+
+  let score = 0
+
+  if (ext === '.vtt') score += 400
+  else if (ext === '.srt') score += 320
+  else if (ext === '.txt') score += 240
+
+  if (path.dirname(filePath) === mediaDir) score += 120
+  if (stem === baseName) score += 1200
+  else if (stem.startsWith(`${baseName}.`)) score += 950
+  else if (stem.includes(baseName)) score += 700
+
+  if (directoryLooksLikeSubtitle(relativeDir)) score += 180
+  if (fileName.includes('subtitle') || fileName.includes('caption') || fileName.includes('lyrics')) score += 80
+  if (fileName.includes('자막') || fileName.includes('대본') || fileName.includes('번역')) score += 80
+
+  return score
+}
+
+function readSubtitleContent(filePath: string): string {
+  const buffer = fs.readFileSync(filePath)
+  const utf8 = buffer.toString('utf-8')
+  const utf8ReplacementCount = countReplacementChars(utf8)
+
+  if (utf8ReplacementCount === 0) {
+    return utf8
+  }
+
+  try {
+    const eucKr = new TextDecoder('euc-kr').decode(buffer)
+    if (countReplacementChars(eucKr) < utf8ReplacementCount) {
+      return eucKr
+    }
+  } catch {}
+
+  return utf8
+}
+
+function countReplacementChars(value: string): number {
+  return (value.match(/\uFFFD/g) ?? []).length
+}
+
 // ---- WebDAV helpers (raw HTTP) ----
 
 function webdavRequest(

electron/preload.ts

@@ -18,6 +18,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
   saveFunscript: (videoPath: string, data: string) => ipcRenderer.invoke('fs:saveFunscript', videoPath, data),
   getVideoUrl: (filePath: string) => ipcRenderer.invoke('fs:getVideoUrl', filePath),
   findArtwork: (mediaPath: string) => ipcRenderer.invoke('fs:findArtwork', mediaPath),
+  readSubtitles: (mediaPath: string) => ipcRenderer.invoke('fs:readSubtitles', mediaPath),
 
   // NAS operations
   nasWebdavConnect: (url: string, username: string, password: string) =>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "scriptplayer-plus",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "ScriptPlayer+ - Funscript video player with Handy integration",
   "license": "MIT",
   "main": "dist-electron/main.js",

src/App.tsx

@@ -3,10 +3,11 @@ import TitleBar from './components/TitleBar'
 import Sidebar from './components/Sidebar'
 import VideoPlayer from './components/VideoPlayer'
 import Settings from './components/Settings'
-import { VideoFile, Funscript, FunscriptAction, MediaType } from './types'
+import { VideoFile, Funscript, FunscriptAction, MediaType, SubtitleCue, SubtitleFile } from './types'
 import { parseFunscript } from './services/funscript'
 import { handyService, HandyUploadStatus } from './services/handy'
 import { AppSettings, loadSettings, saveSettings } from './services/settings'
+import { parseSubtitleFile } from './services/subtitles'
 import { useTranslation } from './i18n'
 
 const VIDEO_EXTS = ['.mp4', '.mkv', '.avi', '.webm', '.mov', '.wmv']
@@ -27,6 +28,7 @@ export default function App() {
   const [currentFileType, setCurrentFileType] = useState<MediaType | null>(null)
   const [artworkUrl, setArtworkUrl] = useState<string | null>(null)
   const [funscript, setFunscript] = useState<Funscript | null>(null)
+  const [subtitleCues, setSubtitleCues] = useState<SubtitleCue[]>([])
   const [handyConnected, setHandyConnected] = useState(false)
   const [scriptUploadUrl, setScriptUploadUrl] = useState<string | null>(null)
   const [handyUploadStatus, setHandyUploadStatus] = useState<HandyUploadStatus>('idle')
@@ -70,6 +72,9 @@ export default function App() {
 
     setCurrentFile(filePath)
     setCurrentFileType(resolvedType)
+    setFunscript(null)
+    setSubtitleCues([])
+    setScriptUploadUrl(null)
 
     const url = await window.electronAPI.getVideoUrl(filePath)
     setVideoUrl(url)
@@ -83,10 +88,12 @@ export default function App() {
       }
     }
 
+    const subtitleFiles = await window.electronAPI.readSubtitles(filePath)
+    setSubtitleCues(selectSubtitleCues(subtitleFiles))
+
     const script = await window.electronAPI.readFunscript(filePath, settings.scriptFolder)
     const parsed = script ? parseFunscript(script) : null
     setFunscript(parsed)
-    setScriptUploadUrl(null)
 
     if (parsed && handyService.isConnected) {
       uploadToHandy(parsed.actions)
@@ -224,6 +231,7 @@ export default function App() {
           currentFileName={currentFile ? getFileName(currentFile) : null}
           artworkUrl={artworkUrl}
           actions={actions}
+          subtitleCues={subtitleCues}
           onTimeUpdate={handleTimeUpdate}
           onPlay={handlePlay}
           onPause={handlePause}
@@ -235,6 +243,7 @@ export default function App() {
           timelineHeight={settings.timelineHeight}
           timelineWindow={settings.timelineWindow}
           speedColors={settings.speedColors}
+          subtitleFontSize={settings.subtitleFontSize}
         />
       </div>
 
@@ -251,3 +260,14 @@ export default function App() {
 function getFileName(filePath: string): string {
   return filePath.split(/[\\/]/).pop() || ''
 }
+
+function selectSubtitleCues(subtitleFiles: SubtitleFile[]): SubtitleCue[] {
+  for (const subtitleFile of subtitleFiles) {
+    const cues = parseSubtitleFile(subtitleFile.content, subtitleFile.path)
+    if (cues.length > 0) {
+      return cues
+    }
+  }
+
+  return []
+}