pindo 5.20.6 → 5.20.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0edb06546cd16285c138448253905ee5649e4e171af1a13cfbb61942f169e03
-  data.tar.gz: 88760601ffcc0a1863d537a8e1bf5a7f26f7ddb840b96831825e3699a26d2f5c
+  metadata.gz: 1f5a6e7629e145e28daaf6e8bd9f5ef838a47a5eb064f02828a158eb9483b283
+  data.tar.gz: 320e0f2169ca80df136fdf09ca6ac21da7368405c39e763f7f5e92fe2717a7a4
 SHA512:
-  metadata.gz: c35bf1529656b6a5a24a2e727db177943ce3ab78a3fcc837a985b4584a62e1512897430e6520c4eaf146bc2a7b3c8ba6fca8d9e1af270826b31f0a070f81a8da
-  data.tar.gz: 4a9ecf6b0f98d988ca930c660d7082f0fe266698934926238482577cef0cd4c1f594ef686532a61aafa7a3cbb046aead11fa776da7a444344362b881d6d0e607
+  metadata.gz: c216eeacfa2afc59bb33b1195459acbdebe880c9aee6d59c07b52fa080c564861786a17bccef0f23c1f17976e92f892fe6b94a97fdcdd519e51a927220bc3108
+  data.tar.gz: dcead01b8d154b1ec138dcc489b509307e5cef5ce090fb34c214c32ba2af8d6f76e0665bac5a6eece1b307090621842c45b79955b74d72b621b8d0545844ec71

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

@@ -0,0 +1,99 @@
+require 'fastimage'
+require 'open3'
+
+module Pindo
+  module MediaUrlHelper
+    module_function
+
+    def decorated_success_urls(upload_result)
+      upload_results = upload_result["results"]
+      if upload_results.is_a?(Array) && upload_results.any?
+        return upload_results.select { |item| item["success"] && item["url"] }.map do |item|
+          decorate_media_url(item["url"], item["file_path"])
+        end
+      end
+
+      upload_result["success_urls"] || []
+    end
+
+    def decorate_media_url(url, file_path)
+      return url if url.to_s.empty? || file_path.to_s.empty?
+
+      params = []
+      params << ["x-oss-process", "image/snapshot"] if video_file?(file_path)
+
+      dimensions = media_dimensions(file_path)
+      if dimensions
+        width, height = dimensions
+        params << ["width", width]
+        params << ["height", height]
+      end
+
+      return url if params.empty?
+
+      append_query_params(url, params)
+    end
+
+    def media_dimensions(file_path)
+      return image_dimensions(file_path) if image_file?(file_path)
+      return video_dimensions(file_path) if video_file?(file_path)
+
+      nil
+    end
+
+    def image_dimensions(file_path)
+      size = FastImage.size(file_path)
+      return nil unless size && size.size == 2
+
+      size.map(&:to_i)
+    rescue => e
+      puts "[PINDO_DEBUG] 读取图片尺寸失败 #{file_path}: #{e.message}" if ENV['PINDO_DEBUG']
+      nil
+    end
+
+    def video_dimensions(file_path)
+      return nil unless executable_available?("ffprobe")
+
+      stdout, _stderr, status = Open3.capture3(
+        "ffprobe",
+        "-v", "error",
+        "-select_streams", "v:0",
+        "-show_entries", "stream=width,height",
+        "-of", "csv=p=0:s=x",
+        file_path
+      )
+      return nil unless status.success?
+
+      match = stdout.to_s.strip.match(/\A(\d+)x(\d+)\z/)
+      return nil unless match
+
+      [match[1].to_i, match[2].to_i]
+    rescue => e
+      puts "[PINDO_DEBUG] 读取视频尺寸失败 #{file_path}: #{e.message}" if ENV['PINDO_DEBUG']
+      nil
+    end
+
+    def append_query_params(url, params)
+      base_url, fragment = url.to_s.split('#', 2)
+      separator = base_url.include?('?') ? '&' : '?'
+      query = params.map { |key, value| "#{key}=#{value}" }.join('&')
+      decorated_url = "#{base_url}#{separator}#{query}"
+      fragment ? "#{decorated_url}##{fragment}" : decorated_url
+    end
+
+    def image_file?(file_path)
+      %w[.png .jpg .jpeg .gif .bmp .webp].include?(File.extname(file_path).downcase)
+    end
+
+    def video_file?(file_path)
+      %w[.mp4 .mov .avi .mkv .webm].include?(File.extname(file_path).downcase)
+    end
+
+    def executable_available?(command_name)
+      ENV.fetch('PATH', '').split(File::PATH_SEPARATOR).any? do |dir|
+        path = File.join(dir, command_name)
+        File.file?(path) && File.executable?(path)
+      end
+    end
+  end
+end

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

@@ -10,6 +10,7 @@ require 'pindo/config/pindouserlocalconfig'
 require 'pindo/base/funlog'
 require 'pindo/base/git_handler'
 require 'pindo/module/build/build_helper'
+require 'pindo/module/pgyer/media_url_helper'
 
 
 module Pindo
@@ -1057,8 +1058,8 @@ module Pindo
                 end
             end
 
-            # 6. 提取上传结果
-            result[:success_urls] = upload_result["success_urls"]
+            # 6. 提取上传结果，并在写入 JPS 前追加渲染参数
+            result[:success_urls] = MediaUrlHelper.decorated_success_urls(upload_result)
             result[:failed_files] = upload_result["failed_files"]
 
             # 显示上传结果

data/lib/pindo/module/task/model/nuget/nuget_upload_task.rb

@@ -6,6 +6,8 @@ module Pindo
   module TaskSystem
     class NugetUploadTask < NugetTask
 
+      DEFAULT_NUGET_BUCKET_NAME = 'nuget-resource'.freeze
+
       attr_reader :nupkg_file
 
       def self.task_key
@@ -130,17 +132,20 @@ module Pindo
         puts "✅ 登录成功"
         puts
 
-        # 2. 查询 Nuget 项目（已注释：直接使用硬编码项目 ID，无需查询列表）
-        # nuget_project = find_nuget_project(jps_client)
+        # 2. 使用固定的 Nuget 组件库项目 ID
         nuget_project_id = '5e6b36f61b614ed88086373ef874616c'
         puts
 
         # 3. 上传文件到存储
         puts "📤 上传文件到存储..."
 
-        # 使用 nuget-resource bucket
+        # Nuget 包默认上传到专用 bucket；如服务端迁移，可通过 PINDO_NUGET_BUCKET 临时覆盖。
         config_json = jps_client.config_json
-        config_json['upload_config']['bucket_name'] = 'nuget-resource'
+        config_json['upload_config'] ||= {}
+        config_json['upload_config']['bucket_name'] = nuget_bucket_name
+        config_json['upload_config']['upload_type'] = 's3'
+        puts "使用存储桶: #{config_json['upload_config']['bucket_name']}"
+        puts "上传类型: #{config_json['upload_config']['upload_type']}"
 
         # 开始上传，记录时间
         file_size_mb = File.size(nupkg_file) / (1024.0 * 1024.0)
@@ -182,7 +187,6 @@ module Pindo
           puts "[DEBUG]   附件URLs: #{request_params[:attachFileUrls].inspect}"
         end
 
-        puts "++++++ 1 upload_nuget_package" if ENV['PINDO_DEBUG']
         result = jps_client.upload_nuget_package(
           projectId: nuget_project_id,
           params: request_params
@@ -193,56 +197,42 @@ module Pindo
           puts "[DEBUG]   #{result.inspect}"
         end
 
-        if result && (result['code'] == 0 || result['code'] == 200)
+        response_code = response_code(result)
+
+        if result && (response_code == 0 || response_code == 200)
           puts "✅ 提交成功"
           print_upload_result(result)
         else
-          error_msg = result['message'] || result['msg'] || '未知错误'
-          error_code = result['code']
+          error_msg = response_message(result)
 
           puts "[ERROR] 提交失败详情:"
-          puts "[ERROR]   错误代码: #{error_code}"
+          puts "[ERROR]   错误代码: #{response_code || '未知'}"
           puts "[ERROR]   错误消息: #{error_msg}"
+          puts "[ERROR]   已上传文件: #{file_url}"
 
           if ENV['PINDO_DEBUG']
             puts "[DEBUG] 完整响应内容:"
             puts "[DEBUG]   #{JSON.pretty_generate(result)}" rescue puts "[DEBUG]   #{result.inspect}"
           end
 
-          raise Informative, "提交失败: #{error_msg}"
+          raise Informative, "Nuget 文件已上传但登记失败: #{error_msg}，packageUrl: #{file_url}"
         end
       end
 
-      # 查找 Nuget 项目
-      def find_nuget_project(jps_client)
-        puts "🔍 查询 Nuget 项目..."
-
-        target_project_id = '5e6b36f61b614ed88086373ef874616c'
-        page_no = 1
-        page_size = 40
-
-        loop do
-          result = jps_client.get_project_list(params: { pageNo: page_no, pageSize: page_size })
-
-          unless result && (result['code'] == 0 || result['code'] == 200)
-            raise Informative, "获取项目列表失败"
-          end
-
-          projects = result['data'] || []
-
-          nuget_project = projects.find { |p| p['id'] == target_project_id }
-          if nuget_project
-            puts "✅ 找到 Nuget 组件库项目: #{nuget_project['projectName']} (ID: #{nuget_project['id']})"
-            return nuget_project
-          end
-
-          # 当前页不足一页，说明已是最后一页
-          break if projects.size < page_size
+      def nuget_bucket_name
+        ENV['PINDO_NUGET_BUCKET'].to_s.strip.empty? ? DEFAULT_NUGET_BUCKET_NAME : ENV['PINDO_NUGET_BUCKET'].to_s.strip
+      end
 
-          page_no += 1
-        end
+      def response_code(result)
+        result&.dig('code') || result&.dig('meta', 'code')
+      end
 
-        raise Informative, "未找到默认 Nuget 组件库项目 (ID: #{target_project_id})，请联系管理员"
+      def response_message(result)
+        result&.dig('message') ||
+          result&.dig('msg') ||
+          result&.dig('meta', 'message') ||
+          result&.dig('meta', 'msg') ||
+          '未知错误'
       end
 
       # 打印上传结果

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.20.6"
+  VERSION = "5.20.8"
 
   class VersionCheck
     RUBYGEMS_API = 'https://rubygems.org/api/v1/gems/pindo.json'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.20.6
+  version: 5.20.8
 platform: ruby
 authors:
 - wade
@@ -112,7 +112,7 @@ dependencies:
         version: '2.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.3
+        version: 2.7.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
         version: '2.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.3
+        version: 2.7.5
 - !ruby/object:Gem::Dependency
   name: rqrcode
   requirement: !ruby/object:Gem::Requirement
@@ -406,6 +406,7 @@ files:
 - lib/pindo/module/cert/mode/match_git_cert_operator.rb
 - lib/pindo/module/cert/pem_helper.rb
 - lib/pindo/module/cert/provisioning_helper.rb
+- lib/pindo/module/pgyer/media_url_helper.rb
 - lib/pindo/module/pgyer/pgyerhelper.rb
 - lib/pindo/module/resign/ipa_resign_adapter.rb
 - lib/pindo/module/resign/mac_app_resign_adapter.rb