[supply] parallel uploads for meta per language

fastlane/lib/fastlane/actions/docs/upload_to_play_store.md

@@ -179,6 +179,12 @@ This can be done using the `--track_promote_to` parameter. The `--track_promote_
 Before performing a new APK upload you may want to check existing track version codes or release names, or you may simply want to provide an informational lane that displays the currently promoted version codes or release name for the production track. You can use the `google_play_track_version_codes` action to retrieve existing version codes for a package and track. You can use the `google_play_track_release_names` action to retrieve existing release names for a package and track.
 For more information, see the `fastlane action google_play_track_version_codes` and `fastlane action google_play_track_release_names` help output.
 
+## Parallel uploads
+
+By default _supply_ will spawn 10 threads to upload the metadata concurrently (_images, screenshots, texts_). If you want to change this, set either `DELIVER_NUMBER_OF_THREADS` or `FL_NUMBER_OF_THREADS` environment variable to any value between 1 and 10.
+
+If you want _supply_ to upload with more than 10 threads in parallel then you need to **additionally** set `FL_MAX_NUMBER_OF_THREADS` environment variable to the max number of parallel upload threads you wish to have (**Warning ⚠️** use this at your own risk!).
+
 ## Migration from AndroidPublisherV2 to AndroidPublisherV3 in _fastlane_ 2.135.0
 
 ### New Options
@@ -200,5 +206,3 @@ For more information, see the `fastlane action google_play_track_version_codes`
   - Google Play will automatically remove releases that are superseded now
 - `:deactivate_on_promote`
   - Google Play will automatically deactivate a release from its previous track on promote
-
-:

fastlane_core/lib/fastlane_core/queue_worker.rb

@@ -6,7 +6,7 @@ module FastlaneCore
   # Use this when you have all the items that you'll process in advance.
   # Simply enqueue them to this and call `QueueWorker#start`.
   class QueueWorker
-    NUMBER_OF_THREADS = FastlaneCore::Helper.test? ? 1 : [(ENV["DELIVER_NUMBER_OF_THREADS"] || ENV.fetch("FL_NUMBER_OF_THREADS", 10)).to_i, 10].min
+    NUMBER_OF_THREADS = FastlaneCore::Helper.test? ? 1 : [ENV["DELIVER_NUMBER_OF_THREADS"], ENV["FL_NUMBER_OF_THREADS"], 10].map(&:to_i).find(&:positive?).clamp(1, ENV.fetch("FL_MAX_NUMBER_OF_THREADS", 10).to_i)
 
     # @param concurrency (Numeric) - A number of threads to be created
     # @param block (Proc) - A task you want to execute with enqueued items

supply/lib/supply/uploader.rb

@@ -1,6 +1,10 @@
+require 'fastlane_core'
+
 module Supply
   # rubocop:disable Metrics/ClassLength
   class Uploader
+    UploadJob = Struct.new(:language, :version_code, :release_notes)
+
     def perform_upload
       FastlaneCore::PrintTable.print_values(config: Supply.config, hide_keys: [:issuer], mask_keys: [:json_key_data], title: "Summary for supply #{Fastlane::VERSION}")
 
@@ -88,19 +92,15 @@ def perform_upload_meta(version_codes, track_name)
           UI.user_error!("Unable to find the requested track - '#{Supply.config[:track]}'") unless track
           UI.user_error!("Could not find release for version code '#{version_code}' to update changelog") unless release
 
-          release_notes = []
-          all_languages.each do |language|
-            next if language.start_with?('.') # e.g. . or .. or hidden folders
-            UI.message("Preparing to upload for language '#{language}'...")
-
-            listing = client.listing_for_language(language)
-
-            upload_metadata(language, listing) unless Supply.config[:skip_upload_metadata]
-            upload_images(language) unless Supply.config[:skip_upload_images]
-            upload_screenshots(language) unless Supply.config[:skip_upload_screenshots]
-            release_notes << upload_changelog(language, version_code) unless Supply.config[:skip_upload_changelogs]
-          end
+          release_notes = Queue.new
+          upload_worker = create_meta_upload_worker
+          upload_worker.batch_enqueue(
+            # skip . or .. or hidden folders
+            all_languages.reject { |lang| lang.start_with?('.') }.map { |lang| UploadJob.new(lang, version_code, release_notes) }
+          )
+          upload_worker.start
 
+          release_notes = Array.new(release_notes.size) { release_notes.pop } # Queue to Array
           upload_changelogs(release_notes, release, track, track_name) unless release_notes.empty?
         end
       end
@@ -511,6 +511,21 @@ def obb_expansion_file_type(obb_file_path)
         'patch'
       end
     end
+
+    def create_meta_upload_worker
+      FastlaneCore::QueueWorker.new do |job|
+        UI.message("Preparing uploads for language '#{job.language}'...")
+        start_time = Time.now
+        listing = client.listing_for_language(job.language)
+        upload_metadata(job.language, listing) unless Supply.config[:skip_upload_metadata]
+        upload_images(job.language) unless Supply.config[:skip_upload_images]
+        upload_screenshots(job.language) unless Supply.config[:skip_upload_screenshots]
+        job.release_notes << upload_changelog(job.language, job.version_code) unless Supply.config[:skip_upload_changelogs]
+        UI.message("Uploaded all items for language '#{job.language}'... (#{Time.now - start_time} secs)")
+      rescue => error
+        UI.abort_with_message!("#{job.language} - #{error}")
+      end
+    end
   end
   # rubocop:enable Metrics/ClassLength
 end

supply/spec/fixtures/metadata/android/en-US/changelogs/1.txt

@@ -0,0 +1 @@
+en-US changelog 1

supply/spec/fixtures/metadata/android/en-US/changelogs/2.txt

@@ -0,0 +1 @@
+en-US changelog 2

supply/spec/fixtures/metadata/android/en-US/changelogs/default.txt

@@ -0,0 +1 @@
+en-US changelog -1

supply/spec/fixtures/metadata/android/en-US/full_description.txt

@@ -0,0 +1 @@
+en-US full description

supply/spec/fixtures/metadata/android/en-US/short_description.txt

@@ -0,0 +1 @@
+en-US short description

supply/spec/fixtures/metadata/android/en-US/title.txt

@@ -0,0 +1 @@
+en-US title

supply/spec/fixtures/metadata/android/en-US/video.txt

@@ -0,0 +1 @@
+en-US video

supply/spec/fixtures/metadata/android/fr-FR/changelogs/1.txt

@@ -0,0 +1 @@
+fr-FR changelog 1

supply/spec/fixtures/metadata/android/fr-FR/changelogs/2.txt

@@ -0,0 +1 @@
+fr-FR changelog 2

supply/spec/fixtures/metadata/android/fr-FR/changelogs/default.txt

@@ -0,0 +1 @@
+fr-FR changelog -1

supply/spec/fixtures/metadata/android/fr-FR/full_description.txt

@@ -0,0 +1 @@
+fr-FR full description

supply/spec/fixtures/metadata/android/fr-FR/short_description.txt

@@ -0,0 +1 @@
+fr-FR short description

supply/spec/fixtures/metadata/android/fr-FR/title.txt

@@ -0,0 +1 @@
+fr-FR title

supply/spec/fixtures/metadata/android/fr-FR/video.txt

@@ -0,0 +1 @@
+fr-FR video

supply/spec/fixtures/metadata/android/ja-JP/changelogs/1.txt

@@ -0,0 +1 @@
+ja-JP changelog 1

supply/spec/fixtures/metadata/android/ja-JP/changelogs/2.txt

@@ -0,0 +1 @@
+ja-JP changelog 2

supply/spec/fixtures/metadata/android/ja-JP/changelogs/default.txt

@@ -0,0 +1 @@
+ja-JP changelog -1

supply/spec/fixtures/metadata/android/ja-JP/full_description.txt

@@ -0,0 +1 @@
+ja-JP full description

supply/spec/fixtures/metadata/android/ja-JP/short_description.txt

@@ -0,0 +1 @@
+ja-JP short description

supply/spec/fixtures/metadata/android/ja-JP/title.txt

@@ -0,0 +1 @@
+ja-JP title

supply/spec/fixtures/metadata/android/ja-JP/video.txt

@@ -0,0 +1 @@
+ja-JP video

supply/spec/uploader_spec.rb

@@ -203,22 +203,69 @@ def find_obbs
       end
     end
 
-    describe '#perform_upload' do
-      let(:client) { double('client') }
-      let(:config) { { apk: 'some/path/app.apk' } }
+    RSpec::Matchers.define(:same_localizedtext_as) do |expected_arr|
+      match do |actual_arr|
+        actual_arr.sort_by(&:language).zip(expected_arr.sort_by(&:language)).map do |actual_localization, expected_localization|
+          actual_localization.language == expected_localization.language && actual_localization.text == expected_localization.text
+        end.reduce(:&)
+      end
+    end
 
-      before do
-        Supply.config = config
-        allow(Supply::Client).to receive(:make_from_config).and_return(client)
-        allow(client).to receive(:upload_apk).with(config[:apk]).and_return(1) # newly uploaded version code
-        allow(client).to receive(:begin_edit).and_return(nil)
-        allow(client).to receive(:commit_current_edit!).and_return(nil)
+    shared_examples 'run supply to upload metadata' do
+      describe '#perform_upload' do
+        subject(:release) { OpenStruct.new({ version_codes: version_codes }) }
+        let(:client) { double('client') }
+        let(:config) { { apk_paths: version_codes.map { |v_code| "some/path/app-v#{v_code}.apk" }, metadata_path: 'supply/spec/fixtures/metadata/android', track: 'track-name' } }
+
+        before do
+          Supply.config = config
+          allow(Supply::Client).to receive(:make_from_config).and_return(client)
+          version_codes.each do |version_code|
+            allow(client).to receive(:upload_apk).with("some/path/app-v#{version_code}.apk").and_return(version_code) # newly uploaded version code
+          end
+          allow(client).to receive(:upload_changelogs).and_return(nil)
+          allow(client).to receive(:tracks).with('track-name').and_return([OpenStruct.new({ releases: [ release ] })])
+          languages.each do |lang|
+            allow(client).to receive(:listing_for_language).with(lang).and_return(Supply::Listing.new(client, lang))
+            allow(client).to receive(:update_listing_for_language).with({ language: lang, full_description: "#{lang} full description", short_description: "#{lang} short description", title: "#{lang} title", video: "#{lang} video" })
+          end
+          allow(client).to receive(:begin_edit).and_return(nil)
+          allow(client).to receive(:commit_current_edit!).and_return(nil)
+        end
+
+        it 'should update track with correct version codes and optional changelog' do
+          uploader = Supply::Uploader.new
+          expect(uploader).to receive(:update_track).with(version_codes).once
+          version_codes.each do |version_code|
+            expected_notes = []
+            languages.each do |lang|
+              expected_notes << AndroidPublisher::LocalizedText.new(
+                language: lang,
+                text: "#{lang} changelog #{with_explicit_changelogs ? version_code : -1}"
+              )
+            end
+            # check if at least one of the assignments of release_notes is what we expect
+            expect(release).to receive(:release_notes=).with(same_localizedtext_as(expected_notes))
+          end
+
+          uploader.perform_upload
+        end
       end
+    end
+
+    describe '#peform_upload with metadata and explicit changelogs' do
+      it_behaves_like 'run supply to upload metadata' do
+        let(:version_codes) { [1, 2] }
+        let(:languages) { ['en-US', 'fr-FR', 'ja-JP'] }
+        let(:with_explicit_changelogs) { true }
+      end
+    end
 
-      it 'should update track with correct version codes' do
-        uploader = Supply::Uploader.new
-        expect(uploader).to receive(:update_track).with([1]).once
-        uploader.perform_upload
+    describe '#peform_upload with metadata and default changelogs' do
+      it_behaves_like 'run supply to upload metadata' do
+        let(:version_codes) { [3] }
+        let(:languages) { ['en-US', 'fr-FR', 'ja-JP'] }
+        let(:with_explicit_changelogs) { false }
       end
     end