m3uzi 0.4.3 → 0.5.0

data/lib/m3uzi.rb

@@ -9,14 +9,18 @@ require 'm3uzi/version'
 class M3Uzi
 
   attr_accessor :header_tags, :playlist_items
-  attr_accessor :final_media_file
-  attr_accessor :version
+  attr_accessor :playlist_type, :final_media_file
+  attr_accessor :version, :initial_media_sequence, :sliding_window_duration
 
   def initialize
     @header_tags = {}
     @playlist_items = []
     @final_media_file = true
     @version = 1
+    @initial_media_sequence = 0
+    @sliding_window_duration = nil
+    @removed_file_count = 0
+    @playlist_type = :live
   end
 
 
@@ -74,6 +78,8 @@ class M3Uzi
     check_version_restrictions
     io_stream << "#EXTM3U\n"
     io_stream << "#EXT-X-VERSION:#{@version.to_i}\n" if @version > 1
+    io_stream << "#EXT-X-MEDIA-SEQUENCE:#{@initial_media_sequence+@removed_file_count}\n" if @playlist_type == :live
+    io_stream << "#EXT-X-PLAYLIST-TYPE:#{@playlist_type.to_s.upcase}\n" if [:event,:vod].include?(@playlist_type)
 
     if items(File).length > 0
       max_duration = valid_items(File).map { |f| f.duration.to_f }.max || 10.0
@@ -98,7 +104,7 @@ class M3Uzi
       io_stream << (item.format + "\n")
     end
 
-    io_stream << "#EXT-X-ENDLIST\n" if items(File).length > 0 && @final_media_file
+    io_stream << "#EXT-X-ENDLIST\n" if items(File).length > 0 && (@final_media_file || @playlist_type == :vod)
   end
 
   def write(path)
@@ -192,6 +198,7 @@ class M3Uzi
     new_file.duration = duration if duration
     yield(new_file) if block_given?
     @playlist_items << new_file
+    cleanup_sliding_window
   end
 
   def filenames
@@ -323,6 +330,19 @@ protected
   #   match.scan(/([A-Z-]+)\s*=\s*("[^"]*"|[^,]*)/) # return attributes as array of arrays
   # end
 
+  def cleanup_sliding_window
+    return unless @sliding_window_duration && @playlist_type == :live
+    while total_duration > @sliding_window_duration
+      first_file = @playlist_items.detect { |item| item.kind_of?(File) && item.valid? }
+      @playlist_items.delete(first_file)
+      @removed_file_count += 1
+    end
+  end
+
+  def total_duration
+    valid_items(File).inject(0.0) { |d,f| d + f.duration.to_f }
+  end
+
   def self.format_iv(num)
     '0x' + num.to_s(16).rjust(32,'0')
   end

data/lib/m3uzi/tag.rb

@@ -4,10 +4,10 @@ class M3Uzi
     attr_reader :name
     attr_accessor :value
 
-    VALID_TAGS = %w{PLAYLIST-TYPE ALLOW-CACHE}
+    VALID_TAGS = %w{ALLOW-CACHE}
 
-    # Unsupported tags: MEDIA-SEQUENCE, I-FRAMES-ONLY, PLAYLIST-TYPE
-    # Autogenerated tags: EXTM3U, VERSION, ENDLIST, BYTERANGE, TARGETDURATION
+    # Unsupported tags: I-FRAMES-ONLY
+    # Autogenerated tags: EXTM3U, VERSION, ENDLIST, BYTERANGE, TARGETDURATION, MEDIA-SEQUENCE, PLAYLIST-TYPE
 
     def name=(n)
       @name = n.to_s.upcase.gsub("_", "-")
@@ -21,8 +21,6 @@ class M3Uzi
 
     def valid?
       case name
-      when 'PLAYLIST-TYPE'
-        ['EVENT','VOD'].include?(value)
       when 'ALLOW-CACHE'
         ['YES','NO'].include?(value)
       else

data/lib/m3uzi/version.rb

@@ -1,3 +1,3 @@
 class M3Uzi
-  VERSION = '0.4.3'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: m3uzi
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 3
-  version: 0.4.3
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Brandon Arbini
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-14 00:00:00 -08:00
-default_executable: 
+date: 2012-02-23 00:00:00 Z
 dependencies: []
 
 description: Read and write M3U files with (relative) ease.
@@ -44,7 +43,6 @@ files:
 - LICENSE
 - Rakefile
 - README.md
-has_rdoc: true
 homepage: http://github.com/zencoder/m3uzi
 licenses: []
 
@@ -74,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.9.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Read and write M3U files with (relative) ease.