m3u8 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 692b6b95751961d33c5a99b902815343faa94ef8
-  data.tar.gz: 5e9fe6ceb3d9f9d3210880e5df34ab0c44082cea
+  metadata.gz: b4e584f9677b6f81c20f52ee7829611fb1586139
+  data.tar.gz: 33f822204530d6af5339426a4d986b5edf21ed2c
 SHA512:
-  metadata.gz: 9cbc51a229e659aa49f09794c5825eca8be24e47462e0bfc74484391640bc4d1e497b139a0e8c475a4880b572d723fe9cef0638e702a18b0a1ef69f8ef4d5546
-  data.tar.gz: bbff2a3695684af2113554fec5bc8b6b55535c1d188fd22ab7faf9374a6c88319f3f7d7b4660e9ca44c722e8e85f3949d8b1d78cd8cef62c2bbc39737ca8ec44
+  metadata.gz: 330864a27a4338191fa141e861f4bb1a7e88984af9f0a4a70e647157be5c43c75cad442d6e76c0b7743004f82769e9bcabc453c47b2ba49184aa2e7d3e23f243
+  data.tar.gz: bf442b7d7e652a5a2e7935a4b1f9d8d2ec455f9ae87c4e21d8329b4dd6ec36770d0e3ffe0d1e29b723bf72633569291baf2397b574295f53635fdd2b8ac3eb57

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+#### 0.6.8 (4/12/2016) - Merged pull request #16 from [ghn](https://github.com/ghn). Fixes issue #12 to support parsing #EXT-X-PROGRAM-DATE-TIME correctly in media segments.
+
 #### 0.6.7 (4/8/2016) - Merged pull request #15 from [jviney](https://github.com/jviney). Fix: Always render the duration as a decimal integer.
 
 #### 0.6.6 (3/30/2016) - Merged pull request #14 from [raphi](https://github.com/raphi). Adds support for non-standard name attribute on #EXT-X-STREAM-INF tags.

data/lib/m3u8/reader.rb

@@ -152,8 +152,12 @@ module M3u8
     end
 
     def parse_time(line)
-      self.open = false
-      playlist.items << M3u8::TimeItem.parse(line)
+      if open
+        item.program_date_time = M3u8::TimeItem.parse(line)
+      else
+        self.open = false
+        playlist.items << M3u8::TimeItem.parse(line)
+      end
     end
 
     def parse_next_line(line)

data/lib/m3u8/segment_item.rb

@@ -3,14 +3,15 @@ module M3u8
   # optionally allowing an EXT-X-BYTERANGE tag to be set.
   class SegmentItem
     include M3u8
-    attr_accessor :duration, :segment, :comment, :byterange
+    attr_accessor :duration, :segment, :comment, :program_date_time, :byterange
 
     def initialize(params = {})
       intialize_with_byterange(params)
     end
 
     def to_s
-      "#EXTINF:#{duration},#{comment}#{byterange_format}\n#{segment}"
+      date = "#{program_date_time}\n" unless program_date_time.nil?
+      "#EXTINF:#{duration},#{comment}#{byterange_format}\n#{date}#{segment}"
     end
 
     private

data/lib/m3u8/version.rb

@@ -1,4 +1,4 @@
 # M3u8 provides parsing, generation, and validation of m3u8 playlists
 module M3u8
-  VERSION = '0.6.7'
+  VERSION = '0.6.8'
 end

data/spec/fixtures/timestamp_playlist.m3u8

@@ -0,0 +1,22 @@
+#EXTM3U
+#EXT-X-VERSION:2
+#EXT-X-TARGETDURATION:10
+#EXT-X-MEDIA-SEQUENCE:1736515
+#EXTINF:10, no desc
+#EXT-X-PROGRAM-DATE-TIME:2016-04-11T15:24:31Z
+20160408T084506-01-1736515.ts
+#EXTINF:10, no desc
+#EXT-X-PROGRAM-DATE-TIME:2016-04-11T15:24:41Z
+20160408T084506-01-1736516.ts
+#EXTINF:10, no desc
+#EXT-X-PROGRAM-DATE-TIME:2016-04-11T15:24:51Z
+20160408T084506-01-1736517.ts
+#EXTINF:10, no desc
+#EXT-X-PROGRAM-DATE-TIME:2016-04-11T15:25:01Z
+20160408T084506-01-1736518.ts
+#EXTINF:10, no desc
+#EXT-X-PROGRAM-DATE-TIME:2016-04-11T15:25:11Z
+20160408T084506-01-1736519.ts
+#EXTINF:10, no desc
+#EXT-X-PROGRAM-DATE-TIME:2016-04-11T15:25:21Z
+20160408T084506-01-1736520.ts

data/spec/lib/m3u8/reader_spec.rb

@@ -221,4 +221,15 @@ describe M3u8::Reader do
     expect(item.byterange.length).to eq 4500
     expect(item.byterange.start).to eq 600
   end
+
+  it 'should read segment with timestamp' do
+    file = File.open 'spec/fixtures/timestamp_playlist.m3u8'
+    reader = M3u8::Reader.new
+    playlist = reader.read file
+    expect(playlist.items.count).to eq 6
+
+    item_date_time = playlist.items.first.program_date_time
+    expect(item_date_time).to be_a M3u8::TimeItem
+    expect(item_date_time.time).to eq Time.iso8601('2016-04-11T15:24:31Z')
+  end
 end

data/spec/lib/m3u8/segment_item_spec.rb

@@ -8,6 +8,7 @@ describe M3u8::SegmentItem do
     expect(item.segment).to eq 'test.ts'
     expect(item.comment).to be_nil
     expect(item.byterange).to be_nil
+    expect(item.program_date_time).to be_nil
 
     hash = { duration: 10.991, segment: 'test.ts', comment: 'anything',
              byterange: {
@@ -24,10 +25,15 @@ describe M3u8::SegmentItem do
   end
 
   it 'should provide m3u8 format representation' do
-    hash = { duration: 10.991, segment: 'test.ts' }
+    time_hash = { time: '2010-02-19T14:54:23.031' }
+    time_item = M3u8::TimeItem.new(time_hash)
+
+    hash = { duration: 10.991, segment: 'test.ts',
+             program_date_time: time_item }
     item = M3u8::SegmentItem.new(hash)
     output = item.to_s
-    expected = "#EXTINF:10.991,\ntest.ts"
+    date_time_output = item.program_date_time.to_s
+    expected = "#EXTINF:10.991,\n#{date_time_output}\ntest.ts"
     expect(output).to eq expected
 
     hash = { duration: 10.991, segment: 'test.ts', comment: 'anything' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: m3u8
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - Seth Deckard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -153,6 +153,7 @@ files:
 - spec/fixtures/playlist.m3u8
 - spec/fixtures/playlist_with_comments.m3u8
 - spec/fixtures/session_data.m3u8
+- spec/fixtures/timestamp_playlist.m3u8
 - spec/fixtures/variant_angles.m3u8
 - spec/fixtures/variant_audio.m3u8
 - spec/lib/m3u8/byte_range_spec.rb
@@ -203,6 +204,7 @@ test_files:
 - spec/fixtures/playlist.m3u8
 - spec/fixtures/playlist_with_comments.m3u8
 - spec/fixtures/session_data.m3u8
+- spec/fixtures/timestamp_playlist.m3u8
 - spec/fixtures/variant_angles.m3u8
 - spec/fixtures/variant_audio.m3u8
 - spec/lib/m3u8/byte_range_spec.rb