rtaglib 0.2.2 → 0.2.3

data/swig/Rakefile

@@ -13,20 +13,17 @@ task :docs => ["TagLib_doc.rb"] do |t|
     system %(rdoc -f html TagLib_doc.rb)
 end
 
-file "Doxyfile" do |t|
-	system %("touch Doxyfile")
-end
-
 file "TagLib_doc.rb" => ["make_doc.rb","TagLib.so","doxygen"] do |t|
     system %(ruby make_doc.rb)
 end
+
 file "doxygen" => ["Doxyfile"] do |t|
     system %(doxygen)
 end
 task :test => ["TagLib.so"] do |t|
     system %(ruby "test.rb")
 end
-task :copy => [:test, :docs] do |t|
+task :copy => [:test, "TagLib_doc.rb"] do |t|
     system %(cp extconf.rb taglib.cxx ../ext/taglib/)
     system %(cp test.rb ../test/test_taglib.rb)
     system %(cp TagLib_doc.rb ../lib/)

data/swig/extconf.rb

@@ -5,11 +5,18 @@ if(PLATFORM=~/mingw/)
 	$CFLAGS= " -I/mingw/include/taglib"
 
 else
-	puts "Building for other architecture"
-	$CFLAGS= " -I/usr/include/taglib"
-
+    puts "Building for other architecture"
+    taglib_config = find_executable("taglib-config")
+    if taglib_config
+        prefix = `#{taglib_config} --prefix`.strip
+        $CFLAGS += " -I#{prefix}/include"
+        $LDFLAGS += " -L#{prefix}/lib"
+    else
+        prefix = "/usr"
+    end
+    $CFLAGS += " -I#{prefix}/include/taglib"
 end
-	$libs = append_library($libs, "supc++")
+$libs = append_library($libs, "supc++")
 if have_header("taglib/taglib_export.h") and have_library("tag")
     create_makefile("TagLib")
 end

data/swig/taglib.i

@@ -56,19 +56,37 @@ typedef std::basic_string< wchar > 	wstring;
 typedef const char * 	FileName;
 %}
 
+
 %{
-    VALUE StringList2Ruby(TagLib::StringList st) {
+    VALUE ByteVector2Ruby(const TagLib::ByteVector *bv) {
+        return rb_tainted_str_new(bv->data(),bv->size());;
+    }
+    VALUE String2Ruby(const TagLib::String *st) {
+        return rb_tainted_str_new2(st->toCString(!st->isLatin1()));
+    }
+    
+    VALUE StringList2Ruby(const TagLib::StringList *st) {
         VALUE ary=Qnil;
-        if(st.size()>0) {
-            ary=rb_ary_new2(st.size());
-            for(uint i=0;i<(st.size());i++) {
-            TagLib::String &rst=st.operator[](i);
-            const char* ch=rst.toCString(true);
-            rb_ary_push(ary, rb_tainted_str_new2(ch));
+        if(st->size()>0) {
+            ary=rb_ary_new2(st->size());
+            for(uint i=0;i<(st->size());i++) {
+                const TagLib::String *val=&(st->operator[](i));
+                rb_ary_push(ary, String2Ruby(val));
             }
         }
         return ary;
     }
+    VALUE FrameList2Ruby(const TagLib::ID3v2::FrameList *st) {
+        VALUE ary=Qnil;
+        if(st->size()>0) {
+            ary=rb_ary_new2(st->size());
+            for(uint i=0;i<(st->size());i++) {
+            rb_ary_push(ary, SWIG_NewPointerObj(st->operator[](i), SWIGTYPE_p_TagLib__ID3v2__Frame, 0));
+            }
+        }
+        return ary;
+    }
+    
 %}
 
 %init %{
@@ -86,11 +104,12 @@ typedef const char * 	FileName;
     VALUE mTagLibWavPack = rb_define_module_under(mTagLib, "WavPack");
 %}
 
-%define MAP_HELPERS(TYPE,FUNC) 
-%extend Map<TagLib::String, TYPE> {
-    VALUE __getitem__(TagLib::String &item) {
+%define MAP_HELPERS(KEY_TYPE,VALUE_TYPE,FUNC_KEY,FUNC_VALUE) 
+%extend Map<KEY_TYPE, VALUE_TYPE> {
+    VALUE __getitem__(KEY_TYPE &item) {
         if($self->contains(item)) {
-            return FUNC($self->operator[](item));
+            VALUE_TYPE val=$self->operator[](item);
+            return FUNC_VALUE(&val);
         } else {
             return Qnil;
         }
@@ -98,9 +117,9 @@ typedef const char * 	FileName;
     VALUE __hash__() {
         uint i;
         VALUE hash=rb_hash_new();
-        for(std::map<TagLib::String,TYPE>::const_iterator it=$self->begin(); it!=$self->end();it++) {
-            VALUE key=rb_tainted_str_new2(it->first.toCString(true));
-            VALUE ary=FUNC(it->second);
+        for(std::map<KEY_TYPE,VALUE_TYPE>::const_iterator it=$self->begin(); it!=$self->end();it++) {
+            VALUE key=FUNC_KEY(&it->first);
+            VALUE ary=FUNC_VALUE(&it->second);
             rb_hash_aset(hash,key,ary);
         }
         return hash;
@@ -168,19 +187,16 @@ namespace TagLib {
 };
 
 
-%typemap(out) TagLib::StringList &{
-    $result=StringList2Ruby($1);
-}
 
 %typemap(out) TagLib::StringList {
-    $result=StringList2Ruby($1);
+    $result=StringList2Ruby(&$1);
 }
 
 %apply  TagLib::StringList & {TagLib::StringList const &};
 
 
 %typemap(out) String {
-    $result = rb_tainted_str_new2($1.toCString(true));
+    $result = String2Ruby(&$1);
 };
 
 %typemap(in) String {
@@ -189,16 +205,23 @@ namespace TagLib {
 
 
 %apply String {String &, const String &};
-
 %typemap(in) ByteVector {
+    Check_Type($input, T_STRING);
     $1=new TagLib::ByteVector(StringValuePtr($input), RSTRING_LEN($input));
 };
 
+
 %typemap(out) ByteVector {
     $result = rb_tainted_str_new($1.data(),$1.size());
 };
 
-%apply ByteVector {ByteVector &, const ByteVector &};
+%apply ByteVector {ByteVector &, const ByteVector &, ByteVector const &};
+
+%typemap(out) TagLib::ID3v2::FrameList {
+    $result = FrameList2Ruby($1);
+};
+
+%apply TagLib::ID3v2::FrameList {TagLib::ID3v2::FrameList &, const TagLib::ID3v2::FrameList &, TagLib::ID3v2::FrameList const &};
 
 class AudioProperties {
     AudioProperties(ReadStyle style);
@@ -330,16 +353,20 @@ class File {
         
     };
     // Helpers for FieldListMap
-    MAP_HELPERS(TagLib::StringList,StringList2Ruby)
+    
+    MAP_HELPERS(TagLib::String, TagLib::StringList, String2Ruby, StringList2Ruby)
     // Helpers for GenreMap
-    MAP_HELPERS(int,INT2FIX)
+    MAP_HELPERS(TagLib::String, int, String2Ruby, INT2FIX)
+    // Helpers for FrameListMap
+    MAP_HELPERS(TagLib::ByteVector, TagLib::ID3v2::FrameList, ByteVector2Ruby, FrameList2Ruby)
+    
     
     
     %template (FieldListMap) Map<TagLib::String, TagLib::StringList>;
     %template (ItemListMap) Map<TagLib::String, TagLib::APE::Item>;
     %template (GenreMap) Map<TagLib::String, int>;
     %template (FrameListMap) Map < TagLib::ByteVector, TagLib::ID3v2::FrameList >;
-    
+
     %template (StringList) List< TagLib::String >; 
     %template (ByteVectorList) List<TagLib::ByteVector>;
     %template (FrameList) List< TagLib::ID3v2::Frame * >; 
@@ -347,6 +374,9 @@ class File {
     typedef List<TagLib::ByteVector> ByteVectorList;
     typedef List<TagLib::String> StringList;
 
+    // Extends FrameListMap
+    
+
     class FileRef {
         public:
         static StringList 	defaultFileExtensions ();
@@ -436,10 +466,7 @@ class File {
 
         };
     };
-    
-    
-    
-    
+
     
             
     namespace Ogg {
@@ -568,13 +595,14 @@ class File {
                 };
             
             class File : public TagLib::Ogg::File {
-            File (FileName file, bool readProperties=true, Properties::ReadStyle propertiesStyle=Properties::Average);
-            virtual 	~File ();
-            virtual Ogg::XiphComment * 	tag () const;
-            virtual Properties * 	audioProperties () const;
-            virtual bool 	save ();
+                public:
+                File(FileName file, bool readProperties=true, Properties::ReadStyle propertiesStyle=Properties::Average);
+                virtual 	~File ();
+                virtual Ogg::XiphComment * 	tag () const;
+                virtual Properties * 	audioProperties () const;
+                virtual bool 	save ();
                 };
-            }    
+        }    
  namespace ID3v1 {
      
      typedef Map<TagLib::String,int> 	GenreMap;
@@ -601,12 +629,33 @@ class File {
         %rename(ID3v2_AttachedPictureFrame) AttachedPictureFrame;
         %rename(ID3v2_Tag) Tag;
         %rename(ID3v2_Header) Header;
+        %rename(ID3v2_Frame) Frame;
         %rename(ID3v2_CommentsFrame) CommentsFrame;
         %rename(ID3v2_FrameFactory) FrameFactory;
         %rename(ID3v2_GeneralEncapsulatedObjectFrame) GeneralEncapsulatedObjectFrame;
         typedef List< Frame * >FrameList;
         typedef Map < ByteVector, FrameList > 	FrameListMap;
-        class AttachedPictureFrame {
+       
+        class Header {
+            Header();
+            
+        };
+
+        
+        class Frame : public TagLib::ID3v2::Header {
+            public: 
+            virtual 	~Frame ();
+            ByteVector 	frameID () const;
+            uint 	size () const ;
+            %extend {
+                VALUE __str__() {
+                    return rb_tainted_str_new2($self->toString().toCString(false));
+                }
+            };
+            
+        };
+        
+         class AttachedPictureFrame : public TagLib::ID3v2::Frame {
             public: 
             enum  	Type {
               Other = 0x00, FileIcon = 0x01, OtherFileIcon = 0x02, FrontCover = 0x03,
@@ -615,9 +664,17 @@ class File {
               Lyricist = 0x0C, RecordingLocation = 0x0D, DuringRecording = 0x0E, DuringPerformance = 0x0F,
               MovieScreenCapture = 0x10, ColouredFish = 0x11, Illustration = 0x12, BandLogo = 0x13,
               PublisherLogo = 0x14
-            };              
+            };
             AttachedPictureFrame ();
-            AttachedPictureFrame (const ByteVector &data);
+            //AttachedPictureFrame (const ByteVector &data);
+            
+            %extend {
+             static AttachedPictureFrame *new2(const ByteVector &data) {
+                 return new TagLib::ID3v2::AttachedPictureFrame(data);
+                }
+             }
+            
+            
             virtual 	~AttachedPictureFrame ();
             virtual String 	toString () const;
             String::Type 	textEncoding () const;
@@ -632,10 +689,13 @@ class File {
             void 	setPicture (const ByteVector &p);
         };
         
-        class CommentsFrame {
+        class CommentsFrame : public TagLib::ID3v2::Frame {
+
             static CommentsFrame* TagLib::ID3v2::CommentsFrame::findByDescription  	(  	const Tag * tag, const String &  	d);
+            public:             
             CommentsFrame (String::Type encoding=String::Latin1);
-            CommentsFrame (const ByteVector &data);
+            //CommentsFrame (const ByteVector &data);
+            
             virtual 	~CommentsFrame ();
             virtual String 	toString () const;
             ByteVector 	language () const;
@@ -667,16 +727,18 @@ class File {
             FrameFactory();
             ~FrameFactory();
         };
-        class Header {
-            Header();
-            
-        };
         class Tag : public TagLib::Tag {
             public:
             Tag();
             Tag(File *file, long tagOffset, const FrameFactory* factory);            
             TAG_VIRTUALS()
             Header *header();
+            %apply SWIGTYPE *DISOWN {Frame *frame};
+                void 	addFrame (Frame *frame);
+            %clear Frame *frame;
+
+            const FrameListMap& frameListMap() const;
+            const FrameList& frameList() const;
         };
     };
     

data/swig/test.rb

@@ -44,7 +44,7 @@ class RtaglibReadTestCase < Test::Unit::TestCase
     def test_file
         mp3=@data_dir+"440Hz-5sec.mp3"
         copy=get_copy(mp3)
-        file=TagLib::MPEG::File.new(mp3)
+        file=TagLib::MPEG::File.new(copy)
         assert(file.writable?)
         assert(file.open?)
         assert(file.valid?)
@@ -63,7 +63,14 @@ class RtaglibReadTestCase < Test::Unit::TestCase
         needle=sprintf("%c%c%c%c%c",0x22,0x22,0x22,0xE6,0x63)
         assert_equal(-1,file.find2(needle,0))
         assert_equal(0x7B46,file.length())
-        
+        expected=sprintf("%c%c%c%c%c%c",0x01,0x02,0x03,0x04,0x05,0x06)
+        file.seek(0)
+        file.writeBlock(expected)
+        file.save
+        file=nil
+        file=TagLib::MPEG::File.new(copy)
+        file.seek(0)
+        #assert_equal(expected,file.readBlock(6))
     end
     # TagLib::FileRef test for
     # - ::defaultFileExtensions()
@@ -78,7 +85,7 @@ class RtaglibReadTestCase < Test::Unit::TestCase
         bitrate={'flac'=>168,'wv'=>235,'mp3'=>48,'mpc'=>41,'ogg'=>80}
         channels={'flac'=>1,'wv'=>1,'mp3'=>1,'mpc'=>2,'ogg'=>1}
 
-        Dir.glob(@data_dir+"/*").each{|f|
+        Dir.glob(@data_dir+"/440*").each{|f|
             fr=TagLib::FileRef.new(f)
             f=~/.+\.(.+)/
             ext=$1
@@ -121,6 +128,55 @@ class RtaglibReadTestCase < Test::Unit::TestCase
         assert_equal("Rock",fr3.tag.genre)
         assert_equal("new comment",fr3.tag.comment)
         
+    end
+    # Bug 2009-05-15
+    # Reporter: Jason Newton
+    # Assign UTF8 strings to tags return garbage
+    def test_bug_2009_05_15
+        mp3=@data_dir+"440Hz-5sec.mp3"
+        copy=get_copy(mp3)
+        copy2=get_copy(mp3)
+        fr=TagLib::FileRef.new(copy)
+        utf8_string="大塚愛"
+        expected="\345\244\247\345\241\232\346\204\233"
+        fr.tag().title=utf8_string
+        fr.save
+        fr=nil
+        fr=TagLib::FileRef.new(copy)
+        assert_equal(expected,fr.tag.title)
+
+        mp3=@data_dir+"test_jason.mp3"
+        s=get_copy(mp3)
+        d=get_copy(mp3)
+        s_tag=TagLib::FileRef.new(s)
+        d_tag=TagLib::FileRef.new(d)
+        artist="大塚愛"
+#        puts "artist = #{artist} => #{artist.inspect}"
+        assert_equal(artist,s_tag.tag.artist)
+        assert_equal(artist,d_tag.tag.artist)
+        d_tag.tag.artist=s_tag.tag.artist        
+        assert_equal(d_tag.tag.artist, s_tag.tag.artist)
+        d_tag.save
+        d_tag=TagLib::FileRef.new(d)
+        assert_equal(d_tag.tag.artist, s_tag.tag.artist)
+
+
+
+        ogg=@data_dir+"test_jason.ogg"
+        s=get_copy(ogg)
+        d=get_copy(ogg)
+        s_tag=TagLib::FileRef.new(s)
+        d_tag=TagLib::FileRef.new(d)
+        artist="大塚愛"
+#        puts "artist = #{artist} => #{artist.inspect}"
+        assert_equal(artist,s_tag.tag.artist)
+        assert_equal(artist,d_tag.tag.artist)
+        d_tag.tag.artist=s_tag.tag.artist        
+        assert_equal(d_tag.tag.artist, s_tag.tag.artist)
+        d_tag.save
+        d_tag=TagLib::FileRef.new(d)
+        assert_equal(d_tag.tag.artist, s_tag.tag.artist)
+        
     end
     def test_flac
         original=@data_dir+"440Hz-5sec.flac"

data/test/test_taglib.rb

@@ -44,7 +44,7 @@ class RtaglibReadTestCase < Test::Unit::TestCase
     def test_file
         mp3=@data_dir+"440Hz-5sec.mp3"
         copy=get_copy(mp3)
-        file=TagLib::MPEG::File.new(mp3)
+        file=TagLib::MPEG::File.new(copy)
         assert(file.writable?)
         assert(file.open?)
         assert(file.valid?)
@@ -63,7 +63,14 @@ class RtaglibReadTestCase < Test::Unit::TestCase
         needle=sprintf("%c%c%c%c%c",0x22,0x22,0x22,0xE6,0x63)
         assert_equal(-1,file.find2(needle,0))
         assert_equal(0x7B46,file.length())
-        
+        expected=sprintf("%c%c%c%c%c%c",0x01,0x02,0x03,0x04,0x05,0x06)
+        file.seek(0)
+        file.writeBlock(expected)
+        file.save
+        file=nil
+        file=TagLib::MPEG::File.new(copy)
+        file.seek(0)
+        #assert_equal(expected,file.readBlock(6))
     end
     # TagLib::FileRef test for
     # - ::defaultFileExtensions()
@@ -78,7 +85,7 @@ class RtaglibReadTestCase < Test::Unit::TestCase
         bitrate={'flac'=>168,'wv'=>235,'mp3'=>48,'mpc'=>41,'ogg'=>80}
         channels={'flac'=>1,'wv'=>1,'mp3'=>1,'mpc'=>2,'ogg'=>1}
 
-        Dir.glob(@data_dir+"/*").each{|f|
+        Dir.glob(@data_dir+"/440*").each{|f|
             fr=TagLib::FileRef.new(f)
             f=~/.+\.(.+)/
             ext=$1
@@ -121,6 +128,55 @@ class RtaglibReadTestCase < Test::Unit::TestCase
         assert_equal("Rock",fr3.tag.genre)
         assert_equal("new comment",fr3.tag.comment)
         
+    end
+    # Bug 2009-05-15
+    # Reporter: Jason Newton
+    # Assign UTF8 strings to tags return garbage
+    def test_bug_2009_05_15
+        mp3=@data_dir+"440Hz-5sec.mp3"
+        copy=get_copy(mp3)
+        copy2=get_copy(mp3)
+        fr=TagLib::FileRef.new(copy)
+        utf8_string="大塚愛"
+        expected="\345\244\247\345\241\232\346\204\233"
+        fr.tag().title=utf8_string
+        fr.save
+        fr=nil
+        fr=TagLib::FileRef.new(copy)
+        assert_equal(expected,fr.tag.title)
+
+        mp3=@data_dir+"test_jason.mp3"
+        s=get_copy(mp3)
+        d=get_copy(mp3)
+        s_tag=TagLib::FileRef.new(s)
+        d_tag=TagLib::FileRef.new(d)
+        artist="大塚愛"
+#        puts "artist = #{artist} => #{artist.inspect}"
+        assert_equal(artist,s_tag.tag.artist)
+        assert_equal(artist,d_tag.tag.artist)
+        d_tag.tag.artist=s_tag.tag.artist        
+        assert_equal(d_tag.tag.artist, s_tag.tag.artist)
+        d_tag.save
+        d_tag=TagLib::FileRef.new(d)
+        assert_equal(d_tag.tag.artist, s_tag.tag.artist)
+
+
+
+        ogg=@data_dir+"test_jason.ogg"
+        s=get_copy(ogg)
+        d=get_copy(ogg)
+        s_tag=TagLib::FileRef.new(s)
+        d_tag=TagLib::FileRef.new(d)
+        artist="大塚愛"
+#        puts "artist = #{artist} => #{artist.inspect}"
+        assert_equal(artist,s_tag.tag.artist)
+        assert_equal(artist,d_tag.tag.artist)
+        d_tag.tag.artist=s_tag.tag.artist        
+        assert_equal(d_tag.tag.artist, s_tag.tag.artist)
+        d_tag.save
+        d_tag=TagLib::FileRef.new(d)
+        assert_equal(d_tag.tag.artist, s_tag.tag.artist)
+        
     end
     def test_flac
         original=@data_dir+"440Hz-5sec.flac"