eivid 1.0.4 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3be70d9d3f995714108df4fb59cc7d437f02170ec3121ea58b349843873b149
-  data.tar.gz: '03315880246a5a57c4be6062fa6e6a3d19ba171cf16b783a9a323023265da1b4'
+  metadata.gz: 077c29117cf2cded883cfaa9a2fa6357ad7abe30f67c7bc98f2ce53a001bc696
+  data.tar.gz: 2968dca76bba1938d819fcdd44d982119f8e5811e8db15a91b1700ca1918a063
 SHA512:
-  metadata.gz: 78b739ae6ad9a47dc281a2bbbe268cc87b26d600bc183d2907d63f036e61a237ecc22e5cb275019d01c6aeaa291cb20424f6146e8c15fae4c72e00a1f6e38d4a
-  data.tar.gz: fbb92b8cee87d4c61eae547dffd79358245fd92c6536d7b9ff68120d06e3d8d4289bcb4dd2ed4650a14b5ef34492b62f2576bee8be57e89735de19ddc5c0d56e
+  metadata.gz: 3d97c505a4859479a8046bc0dfdd07b4f291e577d359399e23a6a8e37a4277bb5bfb597cd0edc850e200ca9234409e5ebc89f81308301a96025f7b3788249f90
+  data.tar.gz: 3bac18de6b24adc6643c2615e889e8846d592b168da890bb4b244455ed9902d97467c72103b0b40d4bd0011fada3406e1a41bc4489e24bad3c787c0f5f04efa6

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,55 +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
-    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)
+    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_thumbnail
-      @url_thumbnail = find_high_res_thumbnail || find_low_res_thumbnail
+    def update_record
+      @video_record.update(uploaded: true, url_sd: @url_sd, url_hd: @url_hd, url_thumbnail: @url_thumbnail)
     end
 
-    def find_high_res_thumbnail
-      @response&.dig(:pictures, :sizes)&.find { |url| url[:width] == 960 && url[:height] == 540 }&.dig(:link_with_play_button)
+    def schedule_hd_url_job
+      Eivid::GetVimeoHdUrlJob.set(wait: 5.minutes).perform_later(video_record: @video_record, vimeo_id: @vimeo_id)
     end
 
-    def find_low_res_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/models/eivid/concerns/request_service/manage_folder.rb

@@ -6,7 +6,7 @@ module Eivid::Concerns::RequestService::ManageFolder
   end
 
   def create_folder(namespace:, id:)
-    body = { "name" => "#{Rails.env}_#{namespace}_#{id}" }
+    body = { "name" => "#{rails_environment}_#{namespace}_#{id}" }
     
     @response = HTTParty.post Eivid::RequestService::FOLDER_URL, body: body.to_json, headers: default_headers
     get_folder_id
@@ -20,6 +20,11 @@ module Eivid::Concerns::RequestService::ManageFolder
     HTTParty.put endpoint, headers: default_headers
   end
 
+  def rails_environment
+    return "test" if Figaro.env.IS_TEST_SERVER
+    Rails.env
+  end
+
   private
 
   def get_folder_id

data/lib/eivid/version.rb

@@ -1,3 +1,3 @@
 module Eivid
-  VERSION = '1.0.4'
+  VERSION = '1.0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eivid
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.9
 platform: ruby
 authors:
 - Jurriaan Schrofer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-18 00:00:00.000000000 Z
+date: 2021-08-24 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