jekyll-picture-tag-ng 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24fa31a62f9db299a6bf311f5e9e6786497bf759e26bc1c29ca1e320331c91cc
-  data.tar.gz: 0472a2f6a44a0a358be737bb2c3bfd42bc5bd266d9c96bedb027a9f889bd0207
+  metadata.gz: 4a2819edd23c6ea86844dc240bd5e7919d2feb274973fa0dd3f6a2f8309bfc32
+  data.tar.gz: 4cac1933e03ad045a4e2d362b8d41af0142bf93896658503965df3bcdda11b2d
 SHA512:
-  metadata.gz: a9d425639ebb2ac9db33b231b19acd323eaa0efa7d3df9cb4aa8233df1c4395f1e1c6d561701d8e6c6389633d6c535e63969663df2b8fa485d873456915cd7de
-  data.tar.gz: be4985d422441d0ad62dea7f401982d4edb30ce05e01d1819a22eaefe3efef88c7099e1cf702fd79295546ab46d59f3347edbb2bebad180147c191628b72c294
+  metadata.gz: 5542a64a8d14317ad90380d0faeea45327b99590af770f0c059bfb7f378148336b8848d130e46f04fef2ef13fdc1026f91bd671115558ec5ee4a71762df918c6
+  data.tar.gz: 6c3aff4446150db753872190fe6d6c7c48d85f229ca456b9ae0ff9be703cb3ce44a18e3e4cb7b15fc86e72bccf0940bc754f73722be1aadc4a023cdd88284b0d

data/README.md

@@ -62,6 +62,7 @@ Configuration is done in the `_config.yml` of your website, under the `picture_t
 ```yaml
 picture_tag_ng:
   parallel: false
+  threads: 16
   background_color: FFFFFF
   picture_versions:
     m: 700
@@ -73,6 +74,7 @@ The example above is equivalent to the defaults.
 - `background_color` is the color used to replace transparency when converting from `webp` to `jpeg`
 - `picture_versions` maps version names to target widths in pixels. The default configuration above produces output files 700px wide in `img/m/` and 400px wide in `img/s/`.
 - `parallel` is a boolean indicating if you want to generate the output files in parallel threads. With a website that has a lot of large pictures, I get ~30% speed improvements when generating the site locally. However, this seems to make building the site with the recommended Github workflow fail.
+- `threads` is the number of concurrent threads for generating the website (only used if `parallel` is `true`
 
 ## Development
 

data/lib/jekyll-picture-tag-ng/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module PictureTag
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

data/lib/jekyll-picture-tag-ng.rb

@@ -101,15 +101,53 @@ module Jekyll
   class Site
     alias_method "old_write", "write"
 
+    def n_threads
+      config["picture_tag_ng"]["threads"] || 8
+    end
+
+    def thread_pool
+      @thread_pool ||= (0..n_threads).map do |i|
+        Jekyll.logger.debug "Creating thread num #{i}"
+        Thread.new do
+          j = 0
+          Kernel.loop do
+            Jekyll.logger.debug "Doing task num. #{j}"
+            j += 1
+            task = next_task
+            if task.nil?
+              sleep 0.1
+            elsif task.instance_of?(Proc)
+              res = task.call
+            end
+
+            break if res == -1
+          end
+          Jekyll.logger.debug "Finishing thread num #{i}"
+        end
+      end
+    end
+
+    def next_task
+      @task_queue ||= []
+      @task_queue.shift
+    end
+
+    def add_task(&task)
+      @task_queue ||= []
+      @task_queue.push(task)
+    end
+
     def write
       if config["picture_tag_ng"]["parallel"]
         Jekyll.logger.info "Writing files in parallel (should not work on GH Pages)"
         Jekyll::Commands::Doctor.conflicting_urls(self)
-        threads = []
         each_site_file do |item|
-          threads << Thread.new { item.write(dest) } if regenerator.regenerate?(item)
+          regenerator.regenerate?(item) && add_task { item.write(dest) }
+        end
+        thread_pool.each do
+          add_task { -1 }
         end
-        threads.each(&:join)
+        thread_pool.each(&:join)
         regenerator.write_metadata
         Jekyll::Hooks.trigger :site, :post_write, self
         nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-picture-tag-ng
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - pcouy
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-15 00:00:00.000000000 Z
+date: 2023-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll