hlspider 0.5.0 → 0.6.0

data/lib/hlspider/playlist.rb

@@ -166,14 +166,14 @@ module HLSpider
         @variable_playlist = true 
 
         @file.each_line do |line|
-          @playlists << line[/([^ "]+.m3u8)/].strip if has_playlist?(line)
+          @playlists << line[/([^ "]+.m3u8[^ "]*)/].strip if has_playlist?(line)
         end  
       elsif has_segment?(@file) && !has_playlist?(@file)
         @segment_playlist  = true
 
         @file.each_line do |line|         
           if has_segment?(line)
-            @segments << filename(line.strip)
+            @segments << line[/([^ "]+.(ts|aac)[^ "]*)/].strip
           elsif duration_line?(line)
             @target_duration = parse_duration(line.strip)
           elsif media_sequence_line?(line)

data/lib/hlspider/playlist_line.rb

@@ -15,7 +15,7 @@ module HLSpider
     #
     # Returns Boolean.
     def has_segment?(str)
-      !!( str[/.*.ts(\z|\?|$)/] )
+      !!( str[/.*.(ts|aac)(\z|\?|$)/] )
     end
 
     # Internal: Checks if String str contains links to .m3u8 file extensions.
@@ -73,23 +73,6 @@ module HLSpider
       end  
     end
     
-    # Internal: Parses String video segment filename out of String str.
-    #
-    # str - String to be parsed
-    #    
-    # Examples
-    #
-    #   filename("/media/video_01.ts?query_string=22")
-    #   #=> 'video_01.ts'
-    #
-    #   filename("arandomsring")
-    #   #=> nil
-    #
-    # Returns String or nil.
-    def filename(str)
-     str.slice(/\w{1,}(.ts)/)
-    end
-
     # Internal: Parses string and returns whether or not it is an absolute url.
     #
     # str - String to be parsed
@@ -142,4 +125,4 @@ module HLSpider
       end    
     end   
   end
-end
+end

data/lib/hlspider/version.rb

@@ -1,3 +1,3 @@
 module HLSpider
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/spec/hlspider/playlist_line_spec.rb

@@ -49,12 +49,6 @@ describe HLSpider::PlaylistLine do
     end   
   end 
   
-  describe "#filename" do
-    it "returns String with filename on String with filename" do
-      PlaylistLine.filename(@segment_line).must_equal("video_123123023030.ts")
-    end  
-  end
-  
   describe "#absolute_url?" do
     it "returns true for full url" do
       PlaylistLine.absolute_url?("http://www.google.com/gmail/").must_equal(true)
@@ -85,4 +79,3 @@ describe HLSpider::PlaylistLine do
     end  
   end        
 end
-  

data/spec/hlspider/playlist_spec.rb

@@ -30,6 +30,33 @@ web.m3u8
 #EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=401437,CODECS="mp4a.40.2,avc1.4d401e",AUDIO="aac"
 iphone.m3u8
     }
+
+    @querystring_playlist = %q{#EXTM3U
+#EXT-X-VERSION:3
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=500000
+chunklist-b500000.m3u8?wowzasessionid=2030032484
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=1000000
+chunklist-b1000000.m3u8?wowzasessionid=2030032484
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=1400000
+chunklist-b1400000.m3u8?wowzasessionid=2030032484
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=96000
+chunklist-b96000.m3u8?wowzasessionid=2030032484&wowzaaudioonly
+    }
+
+    @audioonly_playlist = %q{#EXTM3U
+#EXT-X-VERSION:3
+#EXT-X-ALLOW-CACHE:NO
+#EXT-X-TARGETDURATION:11
+#EXT-X-MEDIA-SEQUENCE:35
+#EXTINF:9.0,
+media-b96000_35.aac?wowzasessionid=1332469433&wowzaaudioonly
+#EXTINF:9.0,
+media-b96000_36.aac?wowzasessionid=1332469433&wowzaaudioonly
+#EXTINF:9.0,
+media-b96000_37.aac?wowzasessionid=1332469433&wowzaaudioonly
+#EXTINF:9.0,
+media-b96000_38.aac?wowzasessionid=1332469433&wowzaaudioonly
+    }
   end
 
   it "should identify if it is a segments playlist" do
@@ -68,4 +95,24 @@ iphone.m3u8
     "http://host.com/main/iphone.m3u8"
     ])
   end
+
+  it "should accept urls with querystings on playlists" do
+    playlist = HLSpider::Playlist.new(@querystring_playlist, "http://host.com/main/playlist.m3u8")
+    playlist.playlists.must_equal([
+    "http://host.com/main/chunklist-b500000.m3u8?wowzasessionid=2030032484",
+    "http://host.com/main/chunklist-b1000000.m3u8?wowzasessionid=2030032484",
+    "http://host.com/main/chunklist-b1400000.m3u8?wowzasessionid=2030032484",
+    "http://host.com/main/chunklist-b96000.m3u8?wowzasessionid=2030032484&wowzaaudioonly"
+    ])
+  end
+
+  it "should accept audio only segments" do
+    playlist = HLSpider::Playlist.new(@audioonly_playlist, "http://host.com/main/playlist.m3u8")
+    playlist.segments.must_equal([
+    "media-b96000_35.aac?wowzasessionid=1332469433&wowzaaudioonly",
+    "media-b96000_36.aac?wowzasessionid=1332469433&wowzaaudioonly",
+    "media-b96000_37.aac?wowzasessionid=1332469433&wowzaaudioonly",
+    "media-b96000_38.aac?wowzasessionid=1332469433&wowzaaudioonly"
+    ])
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hlspider
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - brookemckim
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-09 00:00:00 Z
+date: 2013-06-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest