eivid 1.1.3 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44d8733cec02c2d822a758903661c03b348ec6797a8cdcb817ffa4790094aeb1
-  data.tar.gz: b1c1b3ac06bb695ce76b72db220e18b74db69960f4ce0131d4f00289e3fc5e34
+  metadata.gz: 24ee978f547944d6c9468eeebfe0d4a8e196c2dc273118139255b30349487e4e
+  data.tar.gz: b619bca48a02939b349535d99e273eff04731ecf5efcdfebf9c2364cec9d172f
 SHA512:
-  metadata.gz: a83022e2807549aeaee50017ece932101a8d973a9a4e878b702afb762b5939a45f72479f30f6300cb38e89223f69bb2fc51a7619bc3662f7ea98c3ef6504b980
-  data.tar.gz: 141aa446b58902cb6c4106b3489abeaad47ac68d492651b112fa9e3463fc38082201d174b38b6161ec8e0807b8b09e51be0c5f71eb9fbfe1aefa7920c4d0f3cb
+  metadata.gz: 53d3bf0598eb180fb6e0c11087de04db614da1f9ab9bab9fe37cb9ca96c192936854960a1e1713fae9bdad8f0c7df6ed7e4deb398a5da216886dcf592f288faa
+  data.tar.gz: 72fd598c3d9f2e89c378eaff5e37ab91899ac453bbd3435dfdc2cd9599d0fbf1532a47f5194c4661766ea1a119b25cdff93934333f4623349099f0088fff3cbf

data/app/jobs/eivid/upload_vimeo_job.rb

@@ -2,54 +2,20 @@ module Eivid
   class UploadVimeoJob < ApplicationJob
 
     def perform(video_record:, video_path:)
-      @video_record = video_record
-      @video_path   = video_path
-      @video_file   = File.open(video_path).read
+      # Upload video
+      uploaded_data       = Eivid::RequestService.upload_video(video_path:)
+      vimeo_id, vimeo_url = uploaded_data.values_at(:vimeo_id, :vimeo_url)
 
-      upload_to_vimeo
-      set_attributes
-      update_record
-      add_to_folder
-      
-      notify_front
-      check_status
-    end
-
-    private
+      # Update records
+      video_record.update(url_embedded: vimeo_url, vimeo_id:)
+      Eivid::RequestService.add_video_to_folder(video_record:)
 
-    def upload_to_vimeo      
-      @response = Eivid::RequestService.upload_video(video_path: @video_path)
-    end
-
-    def set_attributes
-      set_vimeo_url
-      set_vimeo_id
-    end
-
-    def set_vimeo_url
-      @vimeo_url = @response.dig(:link)
-    end
-
-    def set_vimeo_id
-      @vimeo_id = @vimeo_url.split('/').last
-    end
-
-    def update_record
-      @video_record.update(url_embedded: @vimeo_url, vimeo_id: @vimeo_id)
-    end
-
-    def add_to_folder
-      Eivid::RequestService.add_video_to_folder(video_record: @video_record)
-    end
-
-    def check_status
-      CheckVimeoStatusJob.perform_later(video_record: @video_record)
-    end
-
-    def notify_front
-      data = { video: @video_record.slice(:id, :user_id), progress: { percentage: 33, step: "The video has been uploaded to Vimeo." } }
+      # Communicate status to the front-end
+      data = { video: video_record.slice(:id, :user_id), progress: { percentage: 33, step: "The video has been uploaded to Vimeo." } }
       NotifyFrontService.progress('notify_method_on_upload', data)
+      CheckVimeoStatusJob.perform_later(video_record:)
     end
 
+
   end
 end

data/app/models/eivid/concerns/request_service/upload_video.rb

@@ -2,30 +2,72 @@ module Eivid::Concerns::RequestService::UploadVideo
   extend ActiveSupport::Concern
 
   def upload_video(video_path:)
-    @file        = File.open(video_path) 
-    @request     = HTTParty.post Eivid::RequestService::VIDEOS_URL, **upload_params
-    @response    = JSON.parse(@request).deep_symbolize_keys
-    @upload_link = @response.dig(:upload, :upload_link)
+    file                  = File.open(video_path)
+    data                  = retrieve_upload_link(file: file)
+    upload_link, response = data.values_at(:upload_link, :response)
+    vimeo_url             = response.dig(:link)
+    vimeo_id              = vimeo_url.split('/').last
 
-    tus_upload_to_vimeo
-    @response
+    tus_upload_to_vimeo(file:, upload_link:)
+    {vimeo_id:, vimeo_url:}
   end
 
   private
 
-  def tus_upload_to_vimeo
-    HTTParty.patch @upload_link, body: @file.read, headers: tus_headers
+  def retrieve_upload_link(file:)
+    efforts     = 0
+    max_efforts = 180
+    sleep_time  = 1
+    upload_link = nil
+
+    while upload_link.blank? && efforts < max_efforts do
+
+      puts "Trying to retrieve upload link from Vimeo... try #{efforts}/#{max_efforts} with #{sleep_time} seconds sleep in between..."
+
+      request     = HTTParty.post Eivid::RequestService::VIDEOS_URL, **upload_params(file)
+      response    = JSON.parse(request).deep_symbolize_keys
+      upload_link = response.dig(:upload, :upload_link)
+
+      if upload_link.blank?
+        sleep sleep_time
+        efforts += 1
+      else
+        puts "successfully retrieved the Vimeo upload link!"
+        return {response: response, upload_link: upload_link}
+      end
+    end
+  end
+
+  def tus_upload_to_vimeo(file:, upload_link:)
+    efforts     = 0
+    max_efforts = 10
+    sleep_time  = 30
+    successful  = false
+
+    while !successful && efforts < max_efforts
+
+      puts "Trying to upload the video to Vimeo... try #{efforts}/#{max_efforts} with #{sleep_time} seconds sleep in between..."
+      response = HTTParty.patch upload_link, body: file.read, headers: tus_headers
+
+      if response.code >= 500
+        sleep sleep_time
+        efforts += 1
+      else
+        successful = true
+        puts "successfully uploaded the video to Vimeo!"
+      end
+    end
   end
 
-  def upload_params
+  def upload_params(file)
     body = {
       "upload" => {
         "approach" => "tus",
-        "size"     => @file.size.to_s,
+        "size"     => file.size.to_s,
       }
     }
 
     { body: body.to_json, headers: default_headers }
   end
 
-end
+end

data/lib/eivid/version.rb

@@ -1,3 +1,3 @@
 module Eivid
-  VERSION = '1.1.3'
+  VERSION = '1.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eivid
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.5
 platform: ruby
 authors:
 - Jurriaan Schrofer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-01 00:00:00.000000000 Z
+date: 2024-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Eivid because we can.