pindo 5.11.4 → 5.12.1

data/lib/pindo/command/jps/upload.rb

@@ -3,7 +3,10 @@ require 'fileutils'
 require 'json'
 require 'faraday'
 require 'pindo/module/pgyer/pgyerhelper'
+require 'pindo/module/build/git_repo_helper'
 require 'pindo/module/build/build_helper'
+require 'pindo/module/task/task_manager'
+require 'pindo/module/task/model/upload_task'
 
 module Pindo
     class Command
@@ -104,112 +107,280 @@ module Pindo
                 end
 
                 def run
-
                     current_project_dir = Dir.pwd
-                    build_helper = Pindo::BuildHelper.share_instance
 
-                    Dir.chdir(current_project_dir)
-                    is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(current_project_dir)
+                    # 创建任务列表
+                    tasks = make_upload_tasks(current_project_dir)
+
+                    # 执行任务
+                    task_manager = Pindo::TaskSystem::TaskManager.instance
+                    task_manager.clear_all
+                    tasks.each { |task| task_manager.add_task(task) }
+                    task_manager.start
+
+                    # 如果需要重签名，在所有上传任务完成后执行
+                    if @args_resign_flag
+                        args = []
+                        if @args_send_flag
+                            args << "--send"
+                        end
+                        if !@args_cert_id.nil? && !@args_cert_id.empty?
+                            args << "--certid=#{@args_cert_id}"
+                        end
+                        if !@args_proj_name.nil? && !@args_proj_name.empty?
+                            args << "--proj=#{@args_proj_name}"
+                        end
+                        Pindo::Command::Jps::Resign::run(args)
+                    end
+                end
+
+                private
+
+                # 创建上传任务列表
+                def make_upload_tasks(project_dir)
+                    tasks = []
+
+                    # 1. Git Tag 任务（检查并添加标签）
+                    git_repo_helper = Pindo::GitRepoHelper.share_instance
+                    Dir.chdir(project_dir)
+                    is_need_add_tag, tag_action_parms = git_repo_helper.check_is_need_add_tag?(project_dir)
                     if is_need_add_tag
-                        Pindo::Command::Utils::Tag::run(tag_action_parms)
+                      git_repo_helper.create_and_push_tag(
+                        project_dir: project_dir,
+                        mode: 'minor',
+                        force_retag: tag_action_parms&.include?('--retag') || false,
+                        custom_tag: nil,
+                        release_branch: 'master'
+                      )
                     end
 
-                    if @args_ipa_file.nil? || !File.exist?(@args_ipa_file)
-                        # 获取build目录下的ipa文件
-                        project_type = build_helper.project_type(current_project_dir)
-                        case project_type
-                        when :ios
-                            build_path = File.join(current_project_dir, "build", "*.{ipa,app}")
-                            @args_ipa_file = Dir.glob(build_path).max_by {|f| File.mtime(f)}
-                        when :android
-                            # 搜索 build 目录下的所有 apk 文件（包括子目录）
-                            build_path = File.join(current_project_dir, "build", "**", "*.{apk}")
-                            @args_ipa_file = Dir.glob(build_path).max_by {|f| File.mtime(f)}
-                        when :unity
-                            # Unity 工程支持三种平台的包：iOS、Android 和 WebGL
-                            all_packages = []
-
-                            # 检测 iOS 包（收集所有 iOS 包）
-                            if File.exist?(File.join(current_project_dir, "GoodPlatform/BaseiOS/build"))
-                                ios_build_path = File.join(current_project_dir, "GoodPlatform/BaseiOS/build", "*.{ipa,app}")
-                                all_packages.concat(Dir.glob(ios_build_path))
-                            end
+                    # 2. 查找并创建上传任务
+                    upload_tasks = find_and_create_upload_tasks(project_dir)
+                    tasks.concat(upload_tasks)
 
-                            if File.exist?(File.join(current_project_dir, "GoodPlatform/iOS/build"))
-                                ios_build_path = File.join(current_project_dir, "GoodPlatform/iOS/build", "*.{ipa,app}")
-                                all_packages.concat(Dir.glob(ios_build_path))
-                            end
+                    tasks
+                end
 
-                            # 检测 Android 包（收集所有 Android 包，包括子目录）
-                            if File.exist?(File.join(current_project_dir, "GoodPlatform/BaseAndroid/build"))
-                                android_build_path = File.join(current_project_dir, "GoodPlatform/BaseAndroid/build", "**", "*.{apk,aab}")
-                                all_packages.concat(Dir.glob(android_build_path))
-                            end
+                # 查找文件并创建上传任务
+                def find_and_create_upload_tasks(project_dir)
+                    tasks = []
 
-                            if File.exist?(File.join(current_project_dir, "GoodPlatform/Android/build"))
-                                android_build_path = File.join(current_project_dir, "GoodPlatform/Android/build", "**", "*.{apk,aab}")
-                                all_packages.concat(Dir.glob(android_build_path))
-                            end
+                    # 如果用户指定了文件，直接创建上传任务
+                    if @args_ipa_file && !@args_ipa_file.empty? && File.exist?(@args_ipa_file)
+                        file_type = determine_file_type(@args_ipa_file)
+                        tasks << create_upload_task(file_type, project_dir, @args_ipa_file)
+                        return tasks
+                    end
 
-                            # 检测 WebGL 包（HTML 文件）
-                            if File.exist?(File.join(current_project_dir, "GoodPlatform/WebGL/build"))
-                                webgl_build_path = File.join(current_project_dir, "GoodPlatform/WebGL/build", "index.html")
-                                webgl_files = Dir.glob(webgl_build_path)
-                                all_packages.concat(webgl_files)
-                            end
+                    # 根据项目类型查找文件
+                    build_helper = Pindo::BuildHelper.share_instance
+                    project_type = build_helper.project_type(project_dir)
+
+                    case project_type
+                    when :ios
+                        find_and_confirm_ios_package(project_dir, tasks)
+                    when :android
+                        find_and_confirm_android_package(project_dir, tasks)
+                    when :unity
+                        find_and_confirm_unity_packages(project_dir, tasks)
+                    else
+                        # 不是工程目录，尝试在根目录查找
+                        find_and_confirm_fallback_package(project_dir, tasks)
+                    end
 
-                            # 从所有找到的包中选择最新的一个
-                            if all_packages.length > 0
-                                # 选择修改时间最新的文件
-                                @args_ipa_file = all_packages.max_by {|f| File.mtime(f)}
+                    # 如果没有找到任何文件，让用户手动输入
+                    if tasks.empty?
+                        manual_file = ask('需要上传的文件:') || nil
+                        if manual_file && !manual_file.empty?
+                            manual_file = manual_file.strip.gsub(/\\ /, ' ')
+                            if File.exist?(manual_file)
+                                file_type = determine_file_type(manual_file)
+                                tasks << create_upload_task(file_type, File.dirname(manual_file), manual_file)
                             else
-                                @args_ipa_file = nil
+                                raise Informative, "#{manual_file} 文件不存在"
                             end
-                        else
-                            raise Informative, "当前目录不是工程目录，不能编译"
                         end
+                    end
 
+                    if tasks.empty?
+                        raise Informative, "未找到可上传的文件"
+                    end
 
-                        if @args_ipa_file.nil?
-                            build_path = File.join(current_project_dir, "*.{ipa,app,apk,html}")
-                            @args_ipa_file = Dir.glob(build_path).max_by {|f| File.mtime(f)}
-                        end
+                    tasks
+                end
 
-                        if !@args_ipa_file.nil?
-                            answer = agree("需要上传的文件是: #{@args_ipa_file} ?(Y/n)")
-                            if !answer
-                                @args_ipa_file = nil
-                            end
+                # 查找并确认 iOS/macOS 包
+                def find_and_confirm_ios_package(project_dir, tasks)
+                    # 判断是 macOS 还是 iOS 工程
+                    build_helper = Pindo::BuildHelper.share_instance
+                    is_macos = build_helper.macos_project?(project_dir)
+
+                    if is_macos
+                        # macOS 工程查找 .app 文件
+                        macos_file = find_macos_package(project_dir)
+                        if macos_file && confirm_file(macos_file)
+                            tasks << create_upload_task('app', File.dirname(macos_file), macos_file)
+                        end
+                    else
+                        # iOS 工程查找 .ipa 文件
+                        ios_file = find_ios_package(project_dir)
+                        if ios_file && confirm_file(ios_file)
+                            tasks << create_upload_task('ipa', File.dirname(ios_file), ios_file)
                         end
+                    end
+                end
+
+                # 查找并确认 Android 包
+                def find_and_confirm_android_package(project_dir, tasks)
+                    android_file = find_android_package(project_dir)
+                    if android_file && confirm_file(android_file)
+                        tasks << create_upload_task('apk', File.dirname(android_file), android_file)
+                    end
+                end
+
+                # 查找并确认 Unity 包（可能有多个平台）
+                def find_and_confirm_unity_packages(project_dir, tasks)
+                    # 1. 查找所有平台的文件
+                    ios_file = find_unity_ios_package(project_dir)
+                    android_file = find_unity_android_package(project_dir)
+                    webgl_file = find_unity_webgl_package(project_dir)
+
+                    # 2. 收集找到的文件
+                    found_files = []
+                    found_files << { file: ios_file, type: 'ipa', name: 'iOS' } if ios_file
+                    found_files << { file: android_file, type: 'apk', name: 'Android' } if android_file
+                    found_files << { file: webgl_file, type: 'html', name: 'WebGL' } if webgl_file
+
+                    # 3. 如果没有找到任何文件，直接返回
+                    return if found_files.empty?
+
+                    # 4. 输出找到的所有文件
+                    puts "\n找到以下 Unity 构建文件:"
+                    found_files.each_with_index do |info, index|
+                        puts "  #{index + 1}. [#{info[:name]}] #{info[:file]}"
+                    end
+                    puts ""
 
-                        if !@args_ipa_file.nil? && File.exist?(@args_ipa_file)
-                        else
-                            @args_ipa_file = ask('需要上传的文件:') || nil
-                            @args_ipa_file = @args_ipa_file.strip.gsub(/\\ /, ' ')
+                    # 5. 逐个确认是否上传
+                    found_files.each do |info|
+                        if confirm_file(info[:file])
+                            tasks << create_upload_task(info[:type], File.dirname(info[:file]), info[:file])
                         end
                     end
+                end
+
+                # 在项目根目录查找包（兜底）
+                def find_and_confirm_fallback_package(project_dir, tasks)
+                    build_path = File.join(project_dir, "*.{ipa,app,apk,html}")
+                    file = Dir.glob(build_path).max_by {|f| File.mtime(f)}
+                    if file && confirm_file(file)
+                        file_type = determine_file_type(file)
+                        tasks << create_upload_task(file_type, File.dirname(file), file)
+                    end
+                end
+
+                # 查找 iOS 包
+                def find_ios_package(project_dir)
+                    build_path = File.join(project_dir, "build", "*.ipa")
+                    Dir.glob(build_path).max_by {|f| File.mtime(f)}
+                end
+
+                # 查找 macOS 包
+                def find_macos_package(project_dir)
+                    build_path = File.join(project_dir, "build", "*.app")
+                    Dir.glob(build_path).max_by {|f| File.mtime(f)}
+                end
+
+                # 查找 Android 包
+                def find_android_package(project_dir)
+                    build_path = File.join(project_dir, "build", "**", "*.{apk}")
+                    Dir.glob(build_path).max_by {|f| File.mtime(f)}
+                end
+
+                # 查找 Unity iOS 包
+                def find_unity_ios_package(project_dir)
+                    ios_files = []
+
+                    # 检测 BaseiOS
+                    base_ios_dir = File.join(project_dir, "GoodPlatform/BaseiOS/build")
+                    if File.exist?(base_ios_dir)
+                        build_path = File.join(base_ios_dir, "*.{ipa,app}")
+                        ios_files.concat(Dir.glob(build_path))
+                    end
+
+                    # 检测 iOS
+                    ios_dir = File.join(project_dir, "GoodPlatform/iOS/build")
+                    if File.exist?(ios_dir)
+                        build_path = File.join(ios_dir, "*.{ipa,app}")
+                        ios_files.concat(Dir.glob(build_path))
+                    end
+
+                    ios_files.max_by {|f| File.mtime(f)} if ios_files.any?
+                end
+
+                # 查找 Unity Android 包
+                def find_unity_android_package(project_dir)
+                    android_files = []
+
+                    # 检测 BaseAndroid
+                    base_android_dir = File.join(project_dir, "GoodPlatform/BaseAndroid/build")
+                    if File.exist?(base_android_dir)
+                        build_path = File.join(base_android_dir, "**", "*.{apk}")
+                        android_files.concat(Dir.glob(build_path))
+                    end
+
+                    # 检测 Android
+                    android_dir = File.join(project_dir, "GoodPlatform/Android/build")
+                    if File.exist?(android_dir)
+                        build_path = File.join(android_dir, "**", "*.{apk}")
+                        android_files.concat(Dir.glob(build_path))
+                    end
+
+                    android_files.max_by {|f| File.mtime(f)} if android_files.any?
+                end
 
-                    if !File.exist?(@args_ipa_file)
-                        raise Informative, "#{@args_ipa_file} 文件不存在"
+                # 查找 Unity WebGL 包
+                def find_unity_webgl_package(project_dir)
+                    webgl_dir = File.join(project_dir, "GoodPlatform/WebGL/build")
+                    if File.exist?(webgl_dir)
+                        webgl_file = File.join(webgl_dir, "index.html")
+                        return webgl_file if File.exist?(webgl_file)
                     end
+                    nil
+                end
 
-                    # 根据文件后缀确定 package_type
-                    package_type = nil
-                    ext = File.extname(@args_ipa_file).downcase
+                # 确认文件（交互式）
+                def confirm_file(file_path)
+                    answer = agree("需要上传文件: #{file_path} ?(Y/n)")
+                    answer
+                end
+
+                # 根据文件扩展名确定文件类型
+                def determine_file_type(file_path)
+                    ext = File.extname(file_path).downcase
                     case ext
                     when '.ipa'
-                        package_type = 'ipa'
+                        'ipa'
                     when '.apk'
-                        package_type = 'apk'
+                        'apk'
                     when '.html'
-                        package_type = 'zip'
+                        'html'
                     when '.app'
-                        package_type = 'mac'
+                        'app'
                     else
                         raise Informative, "不支持的文件类型: #{ext}，支持的类型：.ipa, .apk, .html, .app"
                     end
+                end
 
-                    PgyerHelper.share_instace.setForeLogin(beforeLogin:@args_login_flag)
+                # 创建上传任务
+                def create_upload_task(file_type, upload_path, upload_file)
+                    # 设置 PgyerHelper 登录选项
+                    PgyerHelper.share_instace.setForeLogin(beforeLogin: @args_login_flag)
+
+                    # 根据 file_type 确定 package_type（用于获取 JPS 配置）
+                    package_type = file_type == 'html' ? 'zip' : file_type
+
+                    # 提前获取 JPS 配置（app_info_obj 和 workflow_info）
                     app_info_obj, workflow_info = PgyerHelper.share_instace.prepare_upload(
                         working_directory: Dir.pwd,
                         proj_name: @args_proj_name,
@@ -220,53 +391,22 @@ module Pindo
                         raise Informative, "#{@args_proj_name} 错误， 请输入正确的App代号名称， jps网站没有该App"
                     end
 
-                    result_data = PgyerHelper.share_instace.start_upload(
+                    # 创建 UploadTask
+                    Pindo::TaskSystem::UploadTask.new(
+                        file_type,
+                        upload_path,
+                        upload_file,
                         app_info_obj: app_info_obj,
-                        ipa_file_upload: @args_ipa_file,
-                        description: @args_upload_desc,
-                        workflow_info: workflow_info
+                        workflow_info: workflow_info,
+                        project_name: @args_proj_name,
+                        context: {
+                            upload_desc: @args_upload_desc,
+                            send_to_chat: @args_send_flag
+                        }
                     )
-                    if !result_data.nil? && !result_data["data"].nil? && !result_data["data"]["id"].nil?
-                        PgyerHelper.share_instace.print_app_version_info(
-                            app_info_obj: app_info_obj,
-                            app_version_info_obj: result_data["data"]
-                        )
-
-                        if @args_resign_flag
-                            args = []
-                            if @args_send_flag
-                                args << "--send"
-                            end
-                            if !@args_cert_id.nil? && !@args_cert_id.empty?
-                                args << "--certid=#{@args_cert_id}"
-                            end
-                            if !@args_proj_name.nil? && !@args_proj_name.empty?
-                                args << "--proj=#{@args_proj_name}"
-                            end
-                            Pindo::Command::Jps::Resign::run(args)
-                        else
-                            # 始终发送给自己
-                            PgyerHelper.share_instace.send_apptest_msg(
-                                app_info_obj: app_info_obj,
-                                app_version_info_obj: result_data["data"],
-                                receiveType: "self"
-                            )
-
-                            # 如果有 --send 参数，额外发送到测试群
-                            if @args_send_flag
-                                PgyerHelper.share_instace.send_apptest_msg(
-                                    app_info_obj: app_info_obj,
-                                    app_version_info_obj: result_data["data"],
-                                    chatEnv: "DevTest",
-                                    receiveType: "chat"
-                                )
-                            end
-                        end
-                    end
-
                 end
 
             end
         end
     end
-end
+end