场景分支1.0.1 macm1打包成功

build_mac_new.py

@@ -0,0 +1,73 @@
+import PyInstaller.__main__
+import os
+import sys
+import shutil
+
+# 获取当前脚本所在目录
+current_dir = os.path.dirname(os.path.abspath(__file__))
+
+# 清理之前的构建
+dist_dir = os.path.join(current_dir, 'dist')
+build_dir = os.path.join(current_dir, 'build')
+if os.path.exists(dist_dir):
+    shutil.rmtree(dist_dir)
+if os.path.exists(build_dir):
+    shutil.rmtree(build_dir)
+
+# 创建必要的目录
+os.makedirs('dist', exist_ok=True)
+os.makedirs('build', exist_ok=True)
+
+# 创建logs目录
+logs_dir = os.path.join(current_dir, 'logs')
+os.makedirs(logs_dir, exist_ok=True)
+
+# 打包参数
+params = [
+    'gui/main_mac.py',  # 主程序入口
+    '--name=CursorPro',  # 应用名称
+    '-w',  # 不显示控制台窗口
+    '--clean',  # 清理临时文件
+    '--noconfirm',  # 不确认覆盖
+    '--debug=imports',  # 只显示导入相关的调试信息
+    '--osx-bundle-identifier=com.cursor.pro',  # macOS包标识符
+    f'--distpath={os.path.join(current_dir, "dist")}',  # 输出目录
+    f'--workpath={os.path.join(current_dir, "build")}',  # 工作目录
+    f'--specpath={current_dir}',  # spec文件目录
+    '--add-data=logger.py:.',  # 添加额外文件 (Mac系统使用:分隔符)
+    '--add-data=update_cursor_token.py:.',
+    '--add-data=cursor_auth_manager.py:.',
+    '--add-data=reset_machine.py:.',
+    '--add-data=patch_cursor_get_machine_id.py:.',
+    '--add-data=exit_cursor.py:.',
+    '--add-data=go_cursor_help.py:.',
+    '--add-data=logo.py:.',
+    '--add-data=config.py:.',
+    '--add-data=browser_utils.py:.',
+    '--add-data=get_email_code.py:.',
+    '--hidden-import=PyQt5',
+    '--hidden-import=PyQt5.QtCore',
+    '--hidden-import=PyQt5.QtGui',
+    '--hidden-import=PyQt5.QtWidgets',
+    '--hidden-import=requests',
+    '--hidden-import=urllib3',
+    '--hidden-import=psutil',
+    '--hidden-import=colorama',
+]
+
+# 执行打包
+PyInstaller.__main__.run(params)
+
+print("打包完成！应用程序包(.app)已生成在dist目录下。")
+
+# 创建必要的目录和文件
+app_path = os.path.join(current_dir, 'dist', 'CursorPro.app', 'Contents', 'MacOS')
+if os.path.exists(app_path):
+    # 创建logs目录
+    os.makedirs(os.path.join(app_path, 'logs'), exist_ok=True)
+    
+    # 创建空的error.log文件
+    with open(os.path.join(app_path, 'error.log'), 'w') as f:
+        f.write('')
+    
+    print("已创建必要的目录和文件") 

gui/main_mac.py

@@ -0,0 +1,357 @@
+# -*- coding: utf-8 -*-
+import sys
+import os
+import traceback
+from datetime import datetime
+
+def get_app_path():
+    """获取应用程序路径"""
+    if getattr(sys, 'frozen', False):
+        # 如果是打包后的应用
+        return os.path.dirname(sys.executable)
+    else:
+        # 如果是开发环境
+        return os.path.dirname(os.path.abspath(__file__))
+
+def setup_logging():
+    """设置日志"""
+    app_path = get_app_path()
+    log_dir = os.path.join(app_path, 'logs')
+    os.makedirs(log_dir, exist_ok=True)
+    
+    log_file = os.path.join(log_dir, 'app.log')
+    error_log = os.path.join(app_path, 'error.log')
+    
+    # 配置日志
+    logging.basicConfig(
+        filename=log_file,
+        level=logging.DEBUG,
+        format='%(asctime)s - %(name)s - %(levelname)s - %(message)s'
+    )
+    
+    # 设置错误日志处理
+    def handle_exception(exc_type, exc_value, exc_traceback):
+        if issubclass(exc_type, KeyboardInterrupt):
+            sys.__excepthook__(exc_type, exc_value, exc_traceback)
+            return
+        
+        error_msg = ''.join(traceback.format_exception(exc_type, exc_value, exc_traceback))
+        try:
+            with open(error_log, 'a') as f:
+                f.write(f"\n{'-'*60}\n")
+                f.write(f"Time: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}\n")
+                f.write(error_msg)
+            logging.error(f"Uncaught exception:\n{error_msg}")
+        except Exception as e:
+            print(f"Error writing to log file: {str(e)}")
+            print(error_msg)
+    
+    sys.excepthook = handle_exception
+
+# 添加父目录到系统路径
+current_dir = os.path.dirname(os.path.abspath(__file__))
+parent_dir = os.path.dirname(current_dir)
+sys.path.append(parent_dir)
+
+try:
+    from PyQt5.QtWidgets import (QApplication, QMainWindow, QWidget, QVBoxLayout, 
+                            QPushButton, QLabel, QLineEdit, QTextEdit, QMessageBox,
+                            QHBoxLayout, QFrame, QStackedWidget)
+    from PyQt5.QtCore import Qt, QThread, pyqtSignal
+    from PyQt5.QtGui import QFont, QIcon, QPalette, QColor
+    from update_cursor_token import CursorTokenUpdater
+    from logger import logging
+except Exception as e:
+    error_path = os.path.join(get_app_path(), 'error.log')
+    with open(error_path, 'w') as f:
+        f.write(f"Import Error: {str(e)}\n")
+        f.write(traceback.format_exc())
+    sys.exit(1)
+
+# macOS 风格的颜色
+MACOS_COLORS = {
+    'background': '#F5F5F7',      # 浅灰色背景
+    'button': '#0066CC',          # 蓝色按钮
+    'button_hover': '#0052A3',    # 深蓝色悬停
+    'button_pressed': '#003D7A',  # 更深的蓝色按下
+    'text': '#1D1D1F',           # 深色文字
+    'frame': '#FFFFFF',          # 白色框架
+    'input': '#FFFFFF',          # 白色输入框
+    'input_text': '#1D1D1F',     # 深色输入文字
+    'border': '#E5E5E5'          # 边框颜色
+}
+
+class UpdateWorker(QThread):
+    """后台更新线程"""
+    finished = pyqtSignal(bool, str)
+    progress = pyqtSignal(str)
+
+    def __init__(self, updater):
+        super().__init__()
+        self.updater = updater
+        
+    def run(self):
+        try:
+            success = self.updater.full_update_process()
+            if success:
+                self.finished.emit(True, "更新成功！")
+            else:
+                self.finished.emit(False, "更新失败，请查看日志")
+        except Exception as e:
+            self.finished.emit(False, f"发生错误: {str(e)}")
+
+class MainWindow(QMainWindow):
+    def __init__(self):
+        super().__init__()
+        try:
+            logging.info("正在初始化主窗口...")
+            self.updater = CursorTokenUpdater()
+            self.init_ui()
+            logging.info("主窗口初始化完成")
+        except Exception as e:
+            logging.error(f"初始化主窗口时发生错误: {str(e)}")
+            QMessageBox.critical(self, "错误", f"初始化失败: {str(e)}")
+
+    def init_ui(self):
+        # 设置窗口基本属性
+        self.setWindowTitle('Cursor Pro')
+        self.setMinimumSize(600, 500)
+        
+        # 设置macOS风格的样式
+        self.setStyleSheet(f"""
+            QMainWindow {{
+                background-color: {MACOS_COLORS['background']};
+            }}
+            QPushButton {{
+                background-color: {MACOS_COLORS['button']};
+                color: white;
+                border: none;
+                border-radius: 6px;
+                padding: 8px 16px;
+                font-size: 13px;
+                min-width: 100px;
+            }}
+            QPushButton:hover {{
+                background-color: {MACOS_COLORS['button_hover']};
+            }}
+            QPushButton:pressed {{
+                background-color: {MACOS_COLORS['button_pressed']};
+            }}
+            QLabel {{
+                color: {MACOS_COLORS['text']};
+                font-size: 13px;
+            }}
+            QLabel[title="true"] {{
+                font-size: 24px;
+                font-weight: bold;
+            }}
+            QTextEdit {{
+                background-color: {MACOS_COLORS['input']};
+                color: {MACOS_COLORS['input_text']};
+                border: 1px solid {MACOS_COLORS['border']};
+                border-radius: 6px;
+                padding: 8px;
+                font-size: 13px;
+            }}
+            QLineEdit {{
+                background-color: {MACOS_COLORS['input']};
+                color: {MACOS_COLORS['input_text']};
+                border: 1px solid {MACOS_COLORS['border']};
+                border-radius: 6px;
+                padding: 8px;
+                font-size: 13px;
+            }}
+            QFrame {{
+                background-color: {MACOS_COLORS['frame']};
+                border: 1px solid {MACOS_COLORS['border']};
+                border-radius: 8px;
+            }}
+            QMessageBox {{
+                background-color: {MACOS_COLORS['background']};
+            }}
+            QMessageBox QPushButton {{
+                min-width: 80px;
+                padding: 6px 12px;
+            }}
+        """)
+
+        # 创建主窗口部件
+        central_widget = QWidget()
+        self.setCentralWidget(central_widget)
+        layout = QVBoxLayout(central_widget)
+        layout.setSpacing(16)
+        layout.setContentsMargins(20, 20, 20, 20)
+
+        # 标题
+        title_label = QLabel("Cursor Pro")
+        title_label.setProperty("title", "true")
+        title_label.setAlignment(Qt.AlignCenter)
+        layout.addWidget(title_label)
+
+        # 设备ID显示区域
+        device_frame = QFrame()
+        device_layout = QHBoxLayout(device_frame)
+        device_layout.setContentsMargins(16, 16, 16, 16)
+        
+        device_id_label = QLabel("设备标识:")
+        self.device_id_text = QLineEdit()
+        self.device_id_text.setReadOnly(True)
+        
+        try:
+            hardware_id = self.updater.hardware_id
+            logging.info(f"获取到硬件ID: {hardware_id}")
+            self.device_id_text.setText(hardware_id)
+        except Exception as e:
+            logging.error(f"获取硬件ID失败: {str(e)}")
+            self.device_id_text.setText("获取失败")
+        
+        copy_button = QPushButton("复制ID")
+        copy_button.setMaximumWidth(100)
+        copy_button.clicked.connect(self.copy_device_id)
+        
+        device_layout.addWidget(device_id_label)
+        device_layout.addWidget(self.device_id_text)
+        device_layout.addWidget(copy_button)
+        
+        layout.addWidget(device_frame)
+
+        # 会员状态区域
+        member_frame = QFrame()
+        member_layout = QVBoxLayout(member_frame)
+        member_layout.setContentsMargins(16, 16, 16, 16)
+        
+        member_title = QLabel("会员状态")
+        member_title.setAlignment(Qt.AlignCenter)
+        member_layout.addWidget(member_title)
+        
+        self.member_info = QTextEdit()
+        self.member_info.setReadOnly(True)
+        self.member_info.setFixedHeight(80)
+        self.member_info.setText("会员状态: 正常\n到期时间: 2025-02-22 20:44:23")
+        
+        member_layout.addWidget(self.member_info)
+        layout.addWidget(member_frame)
+
+        # 激活区域
+        activate_frame = QFrame()
+        activate_layout = QVBoxLayout(activate_frame)
+        activate_layout.setContentsMargins(16, 16, 16, 16)
+        
+        activate_title = QLabel("激活会员")
+        activate_title.setAlignment(Qt.AlignCenter)
+        
+        input_layout = QHBoxLayout()
+        self.activate_input = QLineEdit()
+        self.activate_input.setPlaceholderText("请输入激活码")
+        
+        activate_button = QPushButton("激活")
+        activate_button.setMaximumWidth(100)
+        activate_button.clicked.connect(self.activate_license)
+        
+        input_layout.addWidget(self.activate_input)
+        input_layout.addWidget(activate_button)
+        
+        activate_layout.addWidget(activate_title)
+        activate_layout.addLayout(input_layout)
+        
+        layout.addWidget(activate_frame)
+
+        # 功能按钮区域
+        button_frame = QFrame()
+        button_layout = QVBoxLayout(button_frame)
+        button_layout.setSpacing(12)
+        button_layout.setContentsMargins(16, 16, 16, 16)
+        
+        self.update_button = QPushButton("刷新授权")
+        self.update_button.clicked.connect(self.start_update)
+        
+        self.reset_button = QPushButton("重置机器码")
+        self.reset_button.clicked.connect(self.reset_machine)
+        
+        self.disable_update_button = QPushButton("禁用更新")
+        self.disable_update_button.clicked.connect(self.disable_cursor_update)
+        
+        button_layout.addWidget(self.update_button)
+        button_layout.addWidget(self.reset_button)
+        button_layout.addWidget(self.disable_update_button)
+        
+        layout.addWidget(button_frame)
+
+    def copy_device_id(self):
+        clipboard = QApplication.clipboard()
+        clipboard.setText(self.device_id_text.text())
+        QMessageBox.information(self, "成功", "设备ID已复制到剪贴板")
+
+    def append_log(self, text):
+        self.member_info.append(text)
+
+    def start_update(self):
+        self.update_button.setEnabled(False)
+        self.worker = UpdateWorker(self.updater)
+        self.worker.finished.connect(self.update_finished)
+        self.worker.start()
+
+    def update_finished(self, success, message):
+        self.update_button.setEnabled(True)
+        if success:
+            QMessageBox.information(self, "成功", message)
+        else:
+            QMessageBox.warning(self, "失败", message)
+
+    def reset_machine(self):
+        try:
+            self.updater.reset_machine_id()
+            QMessageBox.information(self, "成功", "机器ID已重置")
+        except Exception as e:
+            QMessageBox.critical(self, "错误", f"重置失败: {str(e)}")
+
+    def activate_license(self):
+        license_key = self.activate_input.text().strip()
+        if not license_key:
+            QMessageBox.warning(self, "提示", "请输入激活码")
+            return
+            
+        try:
+            # 这里添加激活码验证逻辑
+            QMessageBox.information(self, "成功", "激活成功")
+        except Exception as e:
+            QMessageBox.critical(self, "错误", f"激活失败: {str(e)}")
+
+    def disable_cursor_update(self):
+        try:
+            # 这里添加禁用更新逻辑
+            QMessageBox.information(self, "成功", "已禁用Cursor更新")
+        except Exception as e:
+            QMessageBox.critical(self, "错误", f"操作失败: {str(e)}")
+
+def main():
+    try:
+        # 设置日志
+        setup_logging()
+        logging.info("应用程序启动")
+        
+        app = QApplication(sys.argv)
+        app.setApplicationName("CursorPro")
+        app.setOrganizationName("Cursor")
+        app.setOrganizationDomain("cursor.pro")
+        
+        try:
+            window = MainWindow()
+            window.show()
+            logging.info("主窗口已显示")
+            return app.exec_()
+        except Exception as e:
+            logging.error(f"主窗口创建失败: {str(e)}")
+            logging.error(traceback.format_exc())
+            QMessageBox.critical(None, "错误", f"程序启动失败: {str(e)}")
+            return 1
+            
+    except Exception as e:
+        error_path = os.path.join(get_app_path(), 'error.log')
+        with open(error_path, 'a') as f:
+            f.write(f"\nApplication Error: {str(e)}\n")
+            f.write(traceback.format_exc())
+        return 1
+
+if __name__ == '__main__':
+    sys.exit(main()) 

logger.py

@@ -1,11 +1,26 @@
+# -*- coding: utf-8 -*-
 import logging
 import os
 from datetime import datetime
 
-# Configure logging
+# 在用户主目录下创建日志目录
-log_dir = "logs"
+home_dir = os.path.expanduser('~')
-if not os.path.exists(log_dir):
+app_dir = os.path.join(home_dir, '.cursor_pro')
-    os.makedirs(log_dir)
+log_dir = os.path.join(app_dir, 'logs')
+os.makedirs(log_dir, exist_ok=True)
+
+# 设置日志文件名
+log_file = os.path.join(log_dir, f"{datetime.now().strftime('%Y-%m-%d')}.log")
+
+# 配置日志
+logging.basicConfig(
+    level=logging.INFO,
+    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
+    handlers=[
+        logging.FileHandler(log_file, encoding='utf-8'),
+        logging.StreamHandler()
+    ]
+)
 
 
 class PrefixFormatter(logging.Formatter):
@@ -17,17 +32,6 @@ class PrefixFormatter(logging.Formatter):
         return super().format(record)
 
 
-logging.basicConfig(
-    level=logging.DEBUG,
-    format="%(asctime)s - %(levelname)s - %(message)s",
-    handlers=[
-        logging.FileHandler(
-            os.path.join(log_dir, f"{datetime.now().strftime('%Y-%m-%d')}.log"),
-            encoding="utf-8",
-        ),
-    ],
-)
-
 # 为文件处理器设置自定义格式化器
 for handler in logging.getLogger().handlers:
     if isinstance(handler, logging.FileHandler):