eivid 1.0.3 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 170f1105ae880129ff80583493e23aa7fb59d6753b0e6ee235577d01d6cab4e6
-  data.tar.gz: 44f34c2db366c087f13a1cdbe4e9225a997cb8b7a498707aa2078dc9e1f049ca
+  metadata.gz: 18c4c4d966bf527f9b36d9d30fa7f0bd1a78cbe85ed82ed02264c2b15c23b022
+  data.tar.gz: 79899e7a07874171fba933e51a53bf4d5b6d9a531300ee6b59ac39f8fdd09070
 SHA512:
-  metadata.gz: c54d80a42768cb50f24f253e66a03da55bc0ea9cf27601cb1c0cc7a80ddfe967fe54797c1b9d012daf56796405df6a6cb5dde02cf7913dc606bd800d7a270f73
-  data.tar.gz: d20be465508e7e42f7d2fce872f769ea8bc0074d80a4a04cf8d01ccfa702db8782b8a08091cb59b7aff0a0c654c1740785e56ea5aefc5131b8da3d3f6d25560f
+  metadata.gz: 4b4c8890c237800b56c5bad688fc025a1fb2ed4b835afdb103435281dd421d14587a35f99265f8fdd0073e72c5ba8ffebaf6ce4dc6bbb88b509aa48052661f7a
+  data.tar.gz: 3016c7ad6bac8c16a5369516840269d53ce45f5c25a5f92fedebe16a042fd56324e01c23a8a1f018bb16cfed07c683c46250fadce006285d3df70f91537be56d

data/app/controllers/eivid/videos_controller.rb

@@ -13,7 +13,7 @@ module Eivid
     before_action :validate_video_file, only: [:upload_video]
 
     def upload_video
-      record = UploadService.upload(owner: @owner, user: @user, video_file: video_params["video_file"])   
+      record = UploadService.upload(owner: @owner, user: @user, video_file: video_params["video_file"], video_title: video_title)   
       render json: record
     end
 
@@ -44,5 +44,10 @@ module Eivid
       params.permit("video_file")
     end
 
+    def video_title
+      title = video_params["video_file"].original_filename
+      title.include?('.') ? title.split('.')[0..-2].join('.') : title
+    end
+
   end
 end

data/app/errors/eivid/video_unavailable_all_attempts_failed_error.rb

@@ -0,0 +1,4 @@
+module Eivid
+  class VideoUnavailableAllAttemptsFailedError < StandardError
+  end
+end

data/app/errors/eivid/video_urls_all_attempts_failed_error.rb

@@ -0,0 +1,4 @@
+module Eivid
+  class VideoUrlsAllAttemptsFailedError < StandardError
+  end
+end

data/app/jobs/eivid/check_vimeo_status_job.rb

@@ -1,7 +1,12 @@
 module Eivid
   class CheckVimeoStatusJob < ApplicationJob
 
-    retry_on VideoUnavailableError, wait: 10.seconds, attempts: 50
+    retry_on(VideoUnavailableError, wait: 10.seconds, attempts: 50) do |job, error|
+      raise Eivid::VideoUnavailableAllAttemptsFailedError, "failed after the set max attempts (#{job.executions} times)"
+    end
+
+    discard_on ActiveJob::DeserializationError
+
     after_perform :poll_vimeo_urls
 
     def perform(video_record:)

data/app/jobs/eivid/get_vimeo_hd_url_job.rb

@@ -0,0 +1,24 @@
+module Eivid
+  class GetVimeoHdUrlJob < ApplicationJob
+
+    include Eivid::GetVimeoUrlsMixin
+
+    def perform(video_record:, vimeo_id:)
+      @video_record = video_record
+      @vimeo_id     = vimeo_id
+
+      set_response
+      set_url_hd
+
+      return unless @url_hd
+      update_record
+    end
+
+    private
+
+    def update_record
+      @video_record.update(url_hd: @url_hd)
+    end
+
+  end
+end

data/app/jobs/eivid/get_vimeo_urls_job.rb

@@ -1,7 +1,13 @@
 module Eivid
   class GetVimeoUrlsJob < ApplicationJob
 
-    retry_on VideoUrlsUnavailableError, wait: 10.seconds, attempts: 50
+    include Eivid::GetVimeoUrlsMixin
+
+    retry_on(VideoUrlsUnavailableError, wait: 10.seconds, attempts: 50) do |job, error| 
+      raise Eivid::VideoUrlsAllAttemptsFailedError, "failed after the set max attempts (#{job.executions} times)"
+    end
+
+    discard_on ActiveJob::DeserializationError
 
     def perform(video_record:, vimeo_id:)
       @video_record = video_record
@@ -16,47 +22,33 @@ module Eivid
       validate_url_thumbnail
 
       update_record
+      schedule_hd_url_job
       notify_front
     end
 
     private
 
-    def set_response
-      @response = Eivid::RequestService.get_video @vimeo_id
-    end
-
-    def set_url_sd
-      @url_sd = dig_video_url :sd
+    def notify_front
+      data = { video: @video_record.slice(:id, :user_id), progress: { percentage: 100, step: "All video versions are available on Vimeo." } }
+      NotifyFrontService.progress('notify_method_on_versions_available', data)
     end
 
-    def set_url_hd
-      @url_hd = dig_video_url :hd
+    def update_record
+      @video_record.update(uploaded: true, url_sd: @url_sd, url_hd: @url_hd, url_thumbnail: @url_thumbnail)
     end
 
-    def dig_video_url(definition)
-      @response[:files]&.find { |video| video[:quality] == definition.to_s }&.dig(:link)
+    def schedule_hd_url_job
+      Eivid::GetVimeoHdUrlJob.set(wait: 5.minutes).perform_later(video_record: @video_record, vimeo_id: @vimeo_id)
     end
 
-    def set_url_thumbnail
-      @url_thumbnail = @response&.dig(:pictures, :sizes)&.find { |url| url[:width] == 640 && url[:height] == 360 }&.dig(:link_with_play_button)
-    end
 
     def validate_url_presence
-      raise Eivid::VideoUrlsUnavailableError unless (@url_sd && @url_hd && @url_thumbnail)
+      raise Eivid::VideoUrlsUnavailableError unless @url_thumbnail && @url_sd
     end
 
     def validate_url_thumbnail
       raise Eivid::VideoUrlsUnavailableError if @url_thumbnail.include? 'video%2Fdefault'
     end
 
-    def update_record
-      @video_record.update(uploaded: true, url_sd: @url_sd, url_hd: @url_hd, url_thumbnail: @url_thumbnail)
-    end
-
-    def notify_front
-      data = { video: @video_record.slice(:id, :user_id), progress: { percentage: 100, step: "All video versions are available on Vimeo." } }
-      NotifyFrontService.progress('notify_method_on_versions_available', data)
-    end
-
   end
 end

data/app/jobs/eivid/get_vimeo_urls_mixin.rb

@@ -0,0 +1,36 @@
+module Eivid::GetVimeoUrlsMixin
+  extend ActiveSupport::Concern
+  included do
+
+    private
+
+    def set_response
+      @response = Eivid::RequestService.get_video @vimeo_id
+    end
+
+    def set_url_sd
+      @url_sd = dig_video_url :sd
+    end
+
+    def set_url_hd
+      @url_hd = dig_video_url :hd
+    end
+
+    def dig_video_url(definition)
+      @response[:files]&.find { |video| video[:quality] == definition.to_s }&.dig(:link)
+    end
+
+    def set_url_thumbnail
+      @url_thumbnail = find_high_res_thumbnail || find_low_res_thumbnail
+    end
+
+    def find_high_res_thumbnail
+      @response&.dig(:pictures, :sizes)&.find { |url| url[:width] == 960 && url[:height] == 540 }&.dig(:link_with_play_button)
+    end
+
+    def find_low_res_thumbnail
+      @response&.dig(:pictures, :sizes)&.find { |url| url[:width] == 640 && url[:height] == 360 }&.dig(:link_with_play_button)
+    end
+
+  end
+end

data/app/models/eivid/concerns/main_app/video_concerns.rb

@@ -12,5 +12,7 @@ module Eivid::Concerns::MainApp::VideoConcerns
     scope :has_processed_video,   -> { joins(:videos).where('eivid_videos.uploaded': true).distinct }
     scope :has_unprocessed_video, -> { joins(:videos).where('eivid_videos.uploaded' => false).distinct }
 
+    scope :has_video_from_user,   -> (user_id) { joins(:videos).where('eivid_videos.user_id = ?', user_id) }
+    
   end
 end

data/app/services/eivid/upload_service.rb

@@ -1,9 +1,9 @@
 module Eivid::UploadService   
   class << self
 
-    def upload(owner:, user: nil, video_file:)
+    def upload(owner:, user: nil, video_file:, video_title:)
       @video_file           = video_file
-      @video_record         = Eivid::Video.create(owner_id: owner.id, user_id: user&.id)
+      @video_record         = Eivid::Video.create(owner_id: owner.id, user_id: user&.id, title: video_title)
       @user                 = user
       @file_name, @file_ext = @video_file.original_filename.split('.') 
       

data/db/migrate/20210818121057_add_title_to_video.rb

@@ -0,0 +1,5 @@
+class AddTitleToVideo < ActiveRecord::Migration[5.2]
+  def change
+    add_column :eivid_videos, :title, :string
+  end
+end

data/lib/eivid/version.rb

@@ -1,3 +1,3 @@
 module Eivid
-  VERSION = '1.0.3'
+  VERSION = '1.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eivid
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.8
 platform: ruby
 authors:
 - Jurriaan Schrofer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -71,11 +71,15 @@ files:
 - app/errors/eivid/maximum_vimeo_poll_reached_error.rb
 - app/errors/eivid/video_file_not_present_error.rb
 - app/errors/eivid/video_file_size_too_big_error.rb
+- app/errors/eivid/video_unavailable_all_attempts_failed_error.rb
 - app/errors/eivid/video_unavailable_error.rb
+- app/errors/eivid/video_urls_all_attempts_failed_error.rb
 - app/errors/eivid/video_urls_unavailable_error.rb
 - app/jobs/eivid/application_job.rb
 - app/jobs/eivid/check_vimeo_status_job.rb
+- app/jobs/eivid/get_vimeo_hd_url_job.rb
 - app/jobs/eivid/get_vimeo_urls_job.rb
+- app/jobs/eivid/get_vimeo_urls_mixin.rb
 - app/jobs/eivid/upload_vimeo_job.rb
 - app/mailers/eivid/application_mailer.rb
 - app/models/eivid/application_record.rb
@@ -111,6 +115,7 @@ files:
 - db/migrate/20210419122001_change_url_to_embedded_url.rb
 - db/migrate/20210419122752_add_video_urls_to_videos.rb
 - db/migrate/20210420120017_add_user_id_to_eivid_videos.rb
+- db/migrate/20210818121057_add_title_to_video.rb
 - lib/eivid.rb
 - lib/eivid/engine.rb
 - lib/eivid/version.rb