rest-ftp-daemon 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efa9383e05431a1d58ca0e6b57c144f51ac0bf6d
-  data.tar.gz: 187b0e1b61ef6ee338dda5659c70bbc3333777ad
+  metadata.gz: 78104ad0f5e08723d7e8e5e9c3337ee89a536003
+  data.tar.gz: 5825274cf26e5584a7a144b9148ff01fe8cac042
 SHA512:
-  metadata.gz: d5e4f7c48107b3b25c64542684e3cb0b1ec48fd6fdeb6bf61affb2412b9501d3d02b78559e36ba244e7377626f5afa824598c8fea4a83c3cab85d1bbc904a927
-  data.tar.gz: b150aee88ec711ab79da7567527482c1ebf9c32ac2c207950a52b09b9ace2b7935d4ec61873f7c99c600706fbe0556c2f1a6030b8d6a09dae9aacd7e40a02578
+  metadata.gz: 87f8db3bf58d9b74d1b2fbbe92b51f6ecc3f7d132f7783a1c08fa589c002f152055fff01ae4e90e8370049cc62a83a9ddccd0110a7de25890a36587152b3e5ff
+  data.tar.gz: e71a94ea567a7ef4da107bb30bff235e1eb9c6cb12ba7cb03d529dd709cb324b74e3e1c2bb4808ad87305f71ee4e8cb7ac0ff167311869b4f2c323c25345b64a

data/Gemfile.lock

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

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

@@ -117,9 +117,11 @@ module RestFtpDaemon
            optional :audio_channels,          type: String,  desc: "number of audio channels"
         end
 
-        optional :video_custom, type: Hash, desc: "video: custom options passed to FFMPEG encoder", default: {} do
-           optional :option1,                 type: String,  desc: "sample option", default: "my_value"
-        end
+        optional :video_custom, type: Hash, desc: "video: custom options passed to FFMPEG encoder", default: {},
+          documentation: { hidden: false }
+        #  do
+        #    optional :option1,                 type: String,  desc: "sample option", default: "my_value"
+        # end
 
         optional :options, type: Hash, desc: "Options for transfers" do
           optional :overwrite,

data/lib/rest-ftp-daemon/entities/location.rb

@@ -16,7 +16,7 @@ module RestFtpDaemon
       expose :dir
       expose :name
       expose :path
-      expose :filepath
+      expose :path_fs
 
       expose :aws_region ,unless: Proc.new {|obj| obj.aws_region.nil?}
       expose :aws_bucket, unless: Proc.new {|obj| obj.aws_bucket.nil?}

data/lib/rest-ftp-daemon/helpers/transfer.rb

@@ -8,7 +8,7 @@ module RestFtpDaemon
       raise RestFtpDaemon::AssertionFailed, "remote_upload/target" if target.nil?
 
       # Use source filename if target path provided none (typically with multiple sources)
-      log_info "remote_upload temp[#{@tempfile}] source[#{source.path}] target[#{target.path}]"
+      log_info "remote_upload temp[#{@tempfile}] source[#{source.path_fs}] target[#{target.path}]"
       set_info INFO_SOURCE_CURRENT, source.name
 
       # Remove any existing version if present, or check if it's there

data/lib/rest-ftp-daemon/helpers/views.rb

@@ -135,7 +135,7 @@ module RestFtpDaemon
         out << '</span>'
         text = matches[2]
       else
-        text = loc.path
+        text = loc.path_fs
       end
 
       # Add remaining stuff

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

@@ -64,8 +64,8 @@ module RestFtpDaemon
 
       # Prepare target path or build it if asked
       set_status JOB_STATUS_CHDIR
-      #log_info "do_work chdir_or_create #{@target_loc.filedir}"
-      @remote.chdir_or_create @target_loc.filedir, @mkdir
+      #log_info "do_work chdir_or_create #{@target_loc.dir_fs}"
+      @remote.chdir_or_create @target_loc.dir_fs, @mkdir
 
       # Compute total files size
       @transfer_total = sources.collect(&:size).sum

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

@@ -12,8 +12,8 @@ module RestFtpDaemon
 
     # Process job
     def do_before
-      log_info "JobVideo.before source_loc.filepath: #{@source_loc.filepath}"
-      log_info "JobVideo.before target_loc.filepath: #{@target_loc.filepath}"
+      log_info "JobVideo.before source_loc.path_fs: #{@source_loc.path_fs}"
+      log_info "JobVideo.before target_loc.path_fs: #{@target_loc.path_fs}"
 
       # Ensure FFMPEG lib is available
       check_ffmpeg_binary :ffprobe_binary
@@ -35,10 +35,10 @@ module RestFtpDaemon
       # Add the source file name if none found in the target path
       target_final = @target_loc.clone
       target_final.name = @source_loc.name unless target_final.name
-      log_info "JobVideo.work target_final.filepath [#{target_final.filepath}]"
+      log_info "JobVideo.work target_final.path_fs [#{target_final.path_fs}]"
 
       # Ensure target directory exists
-      t_dir = @target_loc.filedir
+      t_dir = @target_loc.dir_fs
       log_info "JobVideo.work mkdir_p [#{t_dir}]"
       FileUtils.mkdir_p t_dir
 
@@ -59,7 +59,7 @@ module RestFtpDaemon
       # Read info about source file
       set_info INFO_SOURCE_CURRENT, source.name
       begin
-        movie = FFMPEG::Movie.new(source.path)
+        movie = FFMPEG::Movie.new(source.path_fs)
       rescue Errno::ENOENT => exception
         raise RestFtpDaemon::VideoNotFound, exception.message
       rescue StandardError => exception
@@ -85,7 +85,7 @@ module RestFtpDaemon
       log_info "JobVideo.ffmpeg_command [#{FFMPEG.ffmpeg_binary}] [#{source.name}] > [#{target.name}]", options
 
       # Build command
-      movie.transcode(target.filepath, options) do |ffmpeg_progress|
+      movie.transcode(target.path_fs, options) do |ffmpeg_progress|
         # set_info :work, :ffmpeg_progress, ffmpeg_progress
         set_info INFO_TRANFER_PROGRESS, (100.0 * ffmpeg_progress).round(1)
         log_info "progress #{ffmpeg_progress}"

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

@@ -60,13 +60,12 @@ module RestFtpDaemon
     def path
       File.join(@dir.to_s, name.to_s)
     end
-    def filepath
-      # "/#{path}"
-      File.join('/', @dir.to_s, name.to_s)
+    
+    def path_fs
+      '/' + path
     end
-
-    def filedir
-      "/#{@dir}"
+    def dir_fs
+      '/' + @dir
     end
 
     def local_files
@@ -80,9 +79,10 @@ module RestFtpDaemon
 
     def size
       return unless uri.is_a? URI::FILE
-      local_file_path = filepath
-      return unless File.exist? local_file_path
-      return File.size local_file_path
+
+      local_file_path = path_fs
+      return unless File.exist? path_fs
+      return File.size path_fs
     end
 
     def generate_temp_name!

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

@@ -34,7 +34,7 @@ module RestFtpDaemon
       end
 
       def size_if_exists target
-        size = @ftp.size target.filepath
+        size = @ftp.size target.path_fs
         log_debug "size_if_exists [#{target.name}]"
 
       rescue Net::FTPPermError
@@ -44,7 +44,7 @@ module RestFtpDaemon
       end
 
       def remove! target
-        @ftp.delete target.filepath
+        @ftp.delete target.path_fs
       rescue Net::FTPPermError
         log_debug "remove! [#{target.name}] not found"
       else
@@ -103,12 +103,12 @@ module RestFtpDaemon
         end
 
         # Move to the directory
-        log_debug "upload chdir [#{dest.filedir}]"
-        @ftp.chdir dest.filedir
+        log_debug "upload chdir [#{dest.dir_fs}]"
+        @ftp.chdir dest.dir_fs
 
         # Do the transfer
-        log_debug "upload putbinaryfile [#{source.filepath}] [#{dest.name}]"
-        @ftp.putbinaryfile source.filepath, dest.name, JOB_FTP_CHUNKMB do |data|
+        log_debug "upload putbinaryfile [#{source.path_fs}] [#{dest.name}]"
+        @ftp.putbinaryfile source.path_fs, dest.name, JOB_FTP_CHUNKMB do |data|
           # Update job status after this block transfer
           yield data.bytesize, dest.name
         end

data/lib/rest-ftp-daemon/remote/s3.rb

@@ -42,7 +42,7 @@ module RestFtpDaemon
         log_debug "upload bucket[#{target.aws_bucket}] path[#{target.path}]"
 
         # Do the transfer, passing the file to the best method
-        File.open(source.filepath, 'r', encoding: 'BINARY') do |file|
+        File.open(source.path_fs, 'r', encoding: 'BINARY') do |file|
           if file.size >= JOB_S3_MIN_PART
             upload_multipart  file, target.aws_bucket, target.path, target.name, &callback
           else

data/lib/rest-ftp-daemon/remote/sftp.rb

@@ -32,7 +32,7 @@ module RestFtpDaemon
 
       def size_if_exists target
         log_debug "size_if_exists [#{target.name}]"
-        stat = @sftp.stat! target.filepath
+        stat = @sftp.stat! target.path_fs
 
       rescue Net::SFTP::StatusException
         return false
@@ -42,7 +42,7 @@ module RestFtpDaemon
 
       def remove! target
         log_debug "remove! [#{target.name}]"
-        @sftp.remove target.filepath
+        @sftp.remove target.path_fs
 
       rescue Net::SFTP::StatusException
         log_debug "#{LOG_INDENT}[#{target.name}] file not found"
@@ -99,7 +99,7 @@ module RestFtpDaemon
 
         # Do the transfer
         log_debug "upload temp[#{use_temp_name}] name[#{dest.name}]"
-        @sftp.upload! source.filepath, dest.filepath do |event, _uploader, *args|
+        @sftp.upload! source.path_fs, dest.path_fs do |event, _uploader, *args|
           case event
           when :open then
             # args[0] : file metadata
@@ -125,7 +125,7 @@ module RestFtpDaemon
         if use_temp_name
           flags = 0x00000001
           log_debug "upload rename [#{dest.name}] > [#{target.name}]"
-          @sftp.rename! dest.filepath, target.filepath, flags
+          @sftp.rename! dest.path_fs, target.path_fs, flags
         end
 
         # progress:

data/rest-ftp-daemon.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |spec|
 
   # Project version
-  spec.version                    = "1.0.4"
+  spec.version                    = "1.0.5"
 
   # 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: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Bruno MEDICI