From dd5f0a729b5efb9f43cd70b9907f2aa6930c036c Mon Sep 17 00:00:00 2001
From: Nexmoe <16796652+nexmoe@users.noreply.github.com>
Date: Sat, 25 Oct 2025 11:06:40 +0800
Subject: [PATCH] feat: test for mac

---
 .github/workflows/release.yml                 |  10 ++++----
 resources/tray-icon.png                       | Bin 0 -> 924 bytes
 src/main/tray.ts                              |  13 ++++++++--
 src/renderer/src/App.tsx                      |  23 +++++++++++++++---
 .../src/components/download/DownloadItem.tsx  |   4 ++-
 5 files changed, 39 insertions(+), 11 deletions(-)
 create mode 100644 resources/tray-icon.png

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f56fa59..1fa01d0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [windows-latest]
+        os: [windows-latest, macos-latest]
 
     steps:
       - name: Check out Git repository
@@ -36,12 +36,12 @@ jobs:
           curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp.exe -o resources/yt-dlp.exe
 
           # Download yt-dlp for macOS (for cross-platform builds)
-          # curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp_macos -o resources/yt-dlp_macos
-          # chmod +x resources/yt-dlp_macos
+          curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp_macos -o resources/yt-dlp_macos
+          chmod +x resources/yt-dlp_macos
 
           # Download yt-dlp for Linux (for cross-platform builds)
-          curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o resources/yt-dlp_linux
-          chmod +x resources/yt-dlp_linux
+          # curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o resources/yt-dlp_linux
+          # chmod +x resources/yt-dlp_linux
 
       - name: Lint and format check
         run: pnpm run check
diff --git a/resources/tray-icon.png b/resources/tray-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..37802ebf87f6fa3a5434f2a8ba945c7e6ab3b45c
GIT binary patch
literal 924
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBC{d9b;hE;^%b*2hb1<+l
zN-=;;U<6`2Mrk<PjZuSv87$7kz|fw_zyej{2c$v31BgL-AT;v=MyP6_*a9ZFYJmmJ
z2sTI?`z_a_K#H@#BeIx*fm;}a85w5Hkzin8>hpAQ46zUl4Ytk>aTKxpyyN>j=gn#=
zt^HbBO*>q+TyQeb$lyBY+Tkm3CFCc2RK(3F*Q3{*1U6;y+*+}qcR}lVFN0Q&rtBDx
zMX&ANC8zy4m-9}D-?}>eo#p-Vb3f0;IL=<P)xcKG+4!watbSXT%PHRFB6}j$Ro4Z&
zUpsp9x3=Y(>K_}nMOaI4hW0b<RQKZ*b#i4^|HJ1kA`<v)-=xjYkG}j>ee9>qyQ@pW
z!tSMgxF6>h#Br$K=<x}wHlfJZCrXW#bdR6BAiLc__EWY0hI@C)941&FdLYwarjg%h
zIYY#Bf-}zz{^hL32U#B7{nL3jaDn*NNukX>bMh;^9Tra8GI7r1f5uB$6u)gQ*v2-;
zqOERqz12!~mR0Lzrq7ptAL)Km{PK3QkZZrAZOd)0OCHUgrqljyKI0Z=rTGfR*Iqw<
zyjJ+k&t;d5<rNkjl<GLn5Vue*D_!c5_kR8hQm3}Pjr+#gwD())^;f3zeqW8t68V1C
zWzUWk%TJ3&9g^zOIV+oW>E6W|En&xwJ!`Z2{Gcn}(bG~@MO|c{|20Ra6<hNh`1kV!
zYhV2Gw%nzEdV6hahR;F!)|7^W5qf&l)sId-;l6U|VvmoK-x*d*By5W@KEWAn=C3ek
zx2XCz_gP;L&b<*ZDMG7VGj@$x=AKJS7h6Y_<lWbbWX{QwcDU!_biC%C-MRU*G{v6m
z&1>Sg@!}ds5@(E!`%KsDrq?1O54)6~UHUdtz1;F#_ycpsy)RU5`tNhN<J48SaVf)R
zOSe*~eSS%^Zn2%;BV5ni)VcHd{so70lBAb<2=}jU>0d6QsU>a_dP=dLUwcJL*_%U)
z-TVwP6ze~h)fI&YwyPU<PFy(Yn-+W2!(%(H?$C{Uw`b26+y1A|?bBj;JlHI+ZUiM;
MPgg&ebxsLQ0Qz`fvj6}9

literal 0
HcmV?d00001

diff --git a/src/main/tray.ts b/src/main/tray.ts
index 5c2e3e9..7b25839 100644
--- a/src/main/tray.ts
+++ b/src/main/tray.ts
@@ -1,5 +1,6 @@
 import { app, BrowserWindow, Menu, nativeImage, Tray } from 'electron'
 import appIcon from '../../resources/icon.png?asset'
+import trayIcon from '../../resources/tray-icon.png?asset'
 import { settingsManager } from './settings'
 
 let tray: Tray | null = null
@@ -85,9 +86,17 @@ export function createTray(): void {
     return
   }
 
-  const trayIcon = nativeImage.createFromPath(appIcon)
+  // Use 16x16 icon for macOS tray, fallback to app icon for other platforms
+  const iconPath = process.platform === 'darwin' ? trayIcon : appIcon
+  const trayIconImage = nativeImage.createFromPath(iconPath)
 
-  tray = new Tray(trayIcon)
+  // For macOS, ensure the icon is properly sized
+  if (process.platform === 'darwin') {
+    // Resize to 16x16 for macOS tray
+    trayIconImage.setTemplateImage(true)
+  }
+
+  tray = new Tray(trayIconImage)
 
   // Set tooltip
   tray.setToolTip('VidBee')
diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx
index 243c65d..9281826 100644
--- a/src/renderer/src/App.tsx
+++ b/src/renderer/src/App.tsx
@@ -3,7 +3,8 @@ import { Sidebar } from '@renderer/components/ui/sidebar'
 import { Toaster } from '@renderer/components/ui/sonner'
 import { TitleBar } from '@renderer/components/ui/title-bar'
 import { ThemeProvider } from 'next-themes'
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
+import { ipcServices } from './lib/ipc'
 import { About } from './pages/About'
 import { Home } from './pages/Home'
 import { Settings } from './pages/Settings'
@@ -13,6 +14,22 @@ type Page = 'home' | 'settings' | 'about' | 'sites'
 
 function AppContent() {
   const [currentPage, setCurrentPage] = useState<Page>('home')
+  const [platform, setPlatform] = useState<string>('')
+
+  useEffect(() => {
+    // Get platform info to determine if we should show title bar
+    const getPlatform = async () => {
+      try {
+        const platformInfo = await ipcServices.app.getPlatform()
+        setPlatform(platformInfo)
+      } catch (error) {
+        console.error('Failed to get platform info:', error)
+        // Default to showing title bar if platform detection fails
+        setPlatform('unknown')
+      }
+    }
+    getPlatform()
+  }, [])
 
   const renderPage = () => {
     switch (currentPage) {
@@ -36,8 +53,8 @@ function AppContent() {
 
       {/* Main Content */}
       <main className="flex flex-col flex-1 min-h-0 overflow-hidden bg-background">
-        {/* Custom Title Bar */}
-        <TitleBar />
+        {/* Custom Title Bar - Hide on macOS */}
+        {platform !== 'darwin' && <TitleBar />}
 
         <ScrollArea
           className="flex-1 w-full overflow-y-auto overflow-x-hidden"
diff --git a/src/renderer/src/components/download/DownloadItem.tsx b/src/renderer/src/components/download/DownloadItem.tsx
index 1f39eb3..818a9f5 100644
--- a/src/renderer/src/components/download/DownloadItem.tsx
+++ b/src/renderer/src/components/download/DownloadItem.tsx
@@ -20,7 +20,9 @@ import { settingsAtom } from '../../store/settings'
 const generateFilePath = (downloadPath: string, title: string, format: string): string => {
   const fileName = `${title}.${format}`
   // Use proper path joining for cross-platform compatibility
-  return `${downloadPath}/${fileName}`.replace(/\//g, '\\')
+  // Handle both forward and backward slashes for cross-platform compatibility
+  const normalizedDownloadPath = downloadPath.replace(/\\/g, '/')
+  return `${normalizedDownloadPath}/${fileName}`
 }
 
 interface DownloadItemProps {