Release v0.1.2

Author: sioaeko

docs/DEVLOG.md

@@ -6,6 +6,10 @@ import https from 'https'
 import { URL } from 'url'
 
 const isMac = process.platform === 'darwin'
+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']
 
 let mainWindow: BrowserWindow | null = null
 
@@ -69,7 +73,7 @@ ipcMain.handle('dialog:openVideo', async () => {
   const result = await dialog.showOpenDialog(mainWindow!, {
     properties: ['openFile'],
     filters: [
-      { name: 'Videos', extensions: ['mp4', 'mkv', 'avi', 'webm', 'mov', 'wmv'] },
+      { name: 'Media', extensions: MEDIA_EXTS.map((ext) => ext.slice(1)) },
     ],
   })
   if (result.canceled) return null
@@ -87,8 +91,7 @@ ipcMain.handle('dialog:openFolder', async () => {
 // File system operations
 ipcMain.handle('fs:readDir', async (_event, dirPath: string) => {
   try {
-    const videoExts = ['.mp4', '.mkv', '.avi', '.webm', '.mov', '.wmv']
-    const files: Array<{ name: string; path: string; hasScript: boolean; relativePath: string }> = []
+    const files: Array<{ name: string; path: string; type: 'video' | 'audio'; hasScript: boolean; relativePath: string }> = []
 
     function scanDir(dir: string, prefix: string) {
       let entries: fs.Dirent[]
@@ -103,12 +106,13 @@ ipcMain.handle('fs:readDir', async (_event, dirPath: string) => {
           scanDir(fullPath, prefix ? prefix + '/' + entry.name : entry.name)
         } else if (entry.isFile()) {
           const ext = path.extname(entry.name).toLowerCase()
-          if (videoExts.includes(ext)) {
+          if (MEDIA_EXTS.includes(ext)) {
             const baseName = path.basename(entry.name, ext)
             const scriptPath = path.join(dir, baseName + '.funscript')
             files.push({
               name: entry.name,
               path: fullPath,
+              type: VIDEO_EXTS.includes(ext) ? 'video' : 'audio',
               hasScript: fs.existsSync(scriptPath),
               relativePath: prefix ? prefix + '/' + entry.name : entry.name,
             })
@@ -164,12 +168,64 @@ ipcMain.handle('fs:getVideoUrl', async (_event, filePath: string) => {
   return `file:///${filePath.replace(/\\/g, '/')}`
 })
 
+ipcMain.handle('fs:findArtwork', async (_event, mediaPath: string) => {
+  try {
+    return findArtworkForMedia(mediaPath)
+  } catch {
+    return null
+  }
+})
+
 // ============================================================
 // NAS (WebDAV / FTP) Service
 // ============================================================
 
-const VIDEO_EXTS = ['.mp4', '.mkv', '.avi', '.webm', '.mov', '.wmv']
-const NAS_EXTS = [...VIDEO_EXTS, '.funscript']
+const NAS_EXTS = [...MEDIA_EXTS, '.funscript']
+
+function findArtworkForMedia(mediaPath: string): string | null {
+  const dir = path.dirname(mediaPath)
+  const ext = path.extname(mediaPath)
+  const baseName = path.basename(mediaPath, ext).toLowerCase()
+
+  let entries: string[]
+  try {
+    entries = fs.readdirSync(dir)
+  } catch {
+    return null
+  }
+
+  const images = entries
+    .filter((name) => IMAGE_EXTS.includes(path.extname(name).toLowerCase()))
+    .sort((a, b) => a.localeCompare(b))
+
+  if (images.length === 0) return null
+
+  const sameBase = images.find((name) => path.basename(name, path.extname(name)).toLowerCase() === baseName)
+  if (sameBase) return path.join(dir, sameBase)
+
+  const priorityKeywords = ['cover', 'folder', 'front', 'poster', 'preview', 'artwork', 'album', 'thumb']
+  const scored = images
+    .map((name) => {
+      const stem = path.basename(name, path.extname(name)).toLowerCase()
+      let score = 0
+
+      if (stem.includes(baseName)) score += 100
+      for (const keyword of priorityKeywords) {
+        if (stem === keyword) score += 80
+        else if (stem.startsWith(keyword) || stem.endsWith(keyword)) score += 60
+        else if (stem.includes(keyword)) score += 40
+      }
+
+      return { name, score }
+    })
+    .sort((a, b) => b.score - a.score || a.name.localeCompare(b.name))
+
+  if (scored[0]?.score > 0) {
+    return path.join(dir, scored[0].name)
+  }
+
+  return path.join(dir, images[0])
+}
 
 // ---- WebDAV helpers (raw HTTP) ----
 

electron/main.ts

@@ -17,6 +17,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
   readFunscript: (videoPath: string, scriptFolder?: string) => ipcRenderer.invoke('fs:readFunscript', videoPath, scriptFolder),
   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),
 
   // NAS operations
   nasWebdavConnect: (url: string, username: string, password: string) =>

electron/preload.ts

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

package.json

@@ -1,26 +1,8 @@
-const { execSync } = require('child_process')
-const path = require('path')
 const fs = require('fs')
-const glob = require('path')
-
-// Find rcedit in electron-builder cache
-const cacheDir = path.join(process.env.LOCALAPPDATA || '', 'electron-builder', 'Cache', 'winCodeSign')
-let rceditPath = null
-
-if (fs.existsSync(cacheDir)) {
-  for (const entry of fs.readdirSync(cacheDir)) {
-    const candidate = path.join(cacheDir, entry, 'rcedit-x64.exe')
-    if (fs.existsSync(candidate)) {
-      rceditPath = candidate
-      break
-    }
-  }
-}
+const path = require('path')
+const ResEdit = require('resedit')
 
-if (!rceditPath) {
-  console.log('[set-icon] rcedit not found, skipping icon update')
-  process.exit(0)
-}
+const pkg = require('../package.json')
 
 const exe = path.join(__dirname, '..', 'release', 'win-unpacked', 'ScriptPlayerPlus.exe')
 const ico = path.join(__dirname, '..', 'public', 'icon.ico')
@@ -30,6 +12,53 @@ if (!fs.existsSync(exe)) {
   process.exit(0)
 }
 
-console.log('[set-icon] Applying icon to', exe)
-execSync(`"${rceditPath}" "${exe}" --set-icon "${ico}"`, { stdio: 'inherit' })
+function normalizeVersion(version) {
+  const parts = String(version).split('.').map((part) => Number.parseInt(part, 10) || 0)
+  while (parts.length < 4) parts.push(0)
+  return parts.slice(0, 4).join('.')
+}
+
+const version = normalizeVersion(pkg.version)
+const lang = 1033
+const codepage = 1200
+
+console.log('[set-icon] Updating executable resources for', exe)
+
+const exeData = fs.readFileSync(exe)
+const executable = ResEdit.NtExecutable.from(exeData)
+const resources = ResEdit.NtExecutableResource.from(executable)
+const iconFile = ResEdit.Data.IconFile.from(fs.readFileSync(ico))
+const iconGroups = ResEdit.Resource.IconGroupEntry.fromEntries(resources.entries)
+const versionInfos = ResEdit.Resource.VersionInfo.fromEntries(resources.entries)
+
+ResEdit.Resource.IconGroupEntry.replaceIconsForResource(
+  resources.entries,
+  iconGroups[0]?.id ?? 101,
+  iconGroups[0]?.lang ?? lang,
+  iconFile.icons.map((item) => item.data)
+)
+
+const versionInfo = versionInfos[0] ?? ResEdit.Resource.VersionInfo.createEmpty()
+versionInfo.lang = versionInfo.lang || lang
+versionInfo.setFileVersion(version, lang)
+versionInfo.setProductVersion(version, lang)
+versionInfo.setStringValues(
+  { lang, codepage },
+  {
+    CompanyName: 'ScriptPlayerPlus',
+    FileDescription: pkg.description,
+    FileVersion: version,
+    InternalName: pkg.build.productName,
+    OriginalFilename: 'ScriptPlayerPlus.exe',
+    ProductName: pkg.build.productName,
+    ProductVersion: version,
+  }
+)
+versionInfo.outputToResourceEntries(resources.entries)
+
+resources.outputResource(executable)
+const outputPath = `${exe}.tmp`
+fs.writeFileSync(outputPath, Buffer.from(executable.generate()))
+fs.renameSync(outputPath, exe)
+
 console.log('[set-icon] Done!')