mb-discid 0.1.5 → 0.2.0

data/CHANGES

@@ -1,4 +1,6 @@
 = Changelog
+== 0.2.0 (2013-02-17)
+* Support for MCN and ISRC (requires libdiscid >= 0.3)
 
 == 0.1.5 (2011-07-02)
 * Added binding for get_webservice_url()
@@ -31,4 +33,4 @@
 == 0.1.0 (2007-06-02)
 * Initial release
 
-$Id: CHANGES 333 2011-07-02 13:41:07Z phw $
+$Id$

data/README

@@ -7,7 +7,7 @@ to find the release entry for your CD in the MusicBrainz database.
 
 == Requirements
 * Ruby >= 1.8.6
-* libdiscid >= 0.2.2
+* libdiscid >= 0.2.2 (>= 0.3.0 for MCN and ISRC support)
 
 == Installation
 Before installing rdiscid make sure you have libdiscid installed. See
@@ -47,8 +47,8 @@ If you find bugs or if you have any feature requests please use the
 RBrainz bug tracker[http://rubyforge.org/tracker/?group_id=3677]. 
 
 == License
-MB-DiscID is Copyright (c) 2007 Philipp Wolfer.
+MB-DiscID is Copyright (c) 2007-2013 Philipp Wolfer.
 It is free softare distributed under a BSD style license. See
 LICENSE[link:files/LICENSE.html] for details.
 
-$Id: README 315 2010-06-14 21:30:06Z phw $
+$Id$

data/Rakefile

@@ -1,14 +1,14 @@
-# $Id: Rakefile 330 2011-07-02 13:12:30Z phw $
-# Copyright (c) 2007, Philipp Wolfer
+# $Id$
+# Copyright (c) 2007-2013, Philipp Wolfer
 # All rights reserved.
 # See LICENSE for permissions.
  
-# Rakefile for RDiscID
+# Rakefile for MBDiscID
 
 require 'rubygems'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 task :default do
   puts "Please see 'rake --tasks' for an overview of the available tasks."
@@ -17,7 +17,7 @@ end
 # Packaging tasks: -------------------------------------------------------
 
 PKG_NAME     = 'mb-discid'
-PKG_VERSION  = '0.1.5'
+PKG_VERSION  = '0.2.0'
 PKG_SUMMARY  = 'Ruby bindings for libdiscid.'
 PKG_AUTHOR   = 'Philipp Wolfer'
 PKG_EMAIL    = 'phw@rubyforge.org'
@@ -50,9 +50,8 @@ spec = Gem::Specification.new do |spec|
     spec.extensions << 'ext/extconf.rb'
     spec.required_ruby_version = ">= 1.8.6"
   end
-  spec.requirements << 'libdiscid >= 0.2.2 (http://musicbrainz.org/doc/libdiscid)'
+  spec.requirements << 'libdiscid >= 0.3.0 (http://musicbrainz.org/doc/libdiscid)'
   spec.require_paths = ['lib', 'ext']
-  spec.autorequire = spec.name
   spec.description = PKG_DESCRIPTION
   spec.author = PKG_AUTHOR
   spec.email = PKG_EMAIL
@@ -62,7 +61,7 @@ spec = Gem::Specification.new do |spec|
   spec.extra_rdoc_files = PKG_EXTRA_RDOC_FILES
 end
 
-Rake::GemPackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
   pkg.need_zip = true
   pkg.need_tar_gz= true
 end
@@ -79,8 +78,7 @@ task :build do
 
   cd 'ext' do
     unless system("ruby extconf.rb #{extconf_args}")
-      STDERR.puts "ERROR: could not configure extension!\n" +
-                  "\n#{INFO_NOTE}\n"
+      STDERR.puts "ERROR: could not configure extension!"
       break
     end
 

data/examples/discid.rb

@@ -9,7 +9,7 @@
 # Example:
 #  ./discid.rb /dev/dvd
 #
-# $Id: discid.rb 312 2010-06-14 21:04:14Z phw $
+# $Id$
 
 # Just make sure we can run this example from the command
 # line even if RBrainz is not yet installed properly.
@@ -43,6 +43,7 @@ First track : #{disc.first_track_num}
 Last track  : #{disc.last_track_num}
 Total length: #{disc.seconds} seconds
 Sectors     : #{disc.sectors}
+MCN         : #{disc.media_catalog_number}
 EOF
 
 # Print information about individual tracks:
@@ -54,6 +55,7 @@ disc.track_details do |track_info|
       [track_info.start_time / 60, track_info.start_time % 60, track_info.start_sector]
   puts "  End   : %02d:%02d (sector %i)" %
       [track_info.end_time / 60, track_info.end_time % 60, track_info.end_sector]
+  puts "  ISRC  : %s" % track_info.isrc
 end
 
 # Print a submission URL that can be used to submit

data/ext/extconf.rb

@@ -1,16 +1,16 @@
 #!/usr/bin/env ruby
-# $Id: extconf.rb 329 2011-07-02 12:49:58Z phw $
+# $Id$
 
 require 'mkmf'
 
-LIBDIR = Config::CONFIG['libdir']
-INCLUDEDIR = Config::CONFIG['includedir']
+LIBDIR = RbConfig::CONFIG['libdir']
+INCLUDEDIR = RbConfig::CONFIG['includedir']
 
 $CFLAGS << " #{ENV["CFLAGS"]}"
 $LIBS << " #{ENV["LIBS"]}"
 
 # totally thieved from Nokogiri's extconf.rb
-if Config::CONFIG['target_os'] =~ /mswin32/
+if RbConfig::CONFIG['target_os'] =~ /mswin32/
   # There's no default include/lib dir on Windows. Let's just add the Ruby ones
   # and resort on the search path specified by INCLUDE and LIB environment
   # variables
@@ -51,6 +51,9 @@ dir_config('discid', HEADER_DIRS, LIB_DIRS)
 
 if have_library('discid', 'discid_new') or
    have_library('discid.dll', 'discid_new')
+  headers = ['discid/discid.h']
+  have_func('discid_get_mcn', headers)
+  have_func('discid_get_track_isrc', headers)
   # Remove -MD from compiler flags on Windows.
   $CFLAGS.sub!('-MD', '') if RUBY_PLATFORM.include? 'win32'
   create_makefile('MB_DiscID')

data/ext/mb_discid.c

@@ -1,11 +1,11 @@
 /**
- * $Id: mb_discid.c 312 2010-06-14 21:04:14Z phw $
+ * $Id$
  *
  * Ruby bindings for libdiscid. See http://musicbrainz.org/doc/libdiscid
  * for more information on libdiscid and MusicBrainz.
  * 
  * Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
- * Copyright:: Copyright (c) 2007, Philipp Wolfer
+ * Copyright:: Copyright (c) 2007-2013, Philipp Wolfer
  * License::   MB-DiscID is free software distributed under a BSD style license.
  *             See LICENSE for permissions.
  */
@@ -110,6 +110,33 @@ static VALUE mb_discid_freedb_id(VALUE self)
 	}
 }
 
+/**
+ * call-seq:
+ *  mcn() -> string or nil
+ * 
+ * Return the media catalogue number of the release, if present.
+ * 
+ * Requires libdiscid >= 0.3. If not supported this method will always return +nil+.
+ * 
+ * Returns +nil+ if no ID was yet read.
+ */
+static VALUE mb_discid_mcn(VALUE self)
+{
+#ifdef HAVE_DISCID_GET_MCN
+	if (rb_iv_get(self, "@read") == Qfalse)
+		return Qnil;
+	else
+	{
+		DiscId *disc;
+		Data_Get_Struct(self, DiscId, disc);
+
+		return rb_str_new2(discid_get_mcn(disc));
+	}
+#else
+	return Qnil;
+#endif
+}
+
 /**
  * call-seq:
  *  first_track_num() -> int or nil
@@ -225,6 +252,34 @@ static VALUE mb_discid_tracks(VALUE self)
 	}
 }
 
+/**
+ * call-seq:
+ *  isrc(track)
+ * 
+ * Returns the International Standard Recording Code (ISRC) for the track.
+ * 
+ * Requires libdiscid >= 0.3. If not supported this method will always return +nil+.
+ * 
+ * Returns always +nil+ if no ID was yet read.
+ */
+static VALUE mb_discid_isrc(VALUE self, VALUE track)
+{
+#ifdef HAVE_DISCID_GET_TRACK_ISRC
+	if (rb_iv_get(self, "@read") == Qfalse)
+		return Qnil;
+	else
+	{
+		DiscId *disc; /* Pointer to the disc struct */
+		int ctrack = NUM2INT(track); /* Track number to process. */
+		
+		Data_Get_Struct(self, DiscId, disc);
+		return rb_str_new2(discid_get_track_isrc(disc, ctrack));
+	}
+#else
+	return Qnil;
+#endif
+}
+
 /**
  * call-seq:
  *  read(device=nil)
@@ -263,12 +318,11 @@ static VALUE mb_discid_read(int argc, VALUE *argv, VALUE self)
 	
 	/* Read the discid */
 	if (discid_read(disc, cdevice) == 0)
-		rb_raise(rb_eException, discid_get_error_msg(disc));
+		rb_raise(rb_eException, "%s", discid_get_error_msg(disc));
 	else /* Remember that we already read the ID. */
 		rb_iv_set(self, "@read", Qtrue);
 	
 	return Qnil;
-	
 }
 
 /**
@@ -314,7 +368,7 @@ static VALUE mb_discid_put(VALUE self, VALUE first_track, VALUE sectors,
 	
 	/* Read the discid */
 	if (discid_put(disc, cfirst, clast, coffsets) == 0)
-		rb_raise(rb_eException, discid_get_error_msg(disc));
+		rb_raise(rb_eException, "%s", discid_get_error_msg(disc));
 	else /* Remember that we already read the ID. */
 		rb_iv_set(self, "@read", Qtrue);
 	
@@ -378,8 +432,11 @@ void Init_MB_DiscID()
 	rb_define_method(cDiscID, "submission_url", mb_discid_submission_url, 0);
 	rb_define_method(cDiscID, "webservice_url", mb_discid_webservice_url, 0);
 	rb_define_method(cDiscID, "freedb_id", mb_discid_freedb_id, 0);
+	rb_define_method(cDiscID, "media_catalog_number", mb_discid_mcn, 0);
 	rb_define_method(cDiscID, "first_track_num", mb_discid_first_track_num, 0);
 	rb_define_method(cDiscID, "last_track_num", mb_discid_last_track_num, 0);
 	rb_define_method(cDiscID, "sectors", mb_discid_sectors, 0);
 	rb_define_method(cDiscID, "tracks", mb_discid_tracks, 0);
+	
+	rb_define_method(cDiscID, "isrc", mb_discid_isrc, 1);
 }

data/lib/mb-discid.rb

@@ -1,4 +1,4 @@
-# $Id: mb-discid.rb 201 2008-02-13 14:59:48Z phw $
+# $Id$
 #
 # Just a helper file to allow loading the MB-DiscID library with
 # <tt>require 'mb-discid'</tt>, which is the only recommended way
@@ -122,11 +122,15 @@ module MusicBrainz
       # Start position of the track on the disc in sectors.
       attr_reader :start_sector
       
+      # ISRC number of the trac
+      attr_reader :isrc
+      
       # Returns a new TrackInfo.
-      def initialize(number, offset, length)
+      def initialize(number, offset, length, isrc)
         @number = number
         @start_sector = offset
         @sectors = length
+        @isrc = isrc
       end
       
       # End position of the track on the disc in sectors.
@@ -171,6 +175,7 @@ module MusicBrainz
         :seconds      => seconds,
         :start_time   => start_time,
         :end_time     => end_time,
+        :isrc         => isrc,
         }
       end
       
@@ -204,7 +209,8 @@ module MusicBrainz
         
         self.tracks do |offset, length|
           track_number += 1
-          track_info = TrackInfo.new(track_number, offset, length)
+          isrc = self.isrc(track_number)
+          track_info = TrackInfo.new(track_number, offset, length, isrc)
           
           if block_given?
             yield track_info

data/test/test_discid.rb

@@ -1,4 +1,4 @@
-# $Id: test_discid.rb 236 2009-05-07 05:58:07Z phw $
+# $Id$
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Philipp Wolfer

metadata

@@ -1,35 +1,27 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mb-discid
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 5
-  version: 0.1.5
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Philipp Wolfer
-autorequire: mb-discid
+autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-02 00:00:00 +02:00
-default_executable: 
+date: 2013-02-17 00:00:00.000000000 Z
 dependencies: []
-
-description: "    Ruby bindings for libdiscid. See http://musicbrainz.org/doc/libdiscid\n    for more information on libdiscid and MusicBrainz.\n"
+description: ! "    Ruby bindings for libdiscid. See http://musicbrainz.org/doc/libdiscid\n
+  \   for more information on libdiscid and MusicBrainz.\n"
 email: phw@rubyforge.org
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
 - LICENSE
 - CHANGES
-files: 
+files:
 - Rakefile
 - LICENSE
 - README
@@ -39,42 +31,30 @@ files:
 - ext/extconf.rb
 - lib/mb-discid.rb
 - test/test_discid.rb
-has_rdoc: true
 homepage: http://rbrainz.rubyforge.org
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 59
-      segments: 
-      - 1
-      - 8
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
-- libdiscid >= 0.2.2 (http://musicbrainz.org/doc/libdiscid)
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
+- libdiscid >= 0.3.0 (http://musicbrainz.org/doc/libdiscid)
 rubyforge_project: rbrainz
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby bindings for libdiscid.
 test_files: []
-