rest-ftp-daemon 0.421.1 → 0.422.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d5d765b823e1d4589ad7fba0f723c08d08b901d
-  data.tar.gz: 9bb488ac0efa76a77a9d2daa006f39e83817065b
+  metadata.gz: b007f413aeb958a7261cf4b52ab1cc55e5090295
+  data.tar.gz: a632d6c795c89047868b080308fdefc458887ed3
 SHA512:
-  metadata.gz: a4a3790911b1e135fd0c217298a0440dbdf60bf605125e0f10f35fe9a70504b670a5b28f4ad7b989da0ac3f00737b44e30309e2615220287f655688977c5fc09
-  data.tar.gz: f9fb6bafae5b584f849f6ee403dcceeec684e5ec9d785a56b0dbfb38b290dfd580d48a568a520990816c2302f954cabea83c60911e36fcee4bc1272d701265dc
+  metadata.gz: 004961d712ba67aff69de7732f5d9bfb04ca66783860185670784498e400502704440e44b4c1368d4f652328ba3ad948f7ec8b37543536d4211c3674f5bd5e78
+  data.tar.gz: 949d07757d921d4d6da41f5f67e7418de536d0e44c04673629b087585724105659e94709ab20178cf34166c017b83a7e265e7aee15391d18e910962ed37497b8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rest-ftp-daemon (0.421.1)
+    rest-ftp-daemon (0.422.0)
       activesupport (~> 4.2)
       api-auth
       aws-sdk-resources (~> 2)

data/lib/rest-ftp-daemon/api/jobs.rb

@@ -82,6 +82,11 @@ module RestFtpDaemon
           type: String,
           desc: "video: audio codec",
           default: nil
+
+        optional :video_options,
+          type: Hash,
+          desc: "Video: standard options passed to FFMPEG encoder",
+          default: {}
         optional :video_custom,
           type: Hash,
           desc: "video: custom options passed to FFMPEG encoder",
@@ -99,8 +104,7 @@ module RestFtpDaemon
           type: Boolean,
           desc: "Upload to a temp file before renaming it to the target filename",
           default: Conf.at(:transfer, :tempfile)
-        # optional :options, desc: "", type: API::Entities::Options
-
+        # optional :options, desc: "Options passed to FFMPEG (video jobs)", type: API::Entities::Options
       end
 
       post "/" do

data/lib/rest-ftp-daemon/constants.rb

@@ -13,7 +13,9 @@ JOB_RANDOM_LEN          = 8
 JOB_IDENT_LEN           = 4
 JOB_TEMPFILE_LEN        = 8
 JOB_UPDATE_INTERVAL     = 1
+
 JOB_FFMPEG_THREADS      = 2
+JOB_FFMPEG_ATTRIBUTES   = [:video_codec, :video_bitrate, :video_bitrate_tolerance, :frame_rate, :resolution, :aspect, :keyframe_interval, :x264_vprofile, :x264_preset, :audio_codec, :audio_bitrate, :audio_sample_rate, :audio_channels]
 
 # Constants: logger
 LOG_ROTATION             = "daily"

data/lib/rest-ftp-daemon/job.rb

@@ -17,7 +17,7 @@ module RestFtpDaemon
     # Class constants
     FIELDS = [:type, :source, :target, :label, :priority, :pool, :notify,
       :overwrite, :mkdir, :tempfile,
-      :video_vc, :video_ac, :video_custom,
+      :video_options, :video_custom
       ]
 
     # Class options
@@ -253,7 +253,7 @@ module RestFtpDaemon
 
       # Add each field to @infos
       fields.each do |what|
-        set_info prefix, what, location.send(what)
+        set_info prefix, "loc_#{what}".to_sym, location.send(what)
       end
     end
 

data/lib/rest-ftp-daemon/jobs/video.rb

@@ -59,27 +59,30 @@ module RestFtpDaemon
 
       # Read info about source file
       movie = FFMPEG::Movie.new(source.path)
+      set_info :source, :ffmpeg_size, movie.size
+      set_info :source, :ffmpeg_duration, movie.duration
+      set_info :source, :ffmpeg_resolution, movie.resolution
+
+
+
 
       # Build options
       options = {
-        threads: JOB_FFMPEG_THREADS
+        threads: JOB_FFMPEG_THREADS,
+        custom: options_from(@video_custom)
         }
-      options[:audio_codec] = @video_ac                    unless @video_ac.to_s.empty?
-      options[:video_codec] = @video_vc                    unless @video_vc.to_s.empty?
-      options[:custom]      = options_from(@video_custom)  if @video_custom.is_a? Hash
-
+      JOB_FFMPEG_ATTRIBUTES.each do |name|
+        options[name] = @video_options[name] unless @video_options[name].nil?
+      end
       set_info :work, :ffmpeg_options, options
 
-      # Announce contexte
+      # Announce context
       log_info "JobVideo.ffmpeg_command [#{FFMPEG.ffmpeg_binary}] [#{source.name}] > [#{target.name}]", options
 
       # Build command
       movie.transcode(target.path, options) do |ffmpeg_progress|
-        set_info :work, :ffmpeg_progress, ffmpeg_progress
-
-        percent0 = (100.0 * ffmpeg_progress).round(0)
-        set_info :work, :progress, percent0
-
+        # set_info :work, :ffmpeg_progress, ffmpeg_progress
+        set_info :work, :progress, (100.0 * ffmpeg_progress).round(1)
         log_debug "progress #{ffmpeg_progress}"
       end
     end
@@ -87,7 +90,6 @@ module RestFtpDaemon
     def options_from attributes
       # Ensure options ar in the correct format
       return [] unless attributes.is_a? Hash
-      # video_custom_parts = @video_custom.to_s.scan(/(?:\w|"[^"]*")+/)
 
       # Build the final array
       custom_parts = []

data/rest-ftp-daemon.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |spec|
 
   # Project version
-  spec.version                    = "0.421.1"
+  spec.version                    = "0.422.0"
 
   # Project description
   spec.name                       = "rest-ftp-daemon"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.421.1
+  version: 0.422.0
 platform: ruby
 authors:
 - Bruno MEDICI