pindo 4.8.1 → 4.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cff4bb49b837340114cc7cb33a2a6d2cbbb91ac74e97a2485d803887fdc2713
-  data.tar.gz: 8b4390944c7a344643014534b9167f01ace020bf4fac8ff3ac485da4c4ae7506
+  metadata.gz: 2bf8d058f67c7ff8510ff7fd81a253bb1c5017ff9e7b6e4081e3b8e480157110
+  data.tar.gz: ce4d42bab74ac5284ea3c40376a4b819bbf14b3fefa9d0fcd318b82b4112b75e
 SHA512:
-  metadata.gz: 8dbc329c5d290c7abbcf75dee882a07ea7187187ba38287271fa485c21d75fd22fcd8267a362d38e49e4bb87813ab6b0d56c53c67dae1e49f570de0ad6c68739
-  data.tar.gz: 2263c2090f3377f75241d8b9a0adfb8db568acce03393f01eae36e0413ca1303cd4cde8ba6c5ebb2b70c9d4b2b47d28095e18516e7d236e262a8a6bf38e6f52f
+  metadata.gz: 7fe9c6a4869e27a3a2a1f3e2d2c91fe3ac350717b48c86c8835c0d617812cfc11734d00b1b52a16ad2672faa4043ee97f853f3acc6926eda30e3fd639cac29f5
+  data.tar.gz: aaa3eeb667284e47265ebacbad633494142e98879684b862f2e2ec5704cdeb7c775d1f51af5a3bd3ee35af0eedee6540bceb56cdc3d52c1af70fa6add4a21312

data/lib/pindo/command/deploy/build.rb

@@ -118,12 +118,22 @@ module Pindo
                     project_path = File.dirname(project_fullname)
                     proj_name = File.basename(project_fullname, ".xcodeproj")
                     project_obj = Xcodeproj::Project.open(project_fullname)
+
+                    build_platform = project_obj.root_object.build_configuration_list.get_setting("SDKROOT")["Release"]
                     main_target = project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])  }.first
                     provisioning_profile_name = main_target.build_configurations.first.build_settings['PROVISIONING_PROFILE_SPECIFIER'].downcase.split(" ")
 
+
+
                     build_type = "app-store"
                     icloud_env = "Production"
-                    if provisioning_profile_name.include?("adhoc")
+                    if provisioning_profile_name.include?("direct") && provisioning_profile_name.include?("macos")
+                        build_type = "developer-id"
+                        icloud_env = "Production"
+                    elsif provisioning_profile_name.include?("development") && provisioning_profile_name.include?("macos")
+                        build_type = "development"
+                        icloud_env = "Development"
+                    elsif provisioning_profile_name.include?("adhoc")
                         build_type = "ad-hoc"
                         icloud_env = "Development"
                     elsif provisioning_profile_name.include?("development")
@@ -134,6 +144,12 @@ module Pindo
                         icloud_env = "Production"
                     end
 
+                    if build_type.eql?("app-store") || build_type.eql?("ad-hoc")
+                        if File.exist?(File.join(project_path, "Unity/Data/Raw/SettingsPluginFlag.txt"))
+                            raise Informative, "Unity代码包含测试模板，请重新导出Unity代码"
+                        end
+                    end
+
 
                     app_ipaname_temp = main_target.build_configurations.first.build_settings['INFOPLIST_KEY_CFBundleDisplayName'] || main_target.display_name
                     app_ipaname_temp = app_ipaname_temp.gsub(/ /, '');
@@ -150,6 +166,11 @@ module Pindo
                       }
 
 
+                    if !build_platform.nil? && build_platform.eql?("macosx")
+                        values[:output_name] = nil
+                        values[:destination] = "generic/platform=macosx"
+                    end
+
                     if File.exist?(File.join(project_path, "Podfile"))
                         values[:workspace] = "#{proj_name}.xcworkspace"
                         values[:project] = nil

data/lib/pindo/command/deploy/cert.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'match'
 require 'pindo/module/build/swarkhelper'
 require 'pindo/module/cert/xcodecerthelper'
 require 'pindo/module/cert/certhelper'

data/lib/pindo/command.rb

@@ -11,6 +11,7 @@ require 'pindo/client/giteeclient'
 require 'pindo/config/pindoconfig'
 
 
+
 module Pindo
     class Informative < PlainInformative
         def message
@@ -24,6 +25,8 @@ module Pindo
         include Pindoconfig::Mixin
         include Funlog::Mixin
 
+        require "fastlane"
+        require "match"
         require 'pindo/options/deployoptions'
         require 'pindo/module/appselect'
         require 'pindo/module/build/commonconfuseproj'

data/lib/pindo/module/appstore/appstore_in_app_purchase.rb

@@ -78,7 +78,7 @@ module Pindo
             begin
                 client = Spaceship::ConnectAPI
                 app_sharedsecrets_item = nil
-                response = client.tunes_request_client.get("apps/#{app_id}/appSharedSecrets")
+                response = client.tunes_request_client.get("#{Spaceship::ConnectAPI::Tunes::API::Version::V1}/apps/#{app_id}/appSharedSecrets")
                 # puts JSON.pretty_generate(response.body)
                 result_data = response.body
 
@@ -1128,6 +1128,7 @@ module Pindo
 
                 itc_usa_latest_price = nil
                 itc_usa_latest_start_date = nil
+                itc_usa_latest_price_point_id = nil
                 need_modify_price = true
 
                 if subscription_item["state"].to_s.eql?("APPROVED")
@@ -1168,6 +1169,7 @@ module Pindo
                         include_item = respose_price[:included].last
                         if include_item[:type].to_s.eql?("subscriptionPricePoints")
                             itc_usa_latest_price = include_item[:attributes][:customer_price]
+                            itc_usa_latest_price_point_id = include_item[:id]
                             puts "          最新线上价格:" + itc_usa_latest_price +"$"
                         end
                     end
@@ -1280,10 +1282,10 @@ module Pindo
                             }
                         }
 
-                        price_change_relationships_data[:newSubscriptionPricePoints][:data] << {
-                                        type:"subscriptionPricePoints",
-                                        id: price_point_id
-                                    }
+                        # price_change_relationships_data[:newSubscriptionPricePoints][:data] << {
+                        #                 type:"subscriptionPricePoints",
+                        #                 id: price_point_id
+                        #             }
 
                         index_num = index_num +1
 
@@ -1368,7 +1370,7 @@ module Pindo
 
                                 if last_data_items.size > 0
                                     last_data_items.each do |last_data_item|
-                                        if last_data_item[:type].to_s.eql?("subscriptionPrices")
+                                        if last_data_item[:type].to_s.eql?("subscriptionPrices") && !last_data_item[:relationships][:subscription_price_point][:data][:id].eql?(itc_usa_latest_price_point_id)
                                             price_change_relationships_data[:currentSubscriptionPricePoints][:data] << {
                                                         type:"subscriptionPricePoints",
                                                         id: last_data_item[:relationships][:subscription_price_point][:data][:id]
@@ -1392,7 +1394,7 @@ module Pindo
 
                                 begin
 
-                                    respose_price = client.tunes_request_client.post("subscriptionPriceChangeConsentReasons", body)
+                                    respose_price = client.tunes_request_client.post("#{Spaceship::ConnectAPI::Tunes::API::Version::V1}/subscriptionPriceChangeConsentReasons", body)
 
                                     # puts JSON.pretty_generate(respose_price)
                                 rescue => err
@@ -1418,7 +1420,7 @@ module Pindo
                                 # puts "included_data.size: #{included_data.size}"
                                 # puts JSON.pretty_generate(body)
 
-                                respose_price = client.tunes_request_client.patch("subscriptions/#{subscription_id}", body)
+                                respose_price = client.tunes_request_client.patch("#{Spaceship::ConnectAPI::Tunes::API::Version::V1}/subscriptions/#{subscription_id}", body)
                                 # respose_price = appstore_client.update_subscription(
                                 #         id:subscription_id,
                                 #         relationships: relationships_data,

data/lib/pindo/module/appstore/appstore_metadata_fastlane_helper.rb

@@ -55,7 +55,7 @@ module Pindo
 	        return array
 
 	     end
-    	
+
 
 	    def camel_case_lower(string: nil)
 	      string.split('_').inject([]) { |buffer, e| buffer.push(buffer.empty? ? e : e.capitalize) }.join
@@ -75,7 +75,7 @@ module Pindo
 	    	return new_attributes
 	    end
 
-		def fastlane_login(apple_id:nil)    
+		def fastlane_login(apple_id:nil)
 			Spaceship::Tunes.login(apple_id.to_s)
 			Spaceship::Tunes.select_team
 		end
@@ -91,8 +91,8 @@ module Pindo
             rescue => error
                 puts "更新 Version 失败 !!! ===============+++++++============= 失败 !!!失败 !!!"
                 puts error
-            end 
-            
+            end
+
 
             app_edit_version_info = app.get_edit_app_store_version(platform: platform, includes: 'appStoreVersionSubmission,build,appStoreVersionPhasedRelease,appStoreVersionLocalizations')
             app_live_version_info = app.get_live_app_store_version(platform: platform)
@@ -108,7 +108,7 @@ module Pindo
                 rescue => error
                     puts "更新App Version Localizations 失败 !!! ===============+++++++============= 失败 !!!失败 !!!"
                     puts error
-                end 
+                end
             end
 
 
@@ -121,7 +121,7 @@ module Pindo
                 rescue => error
                     puts "更新 Copy Right 失败 !!! ===============+++++++============= 失败 !!!失败 !!!"
                     puts error
-                end 
+                end
             end
 
             if !app_itunes_json["app_edit_version_info"][platform]['release_type'].nil?
@@ -132,7 +132,7 @@ module Pindo
                 rescue => error
                     puts "更新 ReleaseType 失败 !!! ===============+++++++============= 失败 !!!失败 !!!"
                     puts error
-                end 
+                end
             end
 
             if !app_itunes_json["app_edit_version_info"][platform]['app_review_info'].nil?
@@ -150,9 +150,9 @@ module Pindo
                 rescue => error
                     puts "更新 Review Info 失败 !!! ===============+++++++============= 失败 !!!失败 !!!"
                     puts error
-                end 
+                end
             end
-            
+
 
 	    end
 
@@ -169,10 +169,10 @@ module Pindo
             rescue => error
                 puts "更新 app价格 失败 !!! ===============+++++++============= 失败 !!!失败 !!!"
                 puts error
-            end 
+            end
+
 
 
-            
             if !app_itunes_json['content_rights_declaration'].nil?
                 begin
                     puts "\n\n更新 Third Content ..."
@@ -181,9 +181,9 @@ module Pindo
                 rescue => error
                     puts "更新 Third Content 失败 !!! ===============+++++++============= 失败 !!!失败 !!!"
                     puts error
-                end 
+                end
             end
-            
+
             if !app_itunes_json['primary_locale'].nil?
                 begin
                     puts "\n\n更新 Primary Language ..."
@@ -192,20 +192,20 @@ module Pindo
                 rescue => error
                     puts "更新 Primary Language 失败 !!! ===============+++++++============= 失败 !!!失败 !!!"
                     puts error
-                end 
+                end
             end
 
-            
+
             if !app_itunes_json['privacy_data'].nil?
                 # begin
                     puts "\n\n更新 Privacy Usage Data ..."
                     app_privacy_data = app_itunes_json['privacy_data']
                     update_privacy_useagedata(app: app, app_privacy_data:app_privacy_data)
-                    
+
                 # rescue => error
                 #     puts "更新 Privacy Usage Data 失败 !!! ===============+++++++============= 失败 !!!失败 !!!"
                 #     puts error
-                # end 
+                # end
             end
 
 
@@ -213,10 +213,10 @@ module Pindo
 
 
         def fastlane_update_app_info_metadata(app: nil, app_itunes_json:nil)
-        
+
 
             app_info = app.fetch_edit_app_info
-            
+
             begin
                 puts "\n\n更新 Category ..."
                 update_app_categories(app_info:app_info, app_info_data:app_itunes_json["app_info"])
@@ -224,7 +224,7 @@ module Pindo
             rescue => error
                 puts "更新 Category 失败 !!! ===============+++++++============= 失败 !!!失败 !!!"
                 puts error
-            end 
+            end
 
             if !app_age_rating_attributes = app_itunes_json["app_info"]["app_age_rating"].nil?
                 begin
@@ -235,7 +235,7 @@ module Pindo
                 rescue => error
                     puts "更新 Age Rating 失败 !!! ===============+++++++============= 失败 !!!失败 !!!"
                     puts error
-                end 
+                end
             end
 
         end
@@ -244,11 +244,11 @@ module Pindo
 	    def fastlane_update_app_info_localizations(app: nil, app_itunes_json:nil)
 
 			app_info = app.fetch_edit_app_info
-            
+
             sleep(3)
-            
+
             begin
-                puts 
+                puts
                 puts "更新 App Info Localizations..."
                 app_info_localization_attributes = app_itunes_json['app_info']["app_info_localization"]
                 app_info_localizations = verify_app_info_localizations(app_info:app_info, app_info_localization_attributes:app_info_localization_attributes)
@@ -258,7 +258,7 @@ module Pindo
             rescue => error
                 puts "更新App Info Localizations 失败 !!! ===============+++++++============= 失败 !!!失败 !!!"
                 puts error
-            end 
+            end
 
 
 	   	end
@@ -268,27 +268,27 @@ module Pindo
 
 	    def update_privacy_useagedata(app: nil, app_privacy_data:nil)
 	        all_usages = Spaceship::ConnectAPI::AppDataUsage.all(app_id: app.id, includes: "category,grouping,purpose,dataProtection", limit: 500)
-            
+
             begin
                 all_usages.each(&:delete!)
             rescue => error
-                
-            end 
+
+            end
 
             # old_usages_config = {}
-            # if !all_usages.nil? && all_usages.size > 0                
+            # if !all_usages.nil? && all_usages.size > 0
             #     all_usages.each do |privacy_usage|
-            #         if !privacy_usage.category.nil? 
+            #         if !privacy_usage.category.nil?
             #             category= privacy_usage.category.id
             #             all_usages_config[category] = all_usages_config[category] || {}
             #             all_usages_config[category]["category"] = category
-            #             if !privacy_usage.purpose.nil? 
-            #                 all_usages_config[category]["purposes"] = all_usages_config[category]["purposes"] || [] 
+            #             if !privacy_usage.purpose.nil?
+            #                 all_usages_config[category]["purposes"] = all_usages_config[category]["purposes"] || []
             #                 all_usages_config[category]["purposes"] << privacy_usage.purpose.id
 
             #             end
             #             if !privacy_usage.data_protection.nil?
-            #                 all_usages_config[category]["data_protections"] = all_usages_config[category]["data_protections"] || [] 
+            #                 all_usages_config[category]["data_protections"] = all_usages_config[category]["data_protections"] || []
             #                 all_usages_config[category]["data_protections"] << privacy_usage.data_protection.id
             #             end
             #         end
@@ -309,7 +309,7 @@ module Pindo
                 publish_state.publish!
             rescue => error
                 puts error
-            end 
+            end
 
 
                 app_privacy_data.each do |usage_config|
@@ -328,23 +328,23 @@ module Pindo
                                               app_data_usage_purpose_id: purpose
                                             )
                                 rescue => error
-                                    
-                                end 
+
+                                end
 
 
                         end
                     end
                 end
-               
 
 
-            begin 
-                
+
+            begin
+
                 publish_state = Spaceship::ConnectAPI::AppDataUsagesPublishState.get(app_id: app.id)
                 publish_state.publish!
             rescue => error
                 puts error
-            end 
+            end
 
 
 	    end
@@ -352,30 +352,30 @@ module Pindo
 
 	    def update_app_categories(app_info:nil, app_info_data:nil)
 
-	        
+
             if !app_info_data.nil?
                 category_id_map = {}
 
                 if !app_info_data["primary_category"].nil?
-                    category_id_map[:primary_category_id] = app_info_data["primary_category"]  
+                    category_id_map[:primary_category_id] = app_info_data["primary_category"]
 
                     if app_info_data["primary_category"].eql?("STICKERS") || app_info_data["primary_category"].eql?("GAMES")
                         category_id_map[:primary_subcategory_one_id] = app_info_data["primary_subcategory_one"]
-                        category_id_map[:primary_subcategory_two_id] = app_info_data["primary_subcategory_two"]    
+                        category_id_map[:primary_subcategory_two_id] = app_info_data["primary_subcategory_two"]
 
                     else
                         category_id_map[:primary_subcategory_one_id] = nil
                         category_id_map[:primary_subcategory_two_id] = nil
-                    end  
+                    end
                 end
-                
+
 
 
                 if !app_info_data["secondary_category"].nil? && !app_info_data["primary_category"].eql?("STICKERS") && !app_info_data["primary_category"].eql?("GAMES")
-                    category_id_map[:secondary_category_id] = app_info_data["secondary_category"]    
+                    category_id_map[:secondary_category_id] = app_info_data["secondary_category"]
                     if app_info_data["secondary_category"].eql?("STICKERS") || app_info_data["secondary_category"].eql?("GAMES")
-                        category_id_map[:secondary_subcategory_one_id] = app_info_data["secondary_subcategory_one"]    
-                        category_id_map[:secondary_subcategory_two_id] = app_info_data["secondary_subcategory_two"]   
+                        category_id_map[:secondary_subcategory_one_id] = app_info_data["secondary_subcategory_one"]
+                        category_id_map[:secondary_subcategory_two_id] = app_info_data["secondary_subcategory_two"]
                     else
                         category_id_map[:secondary_subcategory_one_id] = nil
                         category_id_map[:secondary_subcategory_two_id] = nil
@@ -403,9 +403,9 @@ module Pindo
             	attributes_key =  camel_case_lower(string:key)
             	age_rate_attributes[attributes_key] = value
             end
-            
+
             declaration.update(attributes: age_rate_attributes)
-   
+
         end
 
 		def verify_app_info_localizations(app_info:nil, app_info_localization_attributes:nil)
@@ -454,7 +454,7 @@ module Pindo
 	      end
 	      app_info_worker.batch_enqueue(app_info_localizations)
 	      app_info_worker.start
-		    
+
 		end
 
 
@@ -472,7 +472,7 @@ module Pindo
 		      locales_to_enable = languages - localizations.map(&:locale)
 
 		      if locales_to_enable.count > 0
-		        
+
 		        puts "    创建多语言 #{locales_to_enable.join(', ')}..."
 
 		        locales_to_enable.each do |locale|
@@ -493,11 +493,11 @@ module Pindo
 	      # Update app store version localizations
 	      store_version_worker = FastlaneCore::QueueWorker.new do |app_store_version_localization|
 	        attributes = version_info_localization_attributes[app_store_version_localization.locale]
-	        
+
 	        if attributes
 	          	puts "Uploading app version info localized '#{app_store_version_localization.locale}'"
 	          	attributes = check_attributes(attributes:attributes)
-	          	if app_live_version_info.nil? 
+	          	if app_live_version_info.nil?
 	          		attributes.delete("whats_new")
 	          	end
 	          	app_store_version_localization.update(attributes: attributes)
@@ -525,9 +525,46 @@ module Pindo
 
         def fastlane_process_lang_screenshots(lang_screenshots_path:nil)
 
-            # puts "正在处理目录:#{lang_screenshots_path}"
             valid_file_extensions = ['png', 'PNG', 'jpg', 'JPG', 'jpeg', 'JPEG']
 
+
+            #检查是否区分iPad 2和iPad Pro
+            ipad_dir_array= []
+            all_device_size = Deliver::AppScreenshot.devices
+            Dir.glob(File.join(lang_screenshots_path, "*")).each do |image_dir_path|
+                image_dir_basename = File.basename(image_dir_path)
+                # puts "image_dir_basename:#{image_dir_basename}"
+                if File.directory?(image_dir_path) && ![".", ".."].include?(image_dir_basename)
+                    valide_pic_num = 0
+                    Dir.foreach(image_dir_path) do |file|
+                        image_full_name = File.join(image_dir_path,  file)
+                        extname = File.extname(image_full_name).delete('.')
+                        if valid_file_extensions.include?(extname)
+                            img_size = FastImage.size(image_full_name)
+                            if all_device_size[Deliver::AppScreenshot::ScreenSize::IOS_IPAD_PRO].include?(img_size)
+                                valide_pic_num = valide_pic_num + 1
+                            end
+
+                            if valide_pic_num >=1
+                                ipad_dir_array << image_dir_basename.to_s.downcase
+                                break;
+                            end
+                        end
+                    end
+
+
+                end
+            end
+            if ipad_dir_array.include?("ipadpro3") || ipad_dir_array.include?("ipadpro129") || ipad_dir_array.include?("ipad_6gen")
+                # puts "找到ipad pro 3截屏"
+            else
+                puts lang_screenshots_path
+                raise Informative, "iPad 3代截屏没有iPad 2代截屏区分开，请修改iPad截屏目录， iPad 3代截屏目录修改为: ipadpro129"
+            end
+
+
+
+
             Dir.glob(File.join(lang_screenshots_path, "*")).each do |image_dir_path|
                 image_dir_basename = File.basename(image_dir_path)
                 # puts "处理目录:#{image_dir_path}"
@@ -535,7 +572,7 @@ module Pindo
                 if File.directory?(image_dir_path) && ![".", ".."].include?(image_dir_basename)
                     Dir.foreach(image_dir_path) do |file|
 
-                        image_full_name = File.join(image_dir_path,  file) 
+                        image_full_name = File.join(image_dir_path,  file)
                         extname = File.extname(image_full_name).delete('.')
                         extension = File.extname(image_full_name)
                         base_name = File.basename(image_full_name, extension)
@@ -549,7 +586,7 @@ module Pindo
                             img_size = FastImage.size(image_full_name)
 
 
-                            if lang_screenshots_path.include?("/iMessage/") || lang_screenshots_path.include?("/imessage/") || lang_screenshots_path.include?("/IMESSAGE/") 
+                            if lang_screenshots_path.include?("/iMessage/") || lang_screenshots_path.include?("/imessage/") || lang_screenshots_path.include?("/IMESSAGE/")
 
                                 all_device_size = Deliver::AppScreenshot.device_messages
                                 # puts all_message_device_size
@@ -563,9 +600,9 @@ module Pindo
                                 elsif all_device_size[Deliver::AppScreenshot::ScreenSize::IOS_67_MESSAGES].include?(img_size)
                                     dest_name = File.join(lang_screenshots_path, display_type_dir_name["IMESSAGE_APP_IPHONE_67"] + new_base_name)
                                 elsif all_device_size[Deliver::AppScreenshot::ScreenSize::IOS_65_MESSAGES].include?(img_size)
-                                    dest_name = File.join(lang_screenshots_path, display_type_dir_name["IMESSAGE_APP_IPHONE_65"] + new_base_name) 
+                                    dest_name = File.join(lang_screenshots_path, display_type_dir_name["IMESSAGE_APP_IPHONE_65"] + new_base_name)
                                 elsif all_device_size[Deliver::AppScreenshot::ScreenSize::IOS_55_MESSAGES].include?(img_size)
-                                    dest_name = File.join(lang_screenshots_path, display_type_dir_name["IMESSAGE_APP_IPHONE_55"] + new_base_name) 
+                                    dest_name = File.join(lang_screenshots_path, display_type_dir_name["IMESSAGE_APP_IPHONE_55"] + new_base_name)
                                 end
 
                             else
@@ -580,32 +617,32 @@ module Pindo
                                 elsif all_device_size[Deliver::AppScreenshot::ScreenSize::IOS_67].include?(img_size)
                                     dest_name = File.join(lang_screenshots_path, display_type_dir_name["APP_IPHONE_67"] + new_base_name)
                                 elsif all_device_size[Deliver::AppScreenshot::ScreenSize::IOS_65].include?(img_size)
-                                    dest_name = File.join(lang_screenshots_path, display_type_dir_name["APP_IPHONE_65"] + new_base_name) 
+                                    dest_name = File.join(lang_screenshots_path, display_type_dir_name["APP_IPHONE_65"] + new_base_name)
                                 elsif all_device_size[Deliver::AppScreenshot::ScreenSize::IOS_55].include?(img_size)
-                                    dest_name = File.join(lang_screenshots_path, display_type_dir_name["APP_IPHONE_55"] + new_base_name) 
+                                    dest_name = File.join(lang_screenshots_path, display_type_dir_name["APP_IPHONE_55"] + new_base_name)
                                 end
                             end
-                            
-                            # if (img_size[0] == 1290 && img_size[1] == 2796) || (img_size[0] == 2796 && img_size[1] == 1290) 
+
+                            # if (img_size[0] == 1290 && img_size[1] == 2796) || (img_size[0] == 2796 && img_size[1] == 1290)
                             #     dest_name = File.join(lang_screenshots_path, display_type_dir_name["APP_IPHONE_67"] + new_base_name)
-                            # end 
-                            # if (img_size[0] == 1242 && img_size[1] == 2688) || (img_size[0] == 2688 && img_size[1] == 1242) || (img_size[0] == 1284 && img_size[1] == 2778) || (img_size[0] == 2778 && img_size[1] == 1284) 
-                            #     dest_name = File.join(lang_screenshots_path, display_type_dir_name["APP_IPHONE_65"] + new_base_name) 
+                            # end
+                            # if (img_size[0] == 1242 && img_size[1] == 2688) || (img_size[0] == 2688 && img_size[1] == 1242) || (img_size[0] == 1284 && img_size[1] == 2778) || (img_size[0] == 2778 && img_size[1] == 1284)
+                            #     dest_name = File.join(lang_screenshots_path, display_type_dir_name["APP_IPHONE_65"] + new_base_name)
                             # end
 
                             # if (img_size[0] == 1242 && img_size[1] == 2208) || (img_size[0] == 2208 && img_size[1] == 1242)
-                            #     dest_name = File.join(lang_screenshots_path, display_type_dir_name["APP_IPHONE_55"] + new_base_name) 
+                            #     dest_name = File.join(lang_screenshots_path, display_type_dir_name["APP_IPHONE_55"] + new_base_name)
                             # end
-                            
+
                             FileUtils.mv(image_full_name, dest_name, force:true)
                         end
-                    
-                    end 
+
+                    end
 
                     FileUtils.rm_rf(image_dir_path)
                 end
 
-            end 
+            end
 
 
 
@@ -616,41 +653,41 @@ module Pindo
 
 
         def fastlane_download_app_info(app: nil, app_itunes_json:nil, app_itunes_dir:nil)
-        	
+
 
             app_info = app.fetch_edit_app_info || app.fetch_live_app_info
 
-        	if app_info.primary_category.nil? 
+        	if app_info.primary_category.nil?
         		app_itunes_json["app_info"]["primary_category"] = app_info.primary_category
         	else
         		app_itunes_json["app_info"]["primary_category"] = app_info.primary_category.id
         	end
 
-        	if app_info.primary_subcategory_one.nil? 
+        	if app_info.primary_subcategory_one.nil?
         		app_itunes_json["app_info"]["primary_subcategory_one"] = app_info.primary_subcategory_one
         	else
         		app_itunes_json["app_info"]["primary_subcategory_one"] = app_info.primary_subcategory_one.id
         	end
 
-        	if app_info.primary_subcategory_two.nil? 
+        	if app_info.primary_subcategory_two.nil?
         		app_itunes_json["app_info"]["primary_subcategory_two"] = app_info.primary_subcategory_two
         	else
         		app_itunes_json["app_info"]["primary_subcategory_two"] = app_info.primary_subcategory_two.id
         	end
 
-			if app_info.secondary_category.nil? 
+			if app_info.secondary_category.nil?
         		app_itunes_json["app_info"]["secondary_category"] = app_info.secondary_category
         	else
         		app_itunes_json["app_info"]["secondary_category"] = app_info.secondary_category.id
         	end
 
-			if app_info.secondary_subcategory_one.nil? 
+			if app_info.secondary_subcategory_one.nil?
         		app_itunes_json["app_info"]["secondary_subcategory_one"] = app_info.secondary_subcategory_one
         	else
         		app_itunes_json["app_info"]["secondary_subcategory_one"] = app_info.secondary_subcategory_one.id
         	end
 
-			if app_info.secondary_subcategory_two.nil? 
+			if app_info.secondary_subcategory_two.nil?
         		app_itunes_json["app_info"]["secondary_subcategory_two"] = app_info.secondary_subcategory_two
         	else
         		app_itunes_json["app_info"]["secondary_subcategory_two"] = app_info.secondary_subcategory_two.id
@@ -679,19 +716,19 @@ module Pindo
             end
 
 
-            
 
 
 
 
 
 
-            
+
+
 
 
 
             app_info_localizations = app_info.get_app_info_localizations
-            
+
             if !app_info_localizations.nil?
 
             	locales_to_disable = all_languages - app_info_localizations.map(&:locale)
@@ -726,14 +763,14 @@ module Pindo
             if !File.exist?(metadata_platform_path)
                 FileUtils.mkdir_p(metadata_platform_path)
             end
-            app_itunes_json["app_edit_version_info"][platform] = {}        
+            app_itunes_json["app_edit_version_info"][platform] = {}
             app_itunes_json["app_edit_version_info"][platform]["app_review_info"] = {}
-            
+
             app_itunes_json["app_edit_version_info"][platform]["version_string"] = app_version_info.version_string.nil? ? "" : app_version_info.version_string
             app_itunes_json["app_edit_version_info"][platform]["copyright"] = app_version_info.copyright.nil? ? "" : app_version_info.copyright
             app_itunes_json["app_edit_version_info"][platform]["release_type"] = app_version_info.release_type.nil? ? "" : app_version_info.release_type
 
-            
+
 
             app_store_review_data = app_itunes_json["app_edit_version_info"][platform]["app_review_info"]
             app_store_review_detail = begin
@@ -797,7 +834,7 @@ module Pindo
 			        app_itunes_json["app_edit_version_info"][platform]["app_version_info_localization"][lang] = app_itunes_json["app_edit_version_info"][platform]["app_version_info_localization"][lang] || {}
 
 			       	localization_data = app_itunes_json["app_edit_version_info"][platform]["app_version_info_localization"][lang]
-			       	
+
 
 					localization_data["description"] = app_version_info_localization.description
 					localization_data["keywords"] = app_version_info_localization.keywords
@@ -817,7 +854,7 @@ module Pindo
 			        # app_itunes_json["app_edit_version_info"][platform]["app_version_screenshots"][app_version_info_localization.locale] = app_itunes_json["app_edit_version_info"][platform]["app_version_screenshots"][app_version_info_localization.locale] || []
 			        # app_itunes_json["app_edit_version_info"][platform]["app_version_previews"][app_version_info_localization.locale] = app_itunes_json["app_edit_version_info"][platform]["app_version_previews"][app_version_info_localization.locale] || []
 			    end
-			    
+
 			end
 
         end
@@ -840,7 +877,7 @@ module Pindo
 			rescue
 			     # if it's already there
 			end
-            
+
 
 			app_version_info_localizations = app_version_info.get_app_store_version_localizations
 
@@ -877,7 +914,7 @@ module Pindo
 				rescue
 				# if it's already there
 				end
-				
+
                 puts "======== #{screenshot_set.screenshot_display_type}"
 				dir_name = display_type_dir_name[screenshot_set.screenshot_display_type]
 
@@ -898,7 +935,7 @@ module Pindo
 
 
                     path = File.join(containing_folder, file_name)
-                    download_screenshots_exe(file_name:path, url:url, over_write:over_write)				  
+                    download_screenshots_exe(file_name:path, url:url, over_write:over_write)
 				end
 			end
 		end
@@ -907,16 +944,72 @@ module Pindo
 
             if !over_write && File.exist?(file_name)
                 puts " Existing screenshot #{file_name}"
-                return 
+                return
             end
 
             puts "Downloading existing screenshot #{file_name}"
 
-            File.binwrite(file_name, FastlaneCore::Helper.open_uri(url).read)
-            
+            File.binwrite(file_name, URI.open(url).read)
+            # File.binwrite(file_name, FastlaneCore::Helper.open_uri(url).read)
+
         end
 
 
+
+        def change_img_sort(lang_screenshots_path:nil)
+
+            new_sort_index = [0,1, 2, 8, 9, 7, 3, 4, 5, 6]
+
+            bacK_lang_screenshots_path = lang_screenshots_path + "_bak"
+            FileUtils.rm_rf(bacK_lang_screenshots_path) if Dir.exist?(bacK_lang_screenshots_path)
+            FileUtils.mv(lang_screenshots_path, bacK_lang_screenshots_path, force:true)
+
+            all_lang_file_obj = {}
+            Dir.glob(File.join(bacK_lang_screenshots_path, "*")).each do |bak_image_full_name|
+                image_dir_basename = File.basename(bak_image_full_name)
+                extname = File.extname(bak_image_full_name).delete('.')
+                # puts "bak_image_full_name:#{bak_image_full_name}"
+                if File.file?(bak_image_full_name) && valid_file_extensions.include?(extname)
+                    # puts "bak_image_full_name:#{bak_image_full_name}"
+                    extension = File.extname(bak_image_full_name)
+                    base_name = File.basename(bak_image_full_name, extension)
+                    deveice_name = base_name.slice(0...-3)
+                    # puts "deveice_name:#{deveice_name}"
+                    all_lang_file_obj[deveice_name] = all_lang_file_obj[deveice_name] || []
+                    all_lang_file_obj[deveice_name].push(bak_image_full_name)
+
+                end
+            end
+
+            # puts JSON.pretty_generate(all_lang_file_obj)
+
+            FileUtils.mkdir_p(lang_screenshots_path)
+            all_lang_file_obj.each do |deveice_name, bak_file_array|
+
+                for i in 0..new_sort_index.length-1 do
+                    old_index = new_sort_index[i]
+                    if bak_file_array.size > old_index
+                        src_imag_file_name = bak_file_array[old_index]
+                        extension = File.extname(src_imag_file_name)
+                        new_name = i.to_s
+                        if new_name.to_s.size < 2
+                            new_name = "0" + new_name
+                        end
+
+                        new_des_file_name = File.join(lang_screenshots_path, deveice_name + "_" + new_name + extension)
+                        puts new_des_file_name
+                        FileUtils.mv(src_imag_file_name, new_des_file_name, force:true)
+                    end
+                end
+            end
+
+            FileUtils.rm_rf(bacK_lang_screenshots_path) if Dir.exist?(bacK_lang_screenshots_path)
+
+
+        end
+
+
+
     end
 
 end

data/lib/pindo/module/cert/certhelper.rb

@@ -1,5 +1,6 @@
 
 
+require 'match'
 require 'openssl'
 require 'pindo/base/aeshelper'
 require 'pindo/module/cert/keychainhelper'

data/lib/pindo/version.rb

@@ -1,6 +1,6 @@
 module Pindo
 
-  	VERSION = "4.8.1"
+  	VERSION = "4.8.3"
 
   	class VersionCheck
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 4.8.1
+  version: 4.8.3
 platform: ruby
 authors:
 - wade
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-25 00:00:00.000000000 Z
+date: 2024-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -365,7 +365,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 3
 summary: easy work