ruby-audioinfo 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b256c5022fe62915d11bd43fa0cafeb3614903e26b20e46905b83c209ab7af0e
-  data.tar.gz: 2f93f159c9acc9e19d17401b697172a9a95b30e63843c9283846fd7ab9c1527e
+  metadata.gz: 74f9fc4a57204013fea05e2d88e3fbec568b833a5aa7627e345d740b6601a685
+  data.tar.gz: 2f7d5b623dcf6a04dc6a203cb4c4e115057625dbb7d5b910b6632a94d591e37d
 SHA512:
-  metadata.gz: d44d229a4b38d7346458a0615ca2fe25543e002395f5d0b3e5b43feaba97058c1a2adc8e91966492bc3c0bf4070c70b74adf0038c089e8e23a531012e2a8cb07
-  data.tar.gz: 3725e8f79bc843c5ccfe6c7ed0f86fcbfd9aac129f5134ea58992a9af92a4b3ffbc90cb957862cccfa88ca70fcc917c78e8336597291ba0ac118e27db83882da
+  metadata.gz: b27b66d77f3e02a1892ace15d6daf124f048c0c2fb3b2864f085bd0557020b6787d5ba295dfba5b7e793822ddb153814f9b213a8fdd2c1cc0ab4a550c562fc54
+  data.tar.gz: 2f7e0694eccc686992e16ab9fed24dc573529906a945322bb05411d627a2734b041ea2f6da9c3543e5af78bcd41c6765184245d0c526509f720c22dad202fac6

data/.github/workflows/ruby.yml

@@ -32,7 +32,7 @@ jobs:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true
     - name: Install dependencies
-      run: sudo apt install ffmpeg
+      run: sudo apt install ffmpeg faad
     - name: Install Gems
       run: bundle install
     - name: Run tests

data/.gitignore

@@ -1 +1,7 @@
-coverage
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/tmp/

data/.rubocop_todo.yml

@@ -53,17 +53,17 @@ Metrics/ClassLength:
 # Offense count: 4
 # Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
-  Max: 28
+  Max: 29
 
 # Offense count: 8
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
-  Max: 116
+  Max: 117
 
 # Offense count: 4
 # Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
-  Max: 23
+  Max: 24
 
 # Offense count: 6
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby-audioinfo (0.5.4)
+    ruby-audioinfo (0.5.5)
       apetag (>= 1.1.4)
       flacinfo-rb (>= 0.4)
       moumar-wmainfo-rb (>= 0.7)

data/lib/audioinfo.rb

@@ -149,10 +149,12 @@ class AudioInfo
         @length = @info.SECS
         mapping = MUSICBRAINZ_FIELDS.invert
 
-        faad_info(filename).match(/^MusicBrainz (.+)$/) do
-          name, value = Regexp.last_match(1).split(/: /, 2)
+        faad_info(filename).scan(/^MusicBrainz (.+): (.+)$/) do |match|
+          name, value = match
           key = mapping[name]
-          @musicbrainz_infos[key] = value
+          next unless key
+
+          @musicbrainz_infos[key] = value.strip.gsub("\u0000", '')
         end
 
       when 'flac'
@@ -375,29 +377,21 @@ class AudioInfo
   rescue ApeTagError
   end
 
-  def faad_info(file)
-    stdout, stdout_w = IO.pipe
-    stderr, stderr_w = IO.pipe
-
-    fork do
-      stdout.close
-      stderr.close
-      $stdout.reopen(stdout_w)
-      $stderr.reopen(stderr_w)
-      exec 'faad', '-i', file
-    end
+  def faad_info(path)
+    require 'open3'
 
-    stdout_w.close
-    stderr_w.close
-    pid, status = Process.wait2
+    output = ''
+    status = nil
 
-    out = stdout.read.chomp
-    stdout.close
-    err = stderr.read.chomp
-    stderr.close
+    begin
+      Open3.popen3('faad', '-i', path) do |_stdin, _stdout, stderr, wait_thr|
+        output = stderr.read.chomp
+        status = wait_thr.value
+      end
+    rescue StandardError
+    end
 
-    # Return the stderr because faad prints info on that fd...
-    status.exitstatus.zero? ? err : ''
+    status&.exitstatus&.zero? ? output : ''
   end
 
   def shell_escape(s)

data/lib/audioinfo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class AudioInfo
-  VERSION = '0.5.4'
+  VERSION = '0.5.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-audioinfo
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Guillaume Pierronnet
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2021-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apetag