Update CHANGELOG.md

Return to main menu after each operation

.env

@@ -1,2 +1,2 @@
-version=1.4.06
-VERSION=1.4.06
+version=1.4.07
+VERSION=1.4.07

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## v1.4.07
+1. Add Removed break statements after each operation | 修改結束event後的break暫停應用
+2. Added print_menu() calls to show the menu again | 添加print_menu（）調用以再次顯示菜單
+3. Updated error handling to show menu instead of exiting | 更新錯誤處理以顯示菜單而不是退出
+
 ## v1.4.06
 
 1. Add: Blocked Domains Loaded | 增加被屏蔽的域名加載
@@ -199,4 +204,4 @@
 
 <p align="center">
   <img src="./images/pro_2025-01-11_16-24-03.png" alt="Cursor Pro Logo" width="400"/><br>
-</p>
+</p>

block_domain.txt

@@ -1 +1,3 @@
 oakon.com
+famamail.com
+2925.com

main.py

@@ -218,19 +218,19 @@ def main():
             elif choice == "1":
                 import reset_machine_manual
                 reset_machine_manual.run(translator)
-                break
+                print_menu()
             elif choice == "2":
                 import cursor_register
                 cursor_register.main(translator)
-                break
+                print_menu()
             elif choice == "3":
                 import cursor_register_manual
                 cursor_register_manual.main(translator)
-                break
+                print_menu()
             elif choice == "4":
                 import quit_cursor
                 quit_cursor.quit_cursor(translator)
-                break
+                print_menu()
             elif choice == "5":
                 if select_language():
                     print_menu()
@@ -238,7 +238,7 @@ def main():
             elif choice == "6":
                 import disable_auto_update
                 disable_auto_update.run(translator)
-                break
+                print_menu()
             else:
                 print(f"{Fore.RED}{EMOJI['ERROR']} {translator.get('menu.invalid_choice')}{Style.RESET_ALL}")
                 print_menu()
@@ -249,10 +249,7 @@ def main():
             return
         except Exception as e:
             print(f"{Fore.RED}{EMOJI['ERROR']} {translator.get('menu.error_occurred', error=str(e))}{Style.RESET_ALL}")
-            break
-
-    print(f"\n{Fore.CYAN}{'═' * 50}{Style.RESET_ALL}")
-    input(f"{EMOJI['INFO']} {translator.get('menu.press_enter')}...{Style.RESET_ALL}")
+            print_menu()
 
 if __name__ == "__main__":
     main()

scripts/install.ps1

@@ -1,4 +1,4 @@
-# 設置顏色主題
+# set color theme
 $Theme = @{
     Primary   = 'Cyan'
     Success   = 'Green'
@@ -17,7 +17,7 @@ $Logo = @"
    ╚═════╝ ╚═════╝ ╚═╝  ╚═╝╚══════╝ ╚═════╝ ╚═╝  ╚═╝     ╚═╝     ╚═╝  ╚═╝ ╚═════╝  
 "@
 
-# 美化輸出函數
+# Beautiful Output Function
 function Write-Styled {
     param (
         [string]$Message,
@@ -40,7 +40,7 @@ function Write-Styled {
     }
 }
 
-# 獲取版本號函數
+# Get version number function
 function Get-LatestVersion {
     try {
         $latestRelease = Invoke-RestMethod -Uri "https://api.github.com/repos/yeongpin/cursor-free-vip/releases/latest"
@@ -54,28 +54,28 @@ function Get-LatestVersion {
     }
 }
 
-# 顯示 Logo
+# Show Logo
 Write-Host $Logo -ForegroundColor $Theme.Primary
 $releaseInfo = Get-LatestVersion
 $version = $releaseInfo.Version
 Write-Host "Version $version" -ForegroundColor $Theme.Info
 Write-Host "Created by YeongPin`n" -ForegroundColor $Theme.Info
 
-# 設置 TLS 1.2
+# Set TLS 1.2
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 
-# 主安裝函數
+# Main installation function
 function Install-CursorFreeVIP {
     Write-Styled "Start downloading Cursor Free VIP" -Color $Theme.Primary -Prefix "Download"
     
     try {
-        # 獲取最新版本
+        # Get latest version
         Write-Styled "Checking latest version..." -Color $Theme.Primary -Prefix "Update"
         $releaseInfo = Get-LatestVersion
         $version = $releaseInfo.Version
         Write-Styled "Found latest version: $version" -Color $Theme.Success -Prefix "Version"
         
-        # 查找對應的資源
+        # Find corresponding resources
         $asset = $releaseInfo.Assets | Where-Object { $_.name -eq "CursorFreeVIP_${version}_windows.exe" }
         if (!$asset) {
             Write-Styled "File not found: CursorFreeVIP_${version}_windows.exe" -Color $Theme.Error -Prefix "Error"
@@ -86,22 +86,114 @@ function Install-CursorFreeVIP {
             throw "Cannot find target file"
         }
         
-        # 下載到Downloads文件夾
+        # Check if Downloads folder already exists for the corresponding version
         $DownloadsPath = [Environment]::GetFolderPath("UserProfile") + "\Downloads"
-        $downloadPath = Join-Path $DownloadsPath "CursorFreeVIP.exe"
+        $downloadPath = Join-Path $DownloadsPath "CursorFreeVIP_${version}_windows.exe"
         
-        Write-Styled "Downloading to Downloads folder..." -Color $Theme.Primary -Prefix "Download"
+        if (Test-Path $downloadPath) {
+            Write-Styled "Found existing installation file" -Color $Theme.Success -Prefix "Found"
+            Write-Styled "Location: $downloadPath" -Color $Theme.Info -Prefix "Location"
+            
+            # Check if running with administrator privileges
+            $isAdmin = ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)
+            
+            if (-not $isAdmin) {
+                Write-Styled "Requesting administrator privileges..." -Color $Theme.Warning -Prefix "Admin"
+                
+                # Create new process with administrator privileges
+                $startInfo = New-Object System.Diagnostics.ProcessStartInfo
+                $startInfo.FileName = $downloadPath
+                $startInfo.UseShellExecute = $true
+                $startInfo.Verb = "runas"
+                
+                try {
+                    [System.Diagnostics.Process]::Start($startInfo)
+                    Write-Styled "Program started with admin privileges" -Color $Theme.Success -Prefix "Launch"
+                    return
+                }
+                catch {
+                    Write-Styled "Failed to start with admin privileges. Starting normally..." -Color $Theme.Warning -Prefix "Warning"
+                    Start-Process $downloadPath
+                    return
+                }
+            }
+            
+            # If already running with administrator privileges, start directly
+            Start-Process $downloadPath
+            return
+        }
+        
+        Write-Styled "No existing installation file found, starting download..." -Color $Theme.Primary -Prefix "Download"
+        
+        # Create WebClient and add progress event
         $webClient = New-Object System.Net.WebClient
         $webClient.Headers.Add("User-Agent", "PowerShell Script")
-        $webClient.DownloadFile($asset.browser_download_url, $downloadPath)
+
+        # Define progress variables
+        $Global:downloadedBytes = 0
+        $Global:totalBytes = 0
+        $Global:lastProgress = 0
+        $Global:lastBytes = 0
+        $Global:lastTime = Get-Date
+
+        # Download progress event
+        $eventId = [guid]::NewGuid()
+        Register-ObjectEvent -InputObject $webClient -EventName DownloadProgressChanged -Action {
+            $Global:downloadedBytes = $EventArgs.BytesReceived
+            $Global:totalBytes = $EventArgs.TotalBytesToReceive
+            $progress = [math]::Round(($Global:downloadedBytes / $Global:totalBytes) * 100, 1)
+            
+            # Only update display when progress changes by more than 1%
+            if ($progress -gt $Global:lastProgress + 1) {
+                $Global:lastProgress = $progress
+                $downloadedMB = [math]::Round($Global:downloadedBytes / 1MB, 2)
+                $totalMB = [math]::Round($Global:totalBytes / 1MB, 2)
+                
+                # Calculate download speed
+                $currentTime = Get-Date
+                $timeSpan = ($currentTime - $Global:lastTime).TotalSeconds
+                if ($timeSpan -gt 0) {
+                    $bytesChange = $Global:downloadedBytes - $Global:lastBytes
+                    $speed = $bytesChange / $timeSpan
+                    
+                    # Choose appropriate unit based on speed
+                    $speedDisplay = if ($speed -gt 1MB) {
+                        "$([math]::Round($speed / 1MB, 2)) MB/s"
+                    } elseif ($speed -gt 1KB) {
+                        "$([math]::Round($speed / 1KB, 2)) KB/s"
+                    } else {
+                        "$([math]::Round($speed, 2)) B/s"
+                    }
+                    
+                    Write-Host "`rDownloading: $downloadedMB MB / $totalMB MB ($progress%) - $speedDisplay" -NoNewline -ForegroundColor Cyan
+                    
+                    # Update last data
+                    $Global:lastBytes = $Global:downloadedBytes
+                    $Global:lastTime = $currentTime
+                }
+            }
+        } | Out-Null
+
+        # Download completed event
+        Register-ObjectEvent -InputObject $webClient -EventName DownloadFileCompleted -Action {
+            Write-Host "`r" -NoNewline
+            Write-Styled "Download completed!" -Color $Theme.Success -Prefix "Complete"
+            Unregister-Event -SourceIdentifier $eventId
+        } | Out-Null
+
+        # Start download
+        $webClient.DownloadFileAsync([Uri]$asset.browser_download_url, $downloadPath)
+
+        # Wait for download to complete
+        while ($webClient.IsBusy) {
+            Start-Sleep -Milliseconds 100
+        }
         
-        Write-Styled "Download completed!" -Color $Theme.Success -Prefix "Complete"
         Write-Styled "File location: $downloadPath" -Color $Theme.Info -Prefix "Location"
         Write-Styled "Starting program..." -Color $Theme.Primary -Prefix "Launch"
         
-        # 運行程序
+        # Run program
         Start-Process $downloadPath
-        
     }
     catch {
         Write-Styled $_.Exception.Message -Color $Theme.Error -Prefix "Error"
@@ -109,7 +201,7 @@ function Install-CursorFreeVIP {
     }
 }
 
-# 執行安裝
+# Execute installation
 try {
     Install-CursorFreeVIP
 }
@@ -120,4 +212,4 @@ catch {
 finally {
     Write-Host "`nPress any key to exit..." -ForegroundColor $Theme.Info
     $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
-}
+}

scripts/install.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# 顏色定義
+# Color definitions
 RED='\033[0;31m'
 GREEN='\033[0;32m'
 YELLOW='\033[1;33m'
@@ -22,7 +22,7 @@ EOF
     echo -e "${NC}"
 }
 
-# 获取下载文件夹路径
+# Get download folder path
 get_downloads_dir() {
     if [[ "$(uname)" == "Darwin" ]]; then
         echo "$HOME/Downloads"
@@ -36,68 +36,95 @@ get_downloads_dir() {
     fi
 }
 
-# 獲取最新版本
+# Get latest version
 get_latest_version() {
-    echo -e "${CYAN}ℹ️ 正在檢查最新版本...${NC}"
+    echo -e "${CYAN}ℹ️ Checking latest version...${NC}"
     local latest_release
     latest_release=$(curl -s https://api.github.com/repos/yeongpin/cursor-free-vip/releases/latest)
     if [ $? -ne 0 ]; then
-        echo -e "${RED}❌ 無法獲取最新版本信息${NC}"
+        echo -e "${RED}❌ Cannot get latest version information${NC}"
         exit 1
     fi
     
     VERSION=$(echo "$latest_release" | grep -o '"tag_name": ".*"' | cut -d'"' -f4 | tr -d 'v')
-    echo -e "${GREEN}✅ 找到最新版本: ${VERSION}${NC}"
+    echo -e "${GREEN}✅ Found latest version: ${VERSION}${NC}"
 }
 
-# 檢測系統類型和架構
+# Detect system type and architecture
 detect_os() {
     if [[ "$(uname)" == "Darwin" ]]; then
-        # 检测 macOS 架构
+        # Detect macOS architecture
         ARCH=$(uname -m)
         if [[ "$ARCH" == "arm64" ]]; then
             OS="mac_arm64"
-            echo -e "${CYAN}ℹ️ 检测到 macOS ARM64 架构${NC}"
+            echo -e "${CYAN}ℹ️ Detected macOS ARM64 architecture${NC}"
         else
             OS="mac_intel"
-            echo -e "${CYAN}ℹ️ 检测到 macOS Intel 架构${NC}"
+            echo -e "${CYAN}ℹ️ Detected macOS Intel architecture${NC}"
         fi
     elif [[ "$(uname)" == "Linux" ]]; then
         OS="linux"
-        echo -e "${CYAN}ℹ️ 检测到 Linux 系统${NC}"
+        echo -e "${CYAN}ℹ️ Detected Linux system${NC}"
     else
-        # 假设是 Windows
+        # Assume Windows
         OS="windows"
-        echo -e "${CYAN}ℹ️ 检测到 Windows 系统${NC}"
+        echo -e "${CYAN}ℹ️ Detected Windows system${NC}"
     fi
 }
 
-# 下載並安裝
+# Install and download
 install_cursor_free_vip() {
     local downloads_dir=$(get_downloads_dir)
     local binary_name="CursorFreeVIP_${VERSION}_${OS}"
-    local binary_path="${downloads_dir}/cursor-free-vip"
+    local binary_path="${downloads_dir}/${binary_name}"
     local download_url="https://github.com/yeongpin/cursor-free-vip/releases/download/v${VERSION}/${binary_name}"
     
-    echo -e "${CYAN}ℹ️ 正在下載到 ${downloads_dir}...${NC}"
-    echo -e "${CYAN}ℹ️ 下載鏈接: ${download_url}${NC}"
-    
-    # 先检查文件是否存在
-    if curl --output /dev/null --silent --head --fail "$download_url"; then
-        echo -e "${GREEN}✅ 文件存在，开始下载...${NC}"
-    else
-        echo -e "${RED}❌ 下载链接不存在: ${download_url}${NC}"
-        echo -e "${YELLOW}⚠️ 尝试不带架构的版本...${NC}"
+    # Check if file already exists
+    if [ -f "${binary_path}" ]; then
+        echo -e "${GREEN}✅ Found existing installation file${NC}"
+        echo -e "${CYAN}ℹ️ Location: ${binary_path}${NC}"
         
-        # 尝试不带架构的版本
+        # Check if running as root
+        if [ "$EUID" -ne 0 ]; then
+            echo -e "${YELLOW}⚠️ Requesting administrator privileges...${NC}"
+            if command -v sudo >/dev/null 2>&1; then
+                echo -e "${CYAN}ℹ️ Starting program with sudo...${NC}"
+                sudo chmod +x "${binary_path}"
+                sudo "${binary_path}"
+            else
+                echo -e "${YELLOW}⚠️ sudo not found, trying to run normally...${NC}"
+                chmod +x "${binary_path}"
+                "${binary_path}"
+            fi
+        else
+            # Already running as root
+            echo -e "${CYAN}ℹ️ Already running as root, starting program...${NC}"
+            chmod +x "${binary_path}"
+            "${binary_path}"
+        fi
+        return
+    fi
+    
+    echo -e "${CYAN}ℹ️ No existing installation file found, starting download...${NC}"
+    echo -e "${CYAN}ℹ️ Downloading to ${downloads_dir}...${NC}"
+    echo -e "${CYAN}ℹ️ Download link: ${download_url}${NC}"
+    
+    # Check if file exists
+    if curl --output /dev/null --silent --head --fail "$download_url"; then
+        echo -e "${GREEN}✅ File exists, starting download...${NC}"
+    else
+        echo -e "${RED}❌ Download link does not exist: ${download_url}${NC}"
+        echo -e "${YELLOW}⚠️ Trying without architecture...${NC}"
+        
+        # Try without architecture
         if [[ "$OS" == "mac_arm64" || "$OS" == "mac_intel" ]]; then
             OS="mac"
             binary_name="CursorFreeVIP_${VERSION}_${OS}"
             download_url="https://github.com/yeongpin/cursor-free-vip/releases/download/v${VERSION}/${binary_name}"
-            echo -e "${CYAN}ℹ️ 新下载链接: ${download_url}${NC}"
+            echo -e "${CYAN}ℹ️ New download link: ${download_url}${NC}"
             
             if ! curl --output /dev/null --silent --head --fail "$download_url"; then
-                echo -e "${RED}❌ 新下载链接也不存在${NC}"
+                echo -e "${RED}❌ New download link does not exist${NC}"
                 exit 1
             fi
         else
@@ -105,43 +132,43 @@ install_cursor_free_vip() {
         fi
     fi
     
-    # 下载文件
+    # Download file
     if ! curl -L -o "${binary_path}" "$download_url"; then
-        echo -e "${RED}❌ 下載失敗${NC}"
+        echo -e "${RED}❌ Download failed${NC}"
         exit 1
     fi
     
-    # 检查下载的文件大小
+    # Check downloaded file size
     local file_size=$(stat -f%z "${binary_path}" 2>/dev/null || stat -c%s "${binary_path}" 2>/dev/null)
-    echo -e "${CYAN}ℹ️ 下載的文件大小: ${file_size} 字節${NC}"
+    echo -e "${CYAN}ℹ️ Downloaded file size: ${file_size} bytes${NC}"
     
-    # 如果文件太小，可能是错误信息
+    # If file is too small, it might be an error message
     if [ "$file_size" -lt 1000 ]; then
-        echo -e "${YELLOW}⚠️ 警告: 下載的文件太小，可能不是有效的可執行文件${NC}"
-        echo -e "${YELLOW}⚠️ 文件內容:${NC}"
+        echo -e "${YELLOW}⚠️ Warning: Downloaded file is too small, possibly not a valid executable file${NC}"
+        echo -e "${YELLOW}⚠️ File content:${NC}"
         cat "${binary_path}"
         echo ""
-        echo -e "${RED}❌ 下載失敗，請檢查版本號和操作系統是否正確${NC}"
+        echo -e "${RED}❌ Download failed, please check version and operating system${NC}"
         exit 1
     fi
     
-    echo -e "${CYAN}ℹ️ 正在設置執行權限...${NC}"
+    echo -e "${CYAN}ℹ️ Setting executable permissions...${NC}"
     chmod +x "${binary_path}"
     
     if [ $? -eq 0 ]; then
-        echo -e "${GREEN}✅ 安裝完成！${NC}"
-        echo -e "${CYAN}ℹ️ 程序已下載到: ${binary_path}${NC}"
-        echo -e "${CYAN}ℹ️ 正在啟動程序...${NC}"
+        echo -e "${GREEN}✅ Installation completed!${NC}"
+        echo -e "${CYAN}ℹ️ Program downloaded to: ${binary_path}${NC}"
+        echo -e "${CYAN}ℹ️ Starting program...${NC}"
         
-        # 直接运行程序
+        # Run program directly
         "${binary_path}"
     else
-        echo -e "${RED}❌ 安裝失敗${NC}"
+        echo -e "${RED}❌ Installation failed${NC}"
         exit 1
     fi
 }
 
-# 主程序
+# Main program
 main() {
     print_logo
     get_latest_version
@@ -149,5 +176,5 @@ main() {
     install_cursor_free_vip
 }
 
-# 運行主程序
-main 
+# Run main program
+main