lib/rest-ftp-daemon/api/jobs.rb in rest-ftp-daemon-0.400.0 vs lib/rest-ftp-daemon/api/jobs.rb in rest-ftp-daemon-0.410.0.pre.1

@@ -3,37 +3,46 @@
 module RestFtpDaemon
   module API
     class Jobs < Grape::API
 
       ### ENDPOINTS
-      desc "Read job with ID"
+      desc "Read job with ID", http_codes: [
+        { code: 200, message: "Here is the job you requested" },
+        { code: 404, message: "Job not found" }
+        ],
+        is_array: false
       params do
         requires :id, type: String, desc: "ID of the Job to read"
       end
       get "/:id", requirements: { id: /.*/ } do
         begin
           # Get job to display
           raise RestFtpDaemon::JobNotFound if params[:id].nil?
           job = RestFtpDaemon::JobQueue.instance.find_by_id(params[:id]) || RestFtpDaemon::JobQueue.instance.find_by_id(params[:id], true)
           raise RestFtpDaemon::JobNotFound if job.nil?
 
+          log_debug "found job: #{job.inspect}"
+
         rescue RestFtpDaemon::JobNotFound => exception
           log_error "JobNotFound: #{exception.message}"
           error!({ error: :api_job_not_found, message: exception.message }, 404)
 
         rescue StandardError => exception
           log_error "Exception: #{exception.message}"
           error!({ error: :api_exception, message: exception.message }, 500)
 
         else
           status 200
-          present job, with: RestFtpDaemon::API::Entities::JobPresenter, type: "complete"
+          present job, with: RestFtpDaemon::API::Entities::Job, type: "complete"
 
         end
       end
 
-      desc "List all Jobs"
+      desc "List all Jobs", http_codes: [
+        { code: 200, message: "Here are the jobs you requested" },
+        ],
+        is_array: true
       get "/" do
         begin
           # Get jobs to display
           jobs = RestFtpDaemon::JobQueue.instance.jobs
 
@@ -41,23 +50,44 @@
           log_error "Exception: #{exception.message}"
           error!({ error: :api_exception, message: exception.message }, 500)
 
         else
           status 200
-          present jobs, with: RestFtpDaemon::API::Entities::JobPresenter
+          present jobs, with: RestFtpDaemon::API::Entities::Job
 
         end
       end
 
       desc "Create a new job"
       params do
         requires :source, type: String, desc: "Source file pattern"
         requires :target, type: String, desc: "Target remote path"
+
         optional :label, type: String, desc: "Descriptive label for this job"
         optional :notify, type: String, desc: "URL to get POST'ed notifications back"
         optional :priority, type: Integer, desc: "Priority level of the job (lower is stronger)"
         optional :pool, type: String, desc: "Pool of worker to be used"
+        optional :type,
+          type: String,
+          desc: "Type of job",
+          default: JOB_TYPE_TRANSFER,
+          values: {value: JOB_TYPES, message: "should be one of: #{JOB_TYPES.join', '}"},
+          allow_blank: { value: false, message: 'cannot be empty' }
+
+        optional :video_vc,
+          type: String,
+          desc: "video: video codec",
+          default: ""
+        optional :video_ac,
+          type: String,
+          desc: "video: audio codec",
+          default: ""
+        optional :video_custom,
+          type: Hash,
+          desc: "video: custom options passed to FFMPEG encoder",
+          default: {}
+
         optional :overwrite,
           type: Boolean,
           desc: "Overwrites files at target server",
           default: Conf.at(:transfer, :overwrite)
         optional :mkdir,
@@ -66,34 +96,37 @@
           default: Conf.at(:transfer, :mkdir)
         optional :tempfile,
           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
+
       end
+
       post "/" do
         # log_debug params.to_json
         begin
-          # Create a new job
-          job_id = RestFtpDaemon::JobQueue.instance.generate_id
-          job = Job.new(job_id, params)
+          # Add up the new job on the queue
+          job = RestFtpDaemon::JobQueue.instance.create_job(params)
 
-          # And push it to the queue
-          RestFtpDaemon::JobQueue.instance.push job
-
           # Increment a counter
           RestFtpDaemon::Counters.instance.increment :jobs, :received
 
         rescue JSON::ParserError => exception
           log_error "JSON::ParserError: #{exception.message}"
           error!({error: :api_parse_error, message: exception.message}, 422)
 
+        rescue QueueCantCreateJob => exception
+          log_error "QueueCantCreateJob: #{exception.message}"
+          error!({error: :api_cant_create_job, message: exception.message}, 422)
+
         rescue RestFtpDaemonException => exception
-          log_error "RestFtpDaemonException: #{exception.message}"
-          error!({error: :api_exception, message: exception.message}, 500)
+          log_error "#{exception.class.to_s} #{exception.message}"
+          error!({error: exception_to_error(exception), message: exception.message}, 500)
 
         else
           status 201
-          present job, with: RestFtpDaemon::API::Entities::JobPresenter, hide_params: true
+          present job, with: RestFtpDaemon::API::Entities::Job, hide_params: true
 
         end
       end
 
     end