Changeset 1732

Timestamp:

09/02/08 00:11:43 (3 months ago)

Author:

momo-i

Message:

Updated getid3 for multi-byte characters, but some wrong id3tags have occurred exception error.

Location:

trunk

Files:

• bin/print_tags.inc (modified) (1 diff)
• docs/CHANGELOG (modified) (1 diff)
• lib/class/catalog.class.php (modified) (3 diffs)
• lib/class/vainfo.class.php (modified) (5 diffs)

trunk/bin/print_tags.inc

@@ -40 +40 @@
 $catalog = new Catalog($results['id']);
 
-$info = new vainfo($filename,'',$catalog->sort_pattern,$catalog->rename_pattern);
+$info = new vainfo($filename,'','','',$catalog->sort_pattern,$catalog->rename_pattern);
 echo "Using: $catalog->sort_pattern AND $catalog->rename_pattern for file pattern matching\n";
 $info->get_info();

trunk/docs/CHANGELOG

@@ -5 +5 @@
 --------------------------------------------------------------------------
   v.3.5-Alpha1
+        - Updated getid3 for multi-byte characters, but some wrong id3tags
+                have occurred exception error.
         - Fixed use_auth = false not correctly re-creating the session if
                 you had just switched from use_auth = true

trunk/lib/class/catalog.class.php

@@ -1075 +1075 @@
                 debug_event('tag-read',"Reading Tags from $song->file",'5','ampache-catalog');
                 
-                $vainfo = new vainfo($song->file,'',$sort_pattern,$rename_pattern);
+                $vainfo = new vainfo($song->file,'','','',$sort_pattern,$rename_pattern);
                 $vainfo->get_info();
 
@@ -1503 +1503 @@
 
                 // Now nuke the tags themselves
-                $sql = "DELETE FROM `tag` USING `tag` LEFT JOIN `tag_map` ON `tag`.`id`=`tag_map`.`tag_id` " . 
+                $sql = "DELETE FROM `tag` USING `tag` LEFT JOIN `tag_map` ON `tag`.`map_id`=`tag_map`.`tag_id` " . 
                         "WHERE `tag_map`.`id` IS NULL"; 
                 $db_results = Dba::query($sql); 
@@ -2001 +2001 @@
 
                 /* Create the vainfo object and get info */
-                $vainfo         = new vainfo($file,'',$this->sort_pattern,$this->rename_pattern);
+                $vainfo         = new vainfo($file,'','','',$this->sort_pattern,$this->rename_pattern);
                 $vainfo->get_info();
 

trunk/lib/class/vainfo.class.php

@@ -29 +29 @@
         /* Default Encoding */
         var $encoding = '';
+        var $encoding_id3v1 = '';
+        var $encoding_id3v2 = '';
         
         /* Loaded Variables */
@@ -37 +39 @@
         /* Internal Information */
         var $_raw               = array();
+        var $_raw2              = array();
         var $_getID3            = '';
         var $_iconv             = false; 
@@ -48 +51 @@
          * actually pull the information
          */
-        function vainfo($file,$encoding='',$dir_pattern,$file_pattern) { 
+        function vainfo($file,$encoding='',$encoding_id3v1='',$encoding_id3v2='',$dir_pattern,$file_pattern) { 
 
                 $this->filename = $file;
@@ -64 +67 @@
                 // Initialize getID3 engine
                 $this->_getID3 = new getID3();
+
+                // get id3tag encodings
+                $this->_raw2 = $this->_getID3->analyze($file);
+                if(function_exists('mb_detect_encoding')) {
+                        $this->encoding_id3v1 = array();
+                        $this->encoding_id3v1[] = mb_detect_encoding($this->_raw2['tags']['id3v1']['artist']['0']);
+                        $this->encoding_id3v1[] = mb_detect_encoding($this->_raw2['tags']['id3v1']['album']['0']);
+                        $this->encoding_id3v1[] = mb_detect_encoding($this->_raw2['tags']['id3v1']['genre']['0']);
+                        $this->encoding_id3v1[] = mb_detect_encoding($this->_raw2['tags']['id3v1']['title']['0']);
+                        array_multisort($this->encoding_id3v1);
+                        array_splice($this->encoding_id3v1, -4, 3);
+                        if($this->encoding_id3v1[0] != "ASCII") {
+                                $this->encoding_id3v1 = $this->encoding_id3v1[0];
+                        } else {
+                                $this->encoding_id3v1 = "ISO-8859-1";
+                        }
+                        
+
+                        $this->encoding_id3v2 = array();
+                        $this->encoding_id3v2[] = mb_detect_encoding($this->_raw2['tags']['id3v2']['artist']['0']);
+                        $this->encoding_id3v2[] = mb_detect_encoding($this->_raw2['tags']['id3v2']['album']['0']);
+                        $this->encoding_id3v2[] = mb_detect_encoding($this->_raw2['tags']['id3v2']['genre']['0']);
+                        $this->encoding_id3v2[] = mb_detect_encoding($this->_raw2['tags']['id3v2']['title']['0']);
+                        array_multisort($this->encoding_id3v2);
+                        array_splice($this->encoding_id3v2, -4, 3);
+                        if($this->encoding_id3v2[0] != "ASCII"){
+                                $this->encoding_id3v2 = $this->encoding_id3v2[0];
+                        } else {
+                                $this->encoding_id3v2 = "ISO-8859-1";
+                        }
+                }
+                else {
+                        $this->encoding_id3v1 = $encoding_id3v1;
+                        $this->encoding_id3v2 = $encoding_id3v2;
+                }
+
                 $this->_getID3->option_md5_data         = false;
                 $this->_getID3->option_md5_data_source  = false;
@@ -70 +109 @@
                 $this->_getID3->option_tag_lyrics3      = false;
                 $this->_getID3->encoding                = $this->encoding; 
+                $this->_getID3->encoding_id3v1          = $this->encoding_id3v1;
+                $this->_getID3->encoding_id3v2          = $this->encoding_id3v2;
                 $this->_getID3->option_tags_process    = true;