helios-videos 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e3128ca8453dd9d7bb22e3cc19315474a4dd398d3ba228a212ed54e9c8e2818
-  data.tar.gz: f7ad28e93d4fb7eaebd2965cdee27d26e5f01d0a48aadf0821234a770f1380bc
+  metadata.gz: 76f49bc8d1e6eacb6e18e20cbcc1f6c51517a68dce9da8c04452ef24e9dbf234
+  data.tar.gz: 4c28ee5e130bb987b96d9875aaf0c311f57ac8183f9192fae0f3004e17130769
 SHA512:
-  metadata.gz: 7960c948c478d4fcc24dff6ab49254628727836ba32f7c0d2a5b1a897da932d0f8b143d651466df0c53ce51e32cb16cf439ae248296ae9859d5f8691da3b9c03
-  data.tar.gz: 19238d28e62666f25a1165fe1272d3922ed479b5203a9d52dcac93cdccbee604b33b78fc151a7f572b26728ba5533ba4b4abbc0ff2cc523ac0cce4133f0c24e9
+  metadata.gz: 299c28c8d5c04276658b6ee9fb90490d22e614e8fb4326ad4feb1789d365cc7282231062d50e5108b0843cb74b51a588dc3409bf2d57edcbc0f1a2f9adc2ecf1
+  data.tar.gz: 667d4b2cce0d79fb170b0c0696a3261a42d8bc9115440bdf9230df8abb62d5a1318ed9d2caeb6d5aafaa1681860182bcd64bec79d361adbe1eb2932af9c7fe68

data/app/javascript/helios/videos/controllers/video_block_controller.js

@@ -1,9 +1,59 @@
 import { Controller } from "@hotwired/stimulus"
 
-// Manages inline name editing for video blocks
+// Manages inline name editing and auto-polling for video blocks
 export default class extends Controller {
   static values = {
-    videoId: Number
+    videoId: Number,
+    ready: Boolean,
+    statusUrl: String
+  }
+
+  static targets = ["player"]
+
+  connect() {
+    if (!this.readyValue && this.statusUrlValue) {
+      this.startPolling()
+    }
+  }
+
+  disconnect() {
+    this.stopPolling()
+  }
+
+  startPolling() {
+    this.pollTimer = setInterval(() => this.checkStatus(), 5000)
+  }
+
+  stopPolling() {
+    if (this.pollTimer) {
+      clearInterval(this.pollTimer)
+      this.pollTimer = null
+    }
+  }
+
+  async checkStatus() {
+    try {
+      const response = await fetch(this.statusUrlValue, {
+        headers: {
+          'Accept': 'application/json',
+          'X-CSRF-Token': document.querySelector('[name="csrf-token"]').content
+        }
+      })
+
+      if (!response.ok) return
+
+      const data = await response.json()
+
+      if (data.ready && data.player_html) {
+        this.stopPolling()
+        this.readyValue = true
+        if (this.hasPlayerTarget) {
+          this.playerTarget.innerHTML = data.player_html
+        }
+      }
+    } catch (e) {
+      // Silently retry on next interval
+    }
   }
 
   editName(event) {
@@ -19,7 +69,7 @@ export default class extends Controller {
     const input = event.currentTarget
     const name = input.value
 
-    fetch(`/helios_videos/admin/videos/${this.videoIdValue}`, {
+    fetch(this.statusUrlValue, {
       method: 'PATCH',
       headers: {
         'Content-Type': 'application/json',

data/app/jobs/helios/videos/migration/convert_video_job.rb

@@ -16,7 +16,9 @@ module Helios
         # @param video_id [Integer]
         # @param from [String] source provider
         # @param to [String] destination provider
-        def perform(video_id:, from:, to:)
+        # @param use_original [Boolean] if true, use the original S3 file instead
+        #   of downloading from the source provider
+        def perform(video_id:, from:, to:, use_original: false)
           video = Helios::Videos.video_class.find(video_id)
 
           unless video.provider == from
@@ -27,10 +29,21 @@ module Helios
           source_processor = Helios::Videos.processor_for(from.to_sym)
           dest_processor = Helios::Videos.processor_for(to.to_sym)
 
-          # Get download URL from source
-          source_url = source_processor.download_url(video, expiration: 12.hours)
+          # Get source URL — either from the original S3 upload or from the current provider
+          if use_original
+            unless video.video_file.attached?
+              Rails.logger.error("[helios-videos] Migration: video #{video_id} has no original file attached, falling back to provider download")
+              source_url = source_processor.download_url(video, expiration: 12.hours)
+            else
+              source_url = video.video_file.url
+              Rails.logger.info("[helios-videos] Migration: using original S3 file for video #{video_id}")
+            end
+          else
+            source_url = source_processor.download_url(video, expiration: 12.hours)
+          end
+
           unless source_url.present?
-            Rails.logger.error("[helios-videos] Migration: could not get download URL for video #{video_id} from #{from}")
+            Rails.logger.error("[helios-videos] Migration: could not get download URL for video #{video_id}")
             return
           end
 

data/app/jobs/helios/videos/migration/migrate_videos_job.rb

@@ -10,17 +10,21 @@ module Helios
         # @param from [String] source provider ("cloudflare" or "mux")
         # @param to [String] destination provider ("cloudflare" or "mux")
         # @param batch_size [Integer] how many to enqueue per run (default: all)
-        def perform(from:, to:, batch_size: nil)
+        # @param use_original [Boolean] if true, ingest from the original S3 file
+        #   (via ActiveStorage) instead of downloading from the source provider.
+        #   Useful if you want higher quality unprocessed source files. Requires
+        #   that the original uploads still exist in your storage bucket.
+        def perform(from:, to:, batch_size: nil, use_original: false)
           video_class = Helios::Videos.video_class
 
           videos = video_class.where(provider: from).where.not(key: [nil, ""])
           videos = videos.limit(batch_size) if batch_size.present?
 
           total = videos.count
-          Rails.logger.info("[helios-videos] Migration: enqueuing #{total} videos from #{from} -> #{to}")
+          Rails.logger.info("[helios-videos] Migration: enqueuing #{total} videos from #{from} -> #{to} (use_original: #{use_original})")
 
           videos.find_each do |video|
-            ConvertVideoJob.perform_later(video_id: video.id, from: from, to: to)
+            ConvertVideoJob.perform_later(video_id: video.id, from: from, to: to, use_original: use_original)
           end
 
           Rails.logger.info("[helios-videos] Migration: all #{total} conversion jobs enqueued")

data/lib/helios/videos/version.rb

@@ -1,5 +1,5 @@
 module Helios
   module Videos
-    VERSION = "0.2"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: helios-videos
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt