m3uzi 0.1.2 → 0.1.3

data/lib/m3uzi/file.rb

@@ -4,6 +4,12 @@ class M3Uzi
 
     attr_accessor :path, :duration, :description
 
+    def attribute_string
+      s = []
+      s << duration
+      s << description if description
+      s.join(',')
+    end
   end
 
 end

data/lib/m3uzi/stream.rb

@@ -2,8 +2,16 @@ class M3Uzi
 
   class Stream
 
-    attr_accessor :bandwidth, :program_id, :codecs, :resolution
+    attr_accessor :path, :bandwidth, :program_id, :codecs, :resolution
 
+    def attribute_string
+      s = []
+      s << "PROGRAM-ID=#{program_id || 1}"
+      s << "BANDWIDTH=#{bandwidth}" if bandwidth
+      s << "CODECS=\"#{codecs}\"" if codecs
+      s << "RESOLUTION=#{resolution}" if resolution
+      s.join(',')
+    end
   end
 
 end

data/lib/m3uzi/version.rb

@@ -1,3 +1,3 @@
 class M3Uzi
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/m3uzi.rb

@@ -6,16 +6,19 @@ require 'm3uzi/version'
 
 class M3Uzi
 
-  # Unsupported: KEY PROGRAM-DATE-TIME STREAM-INF DISCONTINUITY
-  VALID_TAGS = %w{TARGETDURATION MEDIA-SEQUENCE ALLOW-CACHE STREAM-INF ENDLIST VERSION}
+  # Unsupported: KEY PROGRAM-DATE-TIME DISCONTINUITY
+  VALID_TAGS = %w{TARGETDURATION MEDIA-SEQUENCE ALLOW-CACHE ENDLIST VERSION}
 
-  attr_accessor :files
+  attr_accessor :files, :streams
   attr_accessor :tags, :comments
+  attr_accessor :final_media_file
 
   def initialize
     @files = []
+    @streams = []
     @tags = []
     @comments = []
+    @final_media_file = true
   end
 
 
@@ -41,6 +44,20 @@ class M3Uzi
           file.duration = duration
           file.description = description
         end
+        m3u.final_media_file = false
+      when :stream
+        attributes = parse_stream_tag(line)
+        m3u.add_stream do |stream|
+          stream.path = lines[i+1].strip
+          attributes.each_pair do |k,v|
+            k = k.to_s.downcase.sub('-','_')
+            next unless [:bandwidth, :program_id, :codecs, :resolution].include?(k)
+            v = $1 if v.to_s =~ /^"(.*)"$/
+            stream.send("#{k}=", v)
+          end
+        end
+      when :final
+        m3u.final_media_file = true
       else
         next
       end
@@ -65,11 +82,14 @@ class M3Uzi
       f << "\n"
     end
     files.each do |file|
-      f << "#EXTINF:#{file.duration}"
-      file.description && f << ", #{file.description}"
+      f << "#EXTINF:#{file.attribute_string}"
       f << "\n#{file.path}\n"
     end
-    f << "#EXT-X-ENDLIST\n"
+    streams.each do |stream|
+      f << "#EXT-X-STREAM-INF:#{stream.attribute_string}"
+      f << "\n#{stream.path}\n"
+    end
+    f << "#EXT-X-ENDLIST\n" if files.length > 0 && final_media_file
     f.close()
   end
 
@@ -89,6 +109,21 @@ class M3Uzi
   end
 
 
+  #-------------------------------------
+  # Streams
+  #-------------------------------------
+
+  def add_stream(&block)
+    new_stream = M3Uzi::Stream.new
+    yield(new_stream)
+    @streams << new_stream
+  end
+
+  def stream_names
+    streams.map{|stream| stream.path }
+  end
+
+
   #-------------------------------------
   # Tags
   #-------------------------------------
@@ -136,6 +171,10 @@ protected
       :comment
     when /^#EXTINF/
       :info
+    when /^#EXT(-X)?-STREAM-INF/
+      :stream
+    when /^#EXT(-X)?-ENDLIST/
+      :final
     when /^#EXT(?!INF)/
       :tag
     else
@@ -153,8 +192,7 @@ protected
 
   def self.parse_stream_tag(line)
     match = line.match(/^#EXT-X-STREAM-INF:(.*)$/)[1]
-    attributes = match.split(/\s*,\s*/)
-    attributes.map{|a| a.split(/\s*=\s*/) }
+    match.scan(/([A-Z-]+)\s*=\s*("[^"]*"|[^,]*)/) # return attributes as array of arrays
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: m3uzi
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Brandon Arbini
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-27 00:00:00 -05:00
+date: 2010-12-30 00:00:00 -06:00
 default_executable: 
 dependencies: []