pindo 5.11.2 → 5.11.4

data/lib/pindo/module/task/model/build_task.rb

@@ -0,0 +1,361 @@
+require_relative '../pindo_task'
+require_relative '../task_config'
+
+module Pindo
+  module TaskSystem
+    class BuildTask < PindoTask
+      attr_reader :platform, :build_type, :output_path
+
+      def self.task_type
+        :build
+      end
+
+      def self.execution_mode
+        ExecutionMode::TYPE_EXCLUSIVE  # 同类型串行（不能同时构建多个）
+      end
+
+      def self.execution_type
+        ExecutionType::ASYNC  # 在新线程异步执行
+      end
+
+      def initialize(platform, options = {})
+        @platform = platform
+        @build_type = options[:build_type] || platform
+        @project_path = options[:project_path] || Dir.pwd
+        @build_config = options[:build_config] || {}
+        @output_path = nil
+
+        name = case platform
+               when 'ios', 'ipa'
+                 "构建 IPA"
+               when 'android', 'apk'
+                 "构建 APK"
+               when 'web', 'html'
+                 "构建 HTML"
+               else
+                 "构建 #{platform.upcase}"
+               end
+
+        super(name, options)
+      end
+
+      protected
+
+      def do_work
+        update_progress(0, "准备构建环境...")
+
+        case @platform
+        when 'ios', 'ipa'
+          build_ios
+        when 'android', 'apk'
+          build_android
+        when 'web', 'html'
+          build_web
+        else
+          raise "Unsupported platform: #{@platform}"
+        end
+      end
+
+      private
+
+      def build_ios
+        update_progress(10, "配置 iOS 工程...")
+
+        # 获取 Bundle ID
+        mainapp_bundleid = @context[:bundle_id] || @build_config[:bundle_id]
+
+        unless mainapp_bundleid
+          raise "iOS Bundle ID 未指定"
+        end
+
+        update_progress(20, "准备编译参数...")
+
+        args_temp = []
+        args_temp << "--bundleid=#{mainapp_bundleid}"
+
+        # 不传递 upload 参数，只构建
+        if @context[:project_name]
+          args_temp << "--proj=#{@context[:project_name]}"
+        end
+
+        update_progress(30, "执行 iOS 构建...")
+
+        # 切换到 iOS 目录并执行构建
+        ios_dir = File.join(@project_path, "GoodPlatform", "iOS")
+        if File.directory?(ios_dir)
+          Dir.chdir(ios_dir) do
+            # 调用 iOS autobuild 命令（不包含上传）
+            require 'pindo/command/ios/autobuild'
+            Pindo::Command::Ios::Autobuild::run(args_temp)
+          end
+        else
+          # 如果没有 iOS 子目录，在当前目录执行
+          require 'pindo/command/ios/autobuild'
+          Pindo::Command::Ios::Autobuild::run(args_temp)
+        end
+
+        update_progress(90, "iOS 构建完成")
+
+        # TODO: 获取实际的输出路径
+        @output_path = find_ipa_output_path
+
+        update_progress(100, "IPA 构建成功")
+        {
+          success: true,
+          platform: 'ios',
+          output: @output_path
+        }
+      end
+
+      def build_android
+        update_progress(10, "配置 Android 工程...")
+
+        # 获取 Bundle Name
+        bundle_name = @context[:bundle_name] || @build_config[:bundle_name]
+
+        update_progress(20, "准备编译参数...")
+
+        args_temp = []
+
+        if bundle_name
+          args_temp << "--bundle_name=#{bundle_name}"
+        end
+
+        # 不传递 upload 参数，只构建
+        if @context[:project_name]
+          args_temp << "--proj=#{@context[:project_name]}"
+        end
+
+        update_progress(30, "执行 Android 构建...")
+
+        # 切换到 Android 目录并执行构建
+        android_dir = File.join(@project_path, "GoodPlatform", "Android")
+        if File.directory?(android_dir)
+          Dir.chdir(android_dir) do
+            # 调用 Android autobuild 命令（不包含上传）
+            require 'pindo/command/android/autobuild'
+            Pindo::Command::Android::Autobuild::run(args_temp)
+          end
+        else
+          # 如果没有 Android 子目录，在当前目录执行
+          require 'pindo/command/android/autobuild'
+          Pindo::Command::Android::Autobuild::run(args_temp)
+        end
+
+        update_progress(90, "Android 构建完成")
+
+        # TODO: 获取实际的输出路径
+        @output_path = find_apk_output_path
+
+        update_progress(100, "APK 构建成功")
+        {
+          success: true,
+          platform: 'android',
+          output: @output_path
+        }
+      end
+
+      def build_web
+        update_progress(10, "配置 Web 工程...")
+
+        # 获取 Bundle Name (Web 也可能需要)
+        bundle_name = @context[:bundle_name] || @build_config[:bundle_name]
+
+        update_progress(20, "准备编译参数...")
+
+        args_temp = []
+
+        if bundle_name
+          args_temp << "--bundle_name=#{bundle_name}"
+        end
+
+        # 不传递 upload 参数，只构建
+        if @context[:project_name]
+          args_temp << "--proj=#{@context[:project_name]}"
+        end
+
+        update_progress(30, "执行 Web 构建...")
+
+        # 切换到 Web 目录并执行构建
+        web_dir = File.join(@project_path, "GoodPlatform", "Web")
+        if File.directory?(web_dir)
+          Dir.chdir(web_dir) do
+            # TODO: 需要确认 Web autobuild 命令的正确模块
+            # 暂时使用 Android::Autobuild（根据原代码）
+            require 'pindo/command/android/autobuild'
+            Pindo::Command::Android::Autobuild::run(args_temp)
+          end
+        else
+          # 如果没有 Web 子目录，在当前目录执行
+          require 'pindo/command/android/autobuild'
+          Pindo::Command::Android::Autobuild::run(args_temp)
+        end
+
+        update_progress(90, "Web 构建完成")
+
+        # TODO: 获取实际的输出路径
+        @output_path = find_web_output_path
+
+        update_progress(100, "HTML 构建成功")
+        {
+          success: true,
+          platform: 'web',
+          output: @output_path
+        }
+      end
+
+      # 查找 IPA 输出路径
+      def find_ipa_output_path
+        # 记录查找前的时间，用于过滤旧文件
+        start_time = @started_at || Time.now - 60
+
+        # 使用配置中的搜索路径
+        search_paths = TaskConfig::BUILD_OUTPUT_PATTERNS[:ipa].map do |pattern|
+          File.join(@project_path, pattern)
+        end
+
+        ipa_files = []
+        search_paths.each do |pattern|
+          files = Dir.glob(pattern)
+          # 过滤出在构建开始后创建或修改的文件
+          recent_files = files.select { |f| File.mtime(f) >= start_time }
+          ipa_files.concat(recent_files)
+        end
+
+        if ipa_files.empty?
+          # 如果没有找到新文件，查找最近的 IPA 文件
+          search_paths.each do |pattern|
+            ipa_files.concat(Dir.glob(pattern))
+          end
+        end
+
+        # 返回最新的 IPA 文件
+        if ipa_files.any?
+          latest_ipa = ipa_files.max_by { |f| File.mtime(f) }
+          puts "  找到 IPA 文件: #{latest_ipa}"
+          latest_ipa
+        else
+          puts "  警告: 未找到 IPA 文件"
+          nil
+        end
+      end
+
+      # 查找 APK 输出路径
+      def find_apk_output_path
+        # 记录查找前的时间，用于过滤旧文件
+        start_time = @started_at || Time.now - 60
+
+        # 使用配置中的搜索路径
+        search_paths = []
+        search_paths.concat(TaskConfig::BUILD_OUTPUT_PATTERNS[:apk].map { |p| File.join(@project_path, p) })
+        search_paths.concat(TaskConfig::BUILD_OUTPUT_PATTERNS[:aab].map { |p| File.join(@project_path, p) })
+
+        package_files = []
+        search_paths.each do |pattern|
+          files = Dir.glob(pattern)
+          # 过滤出在构建开始后创建或修改的文件
+          recent_files = files.select { |f| File.mtime(f) >= start_time }
+          package_files.concat(recent_files)
+        end
+
+        if package_files.empty?
+          # 如果没有找到新文件，查找最近的包文件
+          search_paths.each do |pattern|
+            package_files.concat(Dir.glob(pattern))
+          end
+        end
+
+        # 过滤掉测试包和未签名包
+        package_files.reject! do |f|
+          basename = File.basename(f).downcase
+          TaskConfig::EXCLUDED_PATTERNS.any? { |pattern| basename.include?(pattern) }
+        end
+
+        # 返回最新的包文件（优先 AAB，其次 APK）
+        if package_files.any?
+          # 分类文件
+          aab_files = package_files.select { |f| f.end_with?(".aab") }
+          apk_files = package_files.select { |f| f.end_with?(".apk") }
+
+          # 优先返回 AAB 文件
+          latest_package = if aab_files.any?
+                            aab_files.max_by { |f| File.mtime(f) }
+                          elsif apk_files.any?
+                            apk_files.max_by { |f| File.mtime(f) }
+                          else
+                            package_files.max_by { |f| File.mtime(f) }
+                          end
+
+          puts "  找到 Android 包文件: #{latest_package}"
+          latest_package
+        else
+          puts "  警告: 未找到 APK/AAB 文件"
+          nil
+        end
+      end
+
+      # 查找 Web 输出路径
+      def find_web_output_path
+        # 记录查找前的时间，用于过滤旧文件
+        start_time = @started_at || Time.now - 60
+
+        # 可能的 Web 构建输出位置（通常是文件夹）
+        search_paths = [
+          File.join(@project_path, "build", "web"),
+          File.join(@project_path, "build", "webgl"),
+          File.join(@project_path, "output", "web"),
+          File.join(@project_path, "output", "webgl"),
+          File.join(@project_path, "GoodPlatform", "Web"),
+          File.join(@project_path, "GoodPlatform", "WebGL"),
+          File.join(@project_path, "Build", "WebGL"),
+          File.join(@project_path, "dist"),
+          File.join(@project_path, "public")
+        ]
+
+        # 查找存在且最近修改的文件夹
+        web_dirs = search_paths.select do |path|
+          File.directory?(path) && File.mtime(path) >= start_time
+        end
+
+        if web_dirs.empty?
+          # 如果没有找到新文件夹，查找包含 index.html 的文件夹
+          web_dirs = search_paths.select do |path|
+            File.directory?(path) && File.exist?(File.join(path, "index.html"))
+          end
+        end
+
+        # 如果还是没找到，查找 zip 文件
+        if web_dirs.empty?
+          zip_patterns = [
+            File.join(@project_path, "build", "**", "*web*.zip"),
+            File.join(@project_path, "output", "**", "*web*.zip"),
+            File.join(@project_path, "**", "*webgl*.zip")
+          ]
+
+          zip_files = []
+          zip_patterns.each do |pattern|
+            files = Dir.glob(pattern)
+            recent_files = files.select { |f| File.mtime(f) >= start_time }
+            zip_files.concat(recent_files)
+          end
+
+          if zip_files.any?
+            latest_zip = zip_files.max_by { |f| File.mtime(f) }
+            puts "  找到 Web 压缩包: #{latest_zip}"
+            return latest_zip
+          end
+        end
+
+        # 返回最新的 Web 目录
+        if web_dirs.any?
+          latest_dir = web_dirs.max_by { |d| File.mtime(d) }
+          puts "  找到 Web 输出目录: #{latest_dir}"
+          latest_dir
+        else
+          puts "  警告: 未找到 Web 输出文件或目录"
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/pindo/module/task/model/unity_export_task.rb

@@ -0,0 +1,201 @@
+require_relative '../pindo_task'
+
+module Pindo
+  module TaskSystem
+    class UnityExportTask < PindoTask
+      attr_reader :platform, :unity_project_path, :export_path
+
+      def self.task_type
+        :unity_export
+      end
+
+      def self.execution_mode
+        ExecutionMode::EXCLUSIVE  # Unity 必须独占执行
+      end
+
+      def self.execution_type
+        ExecutionType::SYNC  # 在主线程同步执行（Unity 不能多进程）
+      end
+
+      def initialize(platform, options = {})
+        @platform = platform
+        @unity_project_path = options[:project_path] || Dir.pwd
+        @unity_exe_path = options[:unity_exe_path]
+        @unity_helper = options[:unity_helper]
+        @is_library_mode = options[:library_mode] || false
+        @export_path = nil
+
+        name = case platform
+               when 'ios', 'ipa'
+                 "Unity 导出 iOS"
+               when 'android', 'apk'
+                 "Unity 导出 Android"
+               when 'web', 'html'
+                 "Unity 导出 WebGL"
+               else
+                 "Unity 导出 #{platform.upcase}"
+               end
+
+        super(name, options)
+      end
+
+      def validate
+        # 验证 Unity 工程是否存在
+        unless @unity_helper
+          @unity_helper = Pindo::Client::UnityHelper.share_instance
+        end
+
+        unless @unity_helper.unity_project?(@unity_project_path)
+          @error = "当前目录不是 Unity 工程：#{@unity_project_path}"
+          return false
+        end
+
+        true
+      end
+
+      protected
+
+      def do_work
+        update_progress(0, "启动 Unity...")
+
+        # 确保 Unity helper 已初始化
+        @unity_helper ||= Pindo::Client::UnityHelper.share_instance
+
+        # 获取 Unity 版本
+        update_progress(10, "检查 Unity 版本...")
+        project_unity_version = @unity_helper.get_unity_version(@unity_project_path)
+
+        # 查找 Unity 执行路径
+        unless @unity_exe_path
+          update_progress(20, "查找 Unity 路径...")
+          @unity_exe_path = @unity_helper.find_unity_path(
+            project_unity_version: project_unity_version,
+            force_change_version: false
+          )
+        end
+
+        if @unity_exe_path.nil? || @unity_exe_path.empty?
+          raise "无法找到 Unity 执行路径"
+        end
+
+        update_progress(30, "准备 Unity 导出...")
+
+        # 显示 Unity 信息
+        puts "  Unity 版本: #{project_unity_version}"
+        puts "  Unity 路径: #{@unity_exe_path}"
+
+        # 执行 Unity 导出
+        case @platform
+        when 'ios', 'ipa'
+          export_ios
+        when 'android', 'apk'
+          export_android
+        when 'web', 'html'
+          export_web
+        else
+          raise "Unsupported platform: #{@platform}"
+        end
+      end
+
+      private
+
+      def export_ios
+        update_progress(40, "执行 Unity iOS 导出...")
+
+        platform = 'iOS'
+        result = execute_unity_build(platform)
+
+        update_progress(90, "Unity iOS 导出完成")
+
+        # 设置导出路径
+        @export_path = File.join(@unity_project_path, "GoodPlatform", "iOS")
+
+        update_progress(100, "Unity iOS 导出成功")
+        {
+          success: true,
+          platform: 'ios',
+          export_path: @export_path,
+          unity_result: result
+        }
+      end
+
+      def export_android
+        update_progress(40, "执行 Unity Android 导出...")
+
+        platform = 'Android'
+        result = execute_unity_build(platform)
+
+        update_progress(90, "Unity Android 导出完成")
+
+        # 设置导出路径
+        @export_path = File.join(@unity_project_path, "GoodPlatform", "Android")
+
+        update_progress(100, "Unity Android 导出成功")
+        {
+          success: true,
+          platform: 'android',
+          export_path: @export_path,
+          unity_result: result
+        }
+      end
+
+      def export_web
+        update_progress(40, "执行 Unity WebGL 导出...")
+
+        platform = 'WebGL'
+        result = execute_unity_build(platform)
+
+        update_progress(90, "Unity WebGL 导出完成")
+
+        # 设置导出路径
+        @export_path = File.join(@unity_project_path, "GoodPlatform", "Web")
+
+        update_progress(100, "Unity WebGL 导出成功")
+        {
+          success: true,
+          platform: 'web',
+          export_path: @export_path,
+          unity_result: result
+        }
+      end
+
+      def execute_unity_build(platform)
+        # 检查 Unity 进程
+        update_progress(50, "检查 Unity 进程...")
+        @unity_helper.check_unity_processes(
+          unity_exe_full_path: @unity_exe_path,
+          project_path: @unity_project_path
+        )
+
+        # 执行构建
+        update_progress(60, "开始 Unity 构建...")
+        begin
+          result = @unity_helper.build_project(
+            unity_exe_full_path: @unity_exe_path,
+            project_path: @unity_project_path,
+            platform: platform,
+            isLibrary: @is_library_mode,
+            indexNo: nil
+          )
+
+          # 清理 Unity 进程
+          update_progress(85, "清理 Unity 进程...")
+          @unity_helper.cleanup_unity_processes_after_build(
+            unity_exe_full_path: @unity_exe_path,
+            project_path: @unity_project_path
+          )
+
+          result
+        rescue => e
+          # 确保清理进程
+          @unity_helper.cleanup_unity_processes_after_build(
+            unity_exe_full_path: @unity_exe_path,
+            project_path: @unity_project_path
+          ) rescue nil
+
+          raise e
+        end
+      end
+    end
+  end
+end