video_conv 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c0aec8fe006d1813b1b1df10fd3373532ecd239b56ca8ed66f65aa222cb1955
-  data.tar.gz: f4115e3b716ac98823a75eadd302f98898fb172ec9473a1ee89dd0e925796654
+  metadata.gz: 42af0e74253ab7f2408f5f100c029426c6d41d83fa1698dd2c65403e4486d9e8
+  data.tar.gz: 064f07c6d31f2fec3072e090a71414a50e98ebf883ad722380fe139364fc94e9
 SHA512:
-  metadata.gz: 0d8b7a2748d5acda366b4828835452d8168c6e32298b220d66a917ea03cd39e3f5ea6c8ac4b38f08d2e3c5f0b431216b67e8cfa9084beac9b22e72b1c368af6f
-  data.tar.gz: 05b2f1ef5de4b8793e48f223387ddd4a498c06d33e1a80309a6ece0f81b717d30c829a910e2194bec2d897e84c955390576c37b2b9d2dc21ca28502b8ec75b9c
+  metadata.gz: 36f32db10f200fb19fc778aa0ec678476b66544953ba38754e66489e7902a5b9b25a6dbef39ed50d96ba1712bf34311b6e79ff118709fda8babd9ef508cbc382
+  data.tar.gz: c9ed466220efa9f6090f2d8b97cd65f4d23812a7bd8a64ed4ebe5ac5d63656a32bc3a61d22d75bb782d655aea8faddd4d04f4faf35cc126454a8d37175091937

data/lib/video_converter/version.rb

@@ -1,4 +1,4 @@
 module VideoConverter
-    VERSION = '0.2.2'.freeze
-  end
+    VERSION = '0.2.4'.freeze
+end
   

data/lib/video_converter.rb

@@ -1,6 +1,6 @@
 require 'fileutils'
 require 'streamio-ffmpeg'
-require 'thread'
+require 'concurrent'
 
 module VideoConverter
   class Converter
@@ -18,48 +18,48 @@ module VideoConverter
     end
 
     def rename_and_convert_files(dir, source_ext, target_ext)
+      convert_files_in_batch(get_source_files_recursive(dir, source_ext), source_ext, target_ext)
+    end
+
+    def get_source_files_recursive(dir, source_ext)
       source_files = []
       Dir.foreach(dir) do |file|
         next if file == '.' || file == '..'
 
         current_path = File.join(dir, file)
         if File.directory?(current_path)
-          rename_and_convert_files(current_path, source_ext, target_ext) # Recursively call for subdirectories
-        else
-          if file.end_with?(source_ext)
-            source_files << current_path
-          end
+          source_files.concat(get_source_files_recursive(current_path, source_ext)) # Recursively call for subdirectories
+        elsif file.end_with?(source_ext)
+          source_files << current_path
         end
       end
 
-      source_files.each_slice(batch_size) do |file_batch|
-        convert_files_in_batch(file_batch, source_ext, target_ext)
-        sleep(conversion_delay)
-      end
+      source_files
     end
 
     def convert_files_in_batch(files, source_ext, target_ext)
-      threads = []
-      queue = Queue.new
-
-      files.each { |file| queue << file }
+      executor = Concurrent::ThreadPoolExecutor.new(
+        min_threads: 1,
+        max_threads: max_concurrency,
+        max_queue: files.size,
+        fallback_policy: :caller_runs
+      )
 
-      [max_concurrency, files.size].min.times do
-        threads << Thread.new do
-          while (file = queue.pop(true) rescue nil)
-            new_filename = file.gsub(source_ext, target_ext)
-            if !File.exist?(new_filename)
-              convert_file(file, new_filename)
-              puts "Converted: #{file} -> #{new_filename}"
-              FileUtils.rm(file) # Remove the original file after conversion
-            else
-              puts "Skipped conversion (already exists): #{file}"
-            end
+      files.each do |file|
+        executor.post do
+          new_filename = file.gsub(source_ext, target_ext)
+          if !File.exist?(new_filename)
+            convert_file(file, new_filename)
+            puts "Converted: #{file} -> #{new_filename}"
+            FileUtils.rm(file) # Remove the original file after conversion
+          else
+            puts "Skipped conversion (already exists): #{file}"
           end
         end
       end
 
-      threads.each(&:join)
+      executor.shutdown
+      executor.wait_for_termination
     end
 
     def convert_single_file(source_file, target_file = nil, target_format = nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: video_conv
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Webster
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-23 00:00:00.000000000 Z
+date: 2023-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: streamio-ffmpeg
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement