vidload 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4517bef7a27856859c3259c01245ac3304490d7abe9ebf6297bb0138b730ab91
-  data.tar.gz: 20aaddca48db238d263c60afecd990b14017f3595cce15a163e0157a03c2fb53
+  metadata.gz: 3416ba597c831a7d6e1460bc0447fee8577e758279e036e820ccd967d93d46ef
+  data.tar.gz: a6d4c4c9e5bc8447cf68335029d60ca156c98ef6fc7bacd066b2335ca0e6966b
 SHA512:
-  metadata.gz: eaa42d64362b16ea42006bc1e245bd425c00025f3e626d11c848319884f500148f33ffab790bb2df4585fff331e6f476f3940dda2b9c9e77e7cfdda0e105777c
-  data.tar.gz: 784c87e22bbb5340608c305e31b928650361fa228bf7788d551ea0065f3c1015b0294dba755503d563a12778a46f8eddfc7b3056060817ae57cd38ba374cd9bf
+  metadata.gz: '0891fcda0f3d59ea64ce309f35fea44456185bf0c6d56765e3c6d6ca60160819d19428e2b065e55c5c14efd3a7ef5dffa712ae02861e4e098c2d6e8bb8fdef75'
+  data.tar.gz: d5406c2f3e81b23038402e9f249c2359a96dc89edeba437e8274a2c4ada88bf6f1207373ab3205a2c9604bcc88bf0af8d8443e2f483cf93647c5934d780df466

data/lib/vidload/mp2t/api.rb

@@ -1,10 +1,17 @@
 require "playwright"
 require "thread"
 require "tty-spinner"
+require "open3"
+require "m3u8"
+require "io/console"
 
 module Vidload::Mp2t::Api
   DEMUXER_PATH = "#{__dir__}/remuxer.sh"
   VIDEO_DOWNLOADED_EVENT_QUEUE = Queue.new
+  VIDEO_INDEX_EVENT_QUEUE = Queue.new
+  ANSI_BOLD_WHITE="\033[1;97m"
+  ANSI_LIGHT_GREY="\033[37m"
+  ANSI_RESET="\033[0m"
 
   class Downloader
     attr_reader :video_url, :video_name, :hls_url, :master_playlist_name, :playwright_cli_path, :video_referer
@@ -15,21 +22,29 @@ module Vidload::Mp2t::Api
       hls_url:,
       master_playlist_name:,
       playwright_cli_path:,
-      video_referer:
+      video_referer:,
+      ts_seg_pattern:,
+      hls_index_pattern:,
+      author_name:
     )
       raise ArgumentError, "video_url must be provided" unless video_url
-      raise ArgumentError, "video_name must be provided" unless video_name
       raise ArgumentError, "hls_url must be provided" unless hls_url
       raise ArgumentError, "master_playlist_name must be provided" unless master_playlist_name
       raise ArgumentError, "playwright_cli_path must be provided" unless playwright_cli_path
       raise ArgumentError, "video_referer must be provided" unless video_referer
+      raise ArgumentError, "ts_seg_pattern must be provided" unless ts_seg_pattern
+      raise ArgumentError, "hls_index_pattern must be provided" unless hls_index_pattern
 
       @video_url = video_url
-      @video_name = video_name
       @hls_url = hls_url
       @master_playlist_name = master_playlist_name
       @playwright_cli_path = playwright_cli_path
       @video_referer = video_referer
+      @ts_seg_pattern = ts_seg_pattern
+      @hls_index_pattern = hls_index_pattern
+      @max_lines = IO.console.winsize[0]
+      @author_name = author_name
+      @video_name = if @author_name then "#{@author_name}_#{video_name}" else nil end
     end
 
     def self.from_argv
@@ -39,7 +54,10 @@ module Vidload::Mp2t::Api
         hls_url: ARGV[2],
         master_playlist_name: ARGV[3],
         playwright_cli_path: ARGV[4],
-        video_referer: ARGV[5]
+        video_referer: ARGV[5],
+        ts_seg_pattern: ARGV[6],
+        hls_index_pattern: ARGV[7],
+        author_name: ARGV[8],
       )
     end
 
@@ -66,6 +84,9 @@ module Vidload::Mp2t::Api
       puts "\tmaster_playlist_name=#{@master_playlist_name}"
       puts "\tplaywright_cli_path=#{@playwright_cli_path}"
       puts "\tvideo_referer=#{@video_referer}"
+      puts "\tts_seg_pattern=#{@ts_seg_pattern}"
+      puts "\thls_index_pattern=#{@hls_index_pattern}"
+      puts "\tauthor_name=#{@author_name}"
     end
 
     def self.display_with_spinner(loading_msg = "Loading...")
@@ -78,10 +99,20 @@ module Vidload::Mp2t::Api
     private
 
     def manage_video_download(page, *video_starter_callbacks)
-      page.on("request", -> (req) { listen_to_video_starts(req) })
+      @seg_qty = nil
+      @pending_hls_response = nil
+      @lines = [""] * @max_lines
+      page.on("response", -> (resp) { listen_to_video_starts(resp) })
       navigate_to_url(@video_url, page)
       video_starter_callbacks.each do |callback|
-        callback.call(page)
+        res = callback.call(page)
+        if !@video_name && res[:video_name]
+          @video_name = res[:video_name]
+        end
+        if !@author_name && res[:author_name]
+          @author_name = res[:author_name]
+          @video_name = "#{@author_name}_#{@video_name}"
+        end
       end
     end
 
@@ -89,12 +120,37 @@ module Vidload::Mp2t::Api
       VIDEO_DOWNLOADED_EVENT_QUEUE.pop
     end
 
-    def listen_to_video_starts(request)
-      if request.url.start_with?(@hls_url) && request.url.include?(@master_playlist_name)
-        puts "Video starts. Starting download..."
-        system(DEMUXER_PATH, request.url, @video_name, @video_referer)
-        puts "✔ Video downloaded successfully! Available in ./#{@video_name}.mp4"
-        VIDEO_DOWNLOADED_EVENT_QUEUE << true
+    def trigger_video_download(video_url, seg_qty)
+      puts "Video starts. Starting download..."
+      run_cmd(DEMUXER_PATH, video_url, @video_name, @video_referer) do |line|
+        if (line.include?("hls @") || line.include?("https @")) && line.match?(/#{@ts_seg_pattern}/i)
+          seg_nb = line.match(/#{@ts_seg_pattern}/i)[:seg_nb]
+          add_line(line)
+          progress_bar(seg_nb, seg_qty)
+        end
+      end
+      print "\r\e[2K"
+      puts "✔ Video downloaded successfully! Available in ./#{@video_name}.mp4"
+      VIDEO_DOWNLOADED_EVENT_QUEUE << true
+    end
+
+    def listen_to_video_starts(response)
+      if response.url.start_with?(@hls_url) && response.url.match?(/#{@hls_index_pattern}/i)
+        body = response.text
+        playlist = M3u8::Playlist.read(body)
+        last_item = playlist.items.last.segment
+        match = last_item.match(/#{@ts_seg_pattern}/i)
+        @seg_qty = match[:seg_nb].to_i
+
+        if @pending_hls_response
+          trigger_video_download(@pending_hls_response.url, @seg_qty)
+        end
+      elsif response.url.start_with?(@hls_url) && response.url.include?(@master_playlist_name)
+        if @seg_qty
+          trigger_video_download(response.url, @seg_qty)
+        else
+          @pending_hls_response = response
+        end
       end
     end
 
@@ -103,5 +159,46 @@ module Vidload::Mp2t::Api
         page.goto(url)
       end
     end
+
+    def run_cmd(*cmd)
+      Open3.popen2e(*cmd) do |_stdin, stdout_and_stderr, wait_thr|
+        stdout_and_stderr.each_line do |line|
+          yield line
+        end
+      end
+    end
+
+    def redraw_lines()
+      return if @lines.empty?
+
+      printf "\e[H"
+      printf "\e[0J"
+
+      _rows, cols = IO.console.winsize
+      @lines.each do |line|
+        if line.length > cols
+          puts "#{line.slice(0, cols - 3)}..."
+        else
+          puts line
+        end
+      end
+    end
+
+    def add_line(line)
+      @lines << line
+      @lines.shift if @lines.size > @max_lines
+      redraw_lines()
+    end
+
+    def progress_bar(current, total, width: 40)
+      ratio = current.to_f / total
+      filled = (ratio * width).round
+      empty = width - filled
+
+      bar = "█" * filled + "░" * empty
+      percent = (ratio * 100).round(1)
+
+      print "\r[#{bar}] #{percent}% (#{current}/#{total})"
+    end
   end
 end

data/lib/vidload/version.rb

@@ -1,3 +1,3 @@
 module Vidload
-  VERSION = "0.1.8"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vidload
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - Patacode <pata.codegineer@gmail.com>
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-12 00:00:00.000000000 Z
+date: 2026-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: playwright-ruby-client
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: m3u8
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement