playlist 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0abdf1a10cd890a9d446a6617ed5bf12856dba0
-  data.tar.gz: 0719e57569fed6a8798e58db21eb50dd6c7dfc34
+  metadata.gz: bc3a6497a40653031438f4692659e4f1136e2a29
+  data.tar.gz: 88e19ff093d5b1eba7569f011f02e2707751daae
 SHA512:
-  metadata.gz: 44aa5aff176b61c1ad739765882e4c7a7dde57f828a9f4eee95bf19112362d8bcb4b55fe24145e0b435e48f56746ff6bba83086bf810862ffe584f253821cbdc
-  data.tar.gz: e71116d7a8906db2cea15f117a4de683945e47b7fb285a36c8043635491c94979653be85adb0b90e4fd947d7fe6626baf4823fd128e32a58414a22ee78836c6b
+  metadata.gz: 7d7baa63b8aed79765ffac6280baa708eb65b5afccc30b40590b7f6383d91bddd1a5d0a9d80c57916c9f05ffc856d5203557cce99953b525e65a025ed2df6593
+  data.tar.gz: 09dfeed3a840b1c3aa8a1e8fb98dd85a3ec1a6175755f18c6dc3e4c2a9a29dcbc1e39d0bdcf58593b3e85d9f8f295dd44e16852b1c15f81632e5ff818ebb6e00

data/lib/playlist.rb

@@ -40,6 +40,7 @@ class Playlist
   # @param attr [Hash] a hash of attibute values to set
   def initialize(attr = {})
     @tracks = []
+    @identifiers = {}
     attr.each_pair do |key, value|
       send("#{key}=", value)
     end
@@ -54,7 +55,7 @@ class Playlist
     @tracks << (args.is_a?(Track) ? args : Track.new(args))
   end
 
-  # Get the total duration of this playlist
+  # Get the total duration of this playlist in milliseconds
   # If any tracks on the playlist don't have a duation, then they are ignored
   # @return [Integer, Float]
   def duration

data/lib/playlist/format/cue.rb

@@ -11,9 +11,9 @@ module Playlist::Format::Cue
         input.each_line do |line|
           if line =~ /^\s*REM\s/
             next
-          elsif line =~ /^\s*TRACK (\d+) AUDIO/
+          elsif (matches = line.match(/^\s*TRACK (\d+) AUDIO/))
             track = Playlist::Track.new(
-              :track_number => Regexp.last_match(1).to_i
+              :track_number => matches[1].to_i
             )
             playlist.add_track(track)
           elsif !track.nil?
@@ -44,24 +44,24 @@ module Playlist::Format::Cue
     protected
 
     def parse_track_line(track, line)
-      if line =~ /^\s*TITLE \"?(.+?)\"?$/
-        track.title = Regexp.last_match(1)
-      elsif line =~ /^\s*PERFORMER \"?(.+?)\"?$/
-        track.performer = Regexp.last_match(1)
-      elsif line =~ /^\s*ISRC \"?(\w+?)\"?$/
-        track.isrc = Regexp.last_match(1)
-      elsif line =~ /^\s*INDEX /
-        track.start_time = parse_time(line)
+      if (matches = line.match(/^\s*TITLE \"?(.+?)\"?$/))
+        track.title = matches[1]
+      elsif (matches = line.match(/^\s*PERFORMER \"?(.+?)\"?$/))
+        track.performer = matches[1]
+      elsif (matches = line.match(/^\s*ISRC \"?(\w+?)\"?$/))
+        track.isrc = matches[1]
+      elsif (matches = line.match(/^\s*INDEX (.+)$/))
+        track.start_time = parse_time(matches[1])
       else
         warn "Unknown command: #{line}"
       end
     end
 
     def parse_playlist_line(playlist, line)
-      if line =~ /^\s*TITLE \"?(.+?)\"?$/
-        playlist.title = Regexp.last_match(1)
-      elsif line =~ /^\s*FILE \"?(.+?)\" (\w+)?$/
-        playlist.media_location = Regexp.last_match(1)
+      if (matches = line.match(/^\s*TITLE \"?(.+?)\"?$/))
+        playlist.title = matches[1]
+      elsif (matches = line.match(/^\s*FILE \"?(.+?)\" (\w+)?$/))
+        playlist.media_location = matches[1]
       end
     end
 
@@ -90,18 +90,19 @@ module Playlist::Format::Cue
     end
 
     def parse_time(timestamp)
-      if timestamp =~ /INDEX (\d+) (\d+):(\d+):(\d+)/
-        if Regexp.last_match(1).to_i == 1
-          mins = Regexp.last_match(2).to_f
-          secs = Regexp.last_match(3).to_f
-          frames = Regexp.last_match(4).to_f
-          (mins * 60) + secs + (frames / 75)
+      if (matches = timestamp.match(/(\d+) (\d+):(\d+):(\d+)/))
+        if matches[1].to_i == 1
+          mins = matches[2].to_i
+          secs = matches[3].to_i
+          frames = matches[4].to_i
+          (mins * 60_000) + (secs * 1000) + (frames * (75 / 1000))
         end
       end
     end
 
     def format_time(duration)
       duration = 0 if duration.nil?
+      duration = duration.to_f / 1000
       mins = (duration / 60).floor
       secs = (duration % 60).floor
       frames = ((duration - duration.floor) * 75).round

data/lib/playlist/format/m3u.rb

@@ -9,10 +9,10 @@ module Playlist::Format::M3U
       Playlist.new do |playlist|
         track = Playlist::Track.new
         input.each_line do |line|
-          if line =~ /^#EXTINF:(-?\d+),\s*(.+?)\s*-\s*(.+?)\s*$/
-            track.duration = Regexp.last_match(1)
-            track.creator = Regexp.last_match(2)
-            track.title = Regexp.last_match(3)
+          if (matches = line.match(/^#EXTINF:(-?\d+),\s*(.+?)\s*-\s*(.+?)\s*$/))
+            track.duration = matches[1].to_i * 1000
+            track.creator = matches[2]
+            track.title = matches[3]
           else
             if line =~ /^[^#]\S+.+\s*$/
               track.location = line.strip
@@ -30,7 +30,8 @@ module Playlist::Format::M3U
     def generate(playlist)
       text = "#EXTM3U\n"
       playlist.tracks.each do |t|
-        text += "#EXTINF:#{t.duration.to_i},#{t.artist} - #{t.title}\n"
+        duration = (t.duration / 1000).round
+        text += "#EXTINF:#{duration},#{t.artist} - #{t.title}\n"
         text += "#{t.location}\n"
       end
       text

data/lib/playlist/format/simple_text.rb

@@ -20,11 +20,14 @@ module Playlist::Format::SimpleText
     # @param line [String] any object that responds to #each_line
     # @return [Track] a new Track object
     def parse_line(line)
-      if line =~ /^(\d{1,2}[:.]\d{1,2}([:.]\d{1,2})?)?\s*(.+?) - (.+?)$/
+      matches = line.match(
+        /^(\d{1,2}[:.]\d{1,2}([:.]\d{1,2})?)?\s*(.+?) - (.+?)$/
+      )
+      unless matches.nil?
         Playlist::Track.new(
-          :start_time => Regexp.last_match(1),
-          :creator => Regexp.last_match(3).strip,
-          :title => Regexp.last_match(4).strip
+          :start_time => matches[1],
+          :creator => matches[3].strip,
+          :title => matches[4].strip
         )
       end
     end

data/lib/playlist/format/xspf.rb

@@ -43,7 +43,7 @@ module Playlist::Format::XSPF
         track.title = doc.content_at('./xmlns:title')
         track.location = doc.content_at('./xmlns:location')
         if (duration = doc.content_at('./xmlns:duration'))
-          track.duration = duration.to_f / 1000
+          track.duration = duration.to_i
         end
       end
     end
@@ -53,7 +53,7 @@ module Playlist::Format::XSPF
         xml.location(track.location) unless track.location.nil?
         xml.title(track.title) unless track.title.nil?
         xml.creator(track.creator) unless track.creator.nil?
-        xml.duration((track.duration * 1000).to_i) unless track.duration.nil?
+        xml.duration(track.duration) unless track.duration.nil?
       end
     end
   end

data/lib/playlist/track.rb

@@ -32,13 +32,13 @@ class Playlist::Track
   # @return [String]
   attr_accessor :publisher
 
-  # The time a track starts playing at, in seconds.
-  # May be a Float to include fractions of a second.
+  # The time a track starts playing at, in milliseconds
+  # May be a Float to include fractions of a millisecond.
   # @return [Integer, Float]
   attr_accessor :start_time
 
-  # The duration of the track in seconds.
-  # May be a Float to include fractions of a second.
+  # The duration of the track in milliseconds
+  # May be a Float to include fractions of a millisecond.
   # @return [Integer, Float]
   attr_reader :duration
 
@@ -132,16 +132,16 @@ class Playlist::Track
 
   # Set the duration of the track
   # If the duration is 0 or -1, then the duration is set to nil
-  # @param seconds [Numeric] the duration of the track in seconds
-  def duration=(seconds)
-    if seconds.is_a?(Numeric)
-      @duration = seconds
+  # @param milliseconds [Numeric] the duration of the track in seconds
+  def duration=(milliseconds)
+    if milliseconds.is_a?(Numeric)
+      @duration = milliseconds
     else
-      seconds = seconds.to_s
-      @duration = if seconds =~ /\./
-                    seconds.to_f
+      milliseconds = milliseconds.to_s
+      @duration = if milliseconds =~ /\./
+                    milliseconds.to_f
                   else
-                    seconds.to_i
+                    milliseconds.to_i
                   end
     end
     @duration = nil if [0, -1].include?(@duration)

data/lib/playlist/version.rb

@@ -1,4 +1,4 @@
 class Playlist
   # The version number of the Playlist Ruby gem
-  VERSION = '0.2.0'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: playlist
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Nicholas Humfrey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2018-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri