pindo 5.13.12 → 5.13.13

data/lib/pindo/module/build/git_repo_helper.rb

@@ -58,7 +58,7 @@ module Pindo
       if Pindo::GitHandler.is_git_directory?(local_repo_dir: project_path)
         current_git_root_path = Pindo::GitHandler.git_root_directory(local_repo_dir: project_path)
         Dir.chdir(current_git_root_path)
-        pindo_common_dir = clone_pindo_common_config_repo(force_delete:false)
+        pindo_common_dir = Pindoconfig.instance.pindo_common_configdir
         if File.exist?(File.join(pindo_common_dir, 'cliff.toml'))
           FileUtils.cp_r(File.join(pindo_common_dir, 'cliff.toml'), File.join(current_git_root_path, 'cliff.toml'))
         end
@@ -104,30 +104,34 @@ module Pindo
       gitignore_path = File.join(git_root_dir, '.gitignore')
       file_modified = false
 
-      # 定义要添加的gitignore规则数组
-      ignore_rules = [
-        'Temp',
-        'Logs',
-        'build_ios.log',
-        'feishu.json',
-        'CHANGELOG.md',
-        'GoodPlatform/iOS/*',
-        'GoodPlatform/Android/*',
-        'GoodPlatform/BaseiOS/Unity/*',
-        'GoodPlatform/BaseiOS/Pods/',
-        'GoodPlatform/BaseiOS/build',
-        'GoodPlatform/BaseiOS/config.json',
-        'GoodPlatform/BaseiOS/Podfile.lock',
-        'GoodPlatform/BaseAndroid/Unity/*',
-        'GoodPlatform/BaseAndroid/build',
-        'GoodPlatform/WebGL',
-        'config.json',
-        'Assets/Packages',
-        'Assets/WebGLTemplates.meta',
-        'Assets/WebGLTemplates/',
-        'JPSMedia',
-        'Packages/packages-lock.json'
-      ]
+      # 从 pindo_common_config 读取 gitignore 规则
+      ignore_rules = []
+      begin
+        pindo_common_dir = Pindoconfig.instance.pindo_common_configdir
+        template_file = File.join(pindo_common_dir, 'gitignore_template.txt')
+
+        if File.exist?(template_file)
+          # 读取模板文件并解析每一行
+          File.readlines(template_file).each do |line|
+            # 去掉前后空白
+            rule = line.strip
+            # 去掉末尾的逗号
+            rule = rule.chomp(',')
+            # 去掉开头和结尾的单引号
+            rule = rule.gsub(/^'/, '').gsub(/'$/, '')
+            # 再次去掉空白
+            rule = rule.strip
+            # 跳过空行
+            ignore_rules << rule unless rule.empty?
+          end
+        else
+          Funlog.instance.fancyinfo_warning("未找到 gitignore_template.txt，跳过添加规则")
+          return false
+        end
+      rescue => e
+        Funlog.instance.fancyinfo_error("读取 gitignore 模板失败: #{e.message}")
+        return false
+      end
 
       # 读取现有的gitignore内容
       existing_lines = []

data/lib/pindo/module/pgyer/pgyerhelper.rb

@@ -55,7 +55,7 @@ module Pindo
         #   - project_name [String] 项目名称
         #   - project_id [String] 项目ID
         #   - workflow_info [Hash] 工作流信息（如果有效）
-        def try_load_jps_build_config(working_directory:, package_type:)
+        def try_load_jps_build_config(working_directory:, package_type:, manage_type: "")
           result = {
             valid: false,
             project_name: nil,
@@ -89,15 +89,24 @@ module Pindo
             return result
           end
 
-          # 5. 确定 workflow_key
-          workflow_key = case package_type
-            when 'ipa' then 'ipa_workflow'
-            when 'apk' then 'apk_workflow'
-            when 'zip' then 'webgl_workflow'
-            when 'app' then 'macos_workflow'
-            else
-              puts "[JPSConfig] 不支持的 package_type: #{package_type}"
-              return result
+          # 5. 根据 manage_type 决定 workflow_key
+          workflow_key = nil
+
+          if manage_type == "git"
+            # manage_type 为 git 时，直接使用 git_workflow
+            workflow_key = 'git_workflow'
+            puts "[JPSConfig] 使用 git_workflow 配置" if ENV['DEBUG']
+          else
+            # 按 package_type 查找
+            workflow_key = case package_type
+              when 'ipa' then 'ipa_workflow'
+              when 'apk' then 'apk_workflow'
+              when 'zip' then 'webgl_workflow'
+              when 'app' then 'macos_workflow'
+              else
+                puts "[JPSConfig] 不支持的 package_type: #{package_type}"
+                return result
+            end
           end
 
           # 6. 验证工作流配置
@@ -118,7 +127,7 @@ module Pindo
             manage_type: workflow['manage_type'] || ""
           }
 
-          puts "[JPSConfig] 配置验证通过" if ENV['DEBUG']
+          puts "[JPSConfig] 配置验证通过 (#{workflow_key})" if ENV['DEBUG']
           return result
         end
 
@@ -127,8 +136,9 @@ module Pindo
         # @param project_id [String] 项目ID
         # @param package_type [String] 包类型
         # @param working_directory [String] 工作目录
+        # @param manage_type [String] 管理类型（默认为空，"git" 时筛选 git 工作流）
         # @return [Hash] 选择的工作流信息
-        def select_workflow_for_project(project_id:, package_type:, working_directory:)
+        def select_workflow_for_project(project_id:, package_type:, working_directory:, manage_type: "")
           # 1. 从 JPS API 获取可用工作流列表
           Funlog.instance.fancyinfo_start("正在获取可用工作流...")
 
@@ -146,37 +156,49 @@ module Pindo
 
           Funlog.instance.fancyinfo_success("获取工作流列表成功，共 #{workflows.size} 个工作流")
 
-          # 2. 根据 package_type 过滤工作流（如果 API 返回的数据中有 packageType 字段）
-          filtered_workflows = workflows.select do |w|
-            # 如果工作流有 packageType 字段，进行过滤
-            if w['packageType']
-              case package_type
-              when 'ipa'
-                w['packageType'] == 'ipa'
-              when 'apk'
-                w['packageType'] == 'apk'
-              when 'zip'
-                w['packageType'] == 'zip'
+          # 2. 根据 manage_type 或 package_type 过滤工作流
+          if manage_type == "git"
+            # manage_type 为 git 时，只筛选 manage_type == "git" 的工作流，不看 package_type
+            # 严格筛选，不包括 manage_type 为空或其他类型的工作流
+            filtered_workflows = workflows.select do |w|
+              (w['manageType'] == 'git') || (w['manage_type'] == 'git')
+            end
+            type_desc = 'Git 管理类型'
+            # manage_type == "git" 时严格使用筛选结果，不降级
+            display_workflows = filtered_workflows
+          else
+            # 按 package_type 过滤工作流
+            filtered_workflows = workflows.select do |w|
+              # 如果工作流有 packageType 字段，进行过滤
+              if w['packageType']
+                case package_type
+                when 'ipa'
+                  w['packageType'] == 'ipa'
+                when 'apk'
+                  w['packageType'] == 'apk'
+                when 'zip'
+                  w['packageType'] == 'zip'
+                else
+                  true
+                end
               else
+                # 如果没有 packageType 字段，显示所有工作流
                 true
               end
-            else
-              # 如果没有 packageType 字段，显示所有工作流
-              true
             end
-          end
 
-          # 如果过滤后没有结果，使用所有工作流
-          display_workflows = filtered_workflows.empty? ? workflows : filtered_workflows
+            type_desc = case package_type
+              when 'ipa' then 'iOS IPA'
+              when 'apk' then 'Android APK'
+              when 'zip' then 'WebGL'
+              else package_type
+            end
 
-          # 3. 根据匹配数量决定选择方式
-          type_desc = case package_type
-            when 'ipa' then 'iOS IPA'
-            when 'apk' then 'Android APK'
-            when 'zip' then 'WebGL'
-            else package_type
+            # 非 git 模式下，如果过滤后没有结果，使用所有工作流
+            display_workflows = filtered_workflows.empty? ? workflows : filtered_workflows
           end
 
+          # 3. 根据匹配数量决定选择方式
           workflow = nil
 
           if display_workflows.empty?
@@ -378,7 +400,7 @@ module Pindo
           return app_info_obj, workflow_info
         end
 
-        def prepare_upload(working_directory:nil, proj_name:nil, package_type:nil)
+        def prepare_upload(working_directory:nil, proj_name:nil, package_type:nil, manage_type: "")
             upload_proj_name = proj_name
             if upload_proj_name.nil? || upload_proj_name.empty?
                 upload_proj_name = @proj_name
@@ -396,7 +418,8 @@ module Pindo
             if package_type
               config_result = try_load_jps_build_config(
                 working_directory: working_directory,
-                package_type: package_type
+                package_type: package_type,
+                manage_type: manage_type
               )
 
               if config_result[:valid]
@@ -444,14 +467,16 @@ module Pindo
                       workflow_info = select_workflow_for_project(
                         project_id: app_info_obj["id"],
                         package_type: package_type,
-                        working_directory: working_directory
+                        working_directory: working_directory,
+                        manage_type: manage_type
                       )
 
                       save_jps_build_config(
                         working_directory: working_directory,
                         app_info_obj: app_info_obj,
                         workflow_info: workflow_info,
-                        package_type: package_type
+                        package_type: package_type,
+                        manage_type: manage_type
                       )
 
                       @proj_name = upload_proj_name
@@ -568,14 +593,16 @@ module Pindo
                       workflow_info = select_workflow_for_project(
                         project_id: app_info_obj["id"],
                         package_type: package_type,
-                        working_directory: working_directory
+                        working_directory: working_directory,
+                        manage_type: manage_type
                       )
 
                       save_jps_build_config(
                         working_directory: working_directory,
                         app_info_obj: app_info_obj,
                         workflow_info: workflow_info,
-                        package_type: package_type
+                        package_type: package_type,
+                        manage_type: manage_type
                       )
 
                       @proj_name = upload_proj_name
@@ -821,70 +848,120 @@ module Pindo
             end
 
             # 2. 根据 git_commit_id 查找对应的 commit_log 记录
-            Funlog.instance.fancyinfo_start("正在根据 git commit id 查找 JPS 提交记录...")
+            Funlog.instance.fancyinfo_start("查找 JPS 提交记录...")
             commit_log = find_commit_log_by_git_commit_id(git_commit_id, workflow_id)
 
             if commit_log.nil?
-                Funlog.instance.fancyinfo_error("未找到 git commit id: #{git_commit_id} 对应的 JPS 提交记录")
-                Funlog.instance.warning("请确保该 commit 已经通过 JPS 发送过消息通知")
+                Funlog.instance.fancyinfo_error("未找到对应的 JPS 提交记录")
+                Funlog.instance.warning("请确保该 commit 已通过 JPS 发送过消息")
                 return result
             end
 
             commit_log_id = commit_log["id"]
             result[:commit_log_id] = commit_log_id
 
-            Funlog.instance.fancyinfo_success("找到 JPS 提交记录 ##{commit_log_id}")
-            puts "  项目: #{commit_log["projectName"]}"
-            puts "  工作流: #{commit_log["tabName"]}"
-            puts "  分支: #{commit_log["branch"]}"
-            puts
+            Funlog.instance.fancyinfo_success("找到提交记录 ##{commit_log_id}")
+            puts "  #{commit_log["projectName"]} / #{commit_log["tabName"]} / #{commit_log["branch"]}"
 
             # 3. 获取已存在的 fileUrls
             if commit_log["fileUrls"] && commit_log["fileUrls"].any?
                 result[:existing_urls] = commit_log["fileUrls"]
-                puts "已有附件: #{result[:existing_urls].size} 个"
+                puts "  已有附件: #{result[:existing_urls].size} 个"
             end
+            puts ""
+
+            # 4. 显示待上传的文件列表
+            puts "  📤 待上传文件（共 #{file_paths.size} 个）"
+            file_paths.each_with_index do |file_path, index|
+                if File.exist?(file_path)
+                    size_bytes = File.size(file_path)
+                    size_str = format_file_size(size_bytes)
+                    file_name = File.basename(file_path)
+                    puts "     #{index + 1}. #{file_name} (#{size_str})"
+                end
+            end
+            puts ""
+
+            # 5. 使用 UploadMediaClient 并发上传文件
+            Funlog.instance.fancyinfo_start("正在上传...")
 
-            # 4. 使用 UploadMediaClient 并发上传文件
             media_client = JPSClient::UploadMediaClient.new(@pgyer_client)
-            upload_result = media_client.upload_files(file_paths: file_paths)
 
-            # 5. 提取上传结果
+            # 在非调试模式下，临时重定向 JPSClient 的输出
+            if ENV['PINDO_DEBUG']
+                upload_result = media_client.upload_files(file_paths: file_paths)
+            else
+                # 保存原始的 stdout
+                original_stdout = $stdout.clone
+                # 临时重定向到 /dev/null
+                $stdout.reopen(File.new('/dev/null', 'w'))
+                begin
+                    upload_result = media_client.upload_files(file_paths: file_paths)
+                ensure
+                    # 恢复原始的 stdout
+                    $stdout.reopen(original_stdout)
+                end
+            end
+
+            # 6. 提取上传结果
             result[:success_urls] = upload_result["success_urls"]
             result[:failed_files] = upload_result["failed_files"]
 
-            # 6. 合并 URL 列表
+            # 显示上传结果
+            if result[:failed_files].any?
+                Funlog.instance.fancyinfo_error("上传完成：成功 #{result[:success_urls].size} 个，失败 #{result[:failed_files].size} 个")
+            else
+                Funlog.instance.fancyinfo_success("上传完成：成功 #{result[:success_urls].size} 个")
+            end
+
+            # 7. 合并 URL 列表
             result[:all_urls] = result[:existing_urls] + result[:success_urls]
 
-            # 7. 更新 commit_log
+            # 8. 更新 commit_log
             if result[:success_urls].any?
-                Funlog.instance.fancyinfo_start("正在更新提交记录附件...")
+                Funlog.instance.fancyinfo_start("更新提交记录...")
                 begin
                     update_result = @pgyer_client.update_commit_log(
                         id: commit_log_id,
                         params: { fileUrls: result[:all_urls] }
                     )
 
-                    if update_result && (update_result.dig("meta", "code") == 0 || update_result.dig("meta", "code") == 200)
+                    # 兼容两种响应格式：
+                    # 1. 新格式：{"code": 0, "data": ..., "msg": ...}
+                    # 2. 旧格式：{"meta": {"code": 0}, ...}
+                    response_code = update_result&.dig("code") || update_result&.dig("meta", "code")
+
+                    if update_result && (response_code == 0 || response_code == 200)
                         result[:update_success] = true
-                        Funlog.instance.fancyinfo_success("提交记录附件更新成功！共 #{result[:all_urls].size} 个附件")
+                        Funlog.instance.fancyinfo_success("附件已更新（共 #{result[:all_urls].size} 个）")
                     else
-                        error_msg = update_result&.dig("meta", "message") || "未知错误"
-                        Funlog.instance.fancyinfo_error("更新提交记录失败: #{error_msg}")
+                        # 提取详细错误信息
+                        error_code = update_result&.dig("code") || update_result&.dig("meta", "code")
+                        error_msg = update_result&.dig("msg") || update_result&.dig("meta", "message") || update_result&.dig("message")
+
+                        if ENV['PINDO_DEBUG']
+                            puts "[PINDO_DEBUG] update_commit_log 返回结果: #{update_result.inspect}"
+                            puts "[PINDO_DEBUG] commit_log_id: #{commit_log_id}"
+                            puts "[PINDO_DEBUG] fileUrls: #{result[:all_urls].inspect}"
+                        end
+
+                        error_detail = error_msg || "未知错误"
+                        error_detail = "#{error_detail} (错误码: #{error_code})" if error_code
+                        Funlog.instance.fancyinfo_error("更新失败: #{error_detail}")
                     end
                 rescue => e
-                    Funlog.instance.fancyinfo_error("更新提交记录失败: #{e.message}")
+                    Funlog.instance.fancyinfo_error("更新失败: #{e.message}")
+                    puts "[PINDO_DEBUG] 异常详情: #{e.class} - #{e.backtrace&.first}" if ENV['PINDO_DEBUG']
                 end
             else
-                Funlog.instance.warning("没有成功上传的文件，跳过更新提交记录")
+                Funlog.instance.warning("没有成功上传的文件")
             end
 
-            # 8. 输出统计
-            puts
-            puts "上传统计:"
-            puts "  成功: #{result[:success_urls].size} 个"
-            puts "  失败: #{result[:failed_files].size} 个"
-            puts "  总附件: #{result[:all_urls].size} 个"
+            # 9. 输出统计（简化，因为上面已经显示了上传结果）
+            if result[:all_urls].size > result[:success_urls].size
+                puts "  总附件数: #{result[:all_urls].size} 个（包含之前已有的 #{result[:existing_urls].size} 个）"
+            end
+            puts ""
 
             return result
         end
@@ -1460,6 +1537,19 @@ module Pindo
 
         end
 
+        # 格式化文件大小
+        # @param size [Integer] 字节数
+        # @return [String] 格式化后的大小
+        def format_file_size(size)
+            if size < 1024
+                "#{size}B"
+            elsif size < 1024 * 1024
+                "#{(size / 1024.0).round(1)}KB"
+            else
+                "#{(size / 1024.0 / 1024.0).round(1)}MB"
+            end
+        end
+
         private
 
         # 确定 JPSBuildConfig.json 文件路径
@@ -1526,19 +1616,26 @@ module Pindo
         # @param app_info_obj [Hash] 项目信息对象
         # @param workflow_info [Hash] 工作流信息
         # @param package_type [String] 包类型 ("ipa" | "apk" | "zip")
-        def save_jps_build_config(working_directory:, app_info_obj:, workflow_info:, package_type:)
-          return if working_directory.nil? || app_info_obj.nil? || workflow_info.nil? || package_type.nil?
+        def save_jps_build_config(working_directory:, app_info_obj:, workflow_info:, package_type:, manage_type: "")
+          return if working_directory.nil? || app_info_obj.nil? || workflow_info.nil?
 
           # 1. 确定配置文件路径
           config_file = determine_config_file_path(working_directory)
 
-          # 2. 确定 workflow_key
-          workflow_key = case package_type
-            when 'ipa' then 'ipa_workflow'
-            when 'apk' then 'apk_workflow'
-            when 'zip' then 'webgl_workflow'
-            when 'app' then 'macos_workflow'
-            else raise Informative, "不支持的 package_type: #{package_type}"
+          # 2. 根据 manage_type 或 package_type 确定 workflow_key
+          workflow_key = nil
+          if manage_type == "git"
+            # manage_type 为 git 时，使用 git_workflow
+            workflow_key = 'git_workflow'
+          else
+            # 按 package_type 确定 workflow_key
+            workflow_key = case package_type
+              when 'ipa' then 'ipa_workflow'
+              when 'apk' then 'apk_workflow'
+              when 'zip' then 'webgl_workflow'
+              when 'app' then 'macos_workflow'
+              else raise Informative, "不支持的 package_type: #{package_type}"
+            end
           end
 
           # 3. 准备新的项目基础信息