bookbinder 0.3.3 → 0.3.4

data/lib/bookbinder/transform/media_ripper/spine.rb

@@ -5,8 +5,11 @@ class Bookbinder::Transform::MediaRipper_Spine < Bookbinder::Transform
     package.map['spine'] = package.audio_paths.collect { |path|
       {
         'path' => path,
-        'media-type' => package.file(path).media_type,
-        'audio-duration' => audio_length(package, path)
+        'media-type' => 'audio/mpeg'
+      }.tap { |cmpt|
+        break  unless cmpt_info = audio_info(package, path)
+        cmpt.update('audio-duration' => cmpt_info.length)
+        cmpt.update('audio-bitrate' => cmpt_info.bitrate)  unless cmpt_info.vbr
       }
     }
   end
@@ -14,18 +17,18 @@ class Bookbinder::Transform::MediaRipper_Spine < Bookbinder::Transform
 
   protected
 
-    def audio_length(package, path)
-      length = 0
+    def audio_info(package, path)
+      info = nil
       begin
         package.file_system.get_io(path) { |zip_io|
-          io = StringIO.new(zip_io.read(4096))
-          Mp3Info.open(io) { |info| length = info.length }
+          io = StringIO.new(zip_io.read)
+          Mp3Info.open(io) { |inf| info = inf }
         }
       rescue => e
         # TODO - is there error handling to do here?
         raise e
       end
-      length
+      info
     end
 
 end

data/lib/bookbinder/transform/mp3_audiobook/nav_toc.rb

@@ -23,9 +23,15 @@ class Bookbinder::Transform::MP3Audiobook_NavToc < Bookbinder::Transform
       next  unless xml && xml.slice!(MEDIAMARKER_PREFIX_RE)
       doc = Nokogiri::XML(xml)
       doc.root.css('Marker').each { |marker_tag|
+        arr = toc
+        title = marker_tag.at_css('Name').content
+        if title.match(/^[[:space:]]+/)
+          arr = (toc.last['contents'] ||= [])
+          title.gsub!(/^[[:space:]]+|[[:space:]]+$/, '')
+        end
         seconds = translate_time(marker_tag.at_css('Time').content)
-        toc << {
-          'title' => marker_tag.at_css('Name').content.strip,
+        arr << {
+          'title' => title,
           'path' => "#{aud_path}#{seconds ? "##{seconds}" : ''}"
         }
       }

data/lib/bookbinder/transform/mp3_audiobook/spine.rb

@@ -5,8 +5,11 @@ class Bookbinder::Transform::MP3Audiobook_Spine < Bookbinder::Transform
     package.map['spine'] = package.audio_paths.collect { |path|
       {
         'path' => path,
-        'media-type' => 'audio/mpeg',
-        'audio-duration' => audio_length(package, path)
+        'media-type' => 'audio/mpeg'
+      }.tap { |cmpt|
+        break  unless cmpt_info = audio_info(package, path)
+        cmpt.update('audio-duration' => cmpt_info.length)
+        cmpt.update('audio-bitrate' => cmpt_info.bitrate)  unless cmpt_info.vbr
       }
     }
   end
@@ -14,17 +17,17 @@ class Bookbinder::Transform::MP3Audiobook_Spine < Bookbinder::Transform
 
   protected
 
-    def audio_length(package, path)
-      length = 0
+    def audio_info(package, path)
+      info = nil
       begin
         package.file(path).get_file { |mp3|
-          Mp3Info.open(mp3) { |info| length = info.length }
+          Mp3Info.open(mp3) { |inf| info = inf }
         }
       rescue => e
         # TODO - is there error handling to do here?
         raise e
       end
-      length
+      info
     end
 
 end

data/lib/bookbinder/transform/mp3_audiobook/subject.rb

@@ -11,7 +11,7 @@ class Bookbinder::Transform::MP3Audiobook_Subject < Bookbinder::Transform
   def to_map(package)
     return  unless md = package.map['metadata']
     return  unless md[TAG] &&  md[TAG].first
-    package.map['subject'] = [md[TAG].collect { |h| h['@'] }]
+    package.map['subject'] = md[TAG].collect { |h| h['@'] }
     md.delete(TAG)
   end
 

data/lib/bookbinder/version.rb

@@ -1,5 +1,5 @@
 module Bookbinder
 
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookbinder
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &18059860 !ruby/object:Gem::Requirement
+  requirement: &15331860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18059860
+  version_requirements: *15331860
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &18059360 !ruby/object:Gem::Requirement
+  requirement: &15331360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *18059360
+  version_requirements: *15331360
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &18058940 !ruby/object:Gem::Requirement
+  requirement: &15330940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18058940
+  version_requirements: *15330940
 - !ruby/object:Gem::Dependency
   name: ruby-mp3info
-  requirement: &18058480 !ruby/object:Gem::Requirement
+  requirement: &15330460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18058480
+  version_requirements: *15330460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &18058060 !ruby/object:Gem::Requirement
+  requirement: &15330040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18058060
+  version_requirements: *15330040
 description: Convert easily between common ebook formats.
 email:
 - jpearson@overdrive.com