Ticket #285: autotagconvert.patch

catalog.class.php

@@ -1074 +1074 @@
                 /* Record the reading of these tags */
                 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();
 
                 /* Find the correct key */
@@ -2000 +2000 @@
         public function insert_local_song($file,$file_info) {
 
                 /* 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();
 
                 $key = get_tag_type($vainfo->tags);

vainfo.class.php

@@ -27 +27 @@
 class vainfo { 
 
         /* Default Encoding */
-        var $encoding = '';
+        var $encoding = 'UTF-8';
+        var $encoding_id3v1 = '';
+        var $encoding_id3v2 = '';
         
         /* Loaded Variables */
         var $filename = '';
@@ -36 +38 @@
 
         /* Internal Information */
         var $_raw               = array();
+        var $_raw2              = array();
         var $_getID3            = '';
         var $_iconv             = false; 
         var $_file_encoding     = '';
@@ -47 +50 @@
          * This function just sets up the class, it doesn't
          * actually pull the information
          */
-        function vainfo($file,$encoding='',$dir_pattern,$file_pattern) { 
+        function vainfo($file,$encoding='UTF-8',$encoding_id3v1='',$encoding_id3v2='',$dir_pattern,$file_pattern) { 
 
                 $this->filename = $file;
                 if ($encoding) { 
@@ -63 +66 @@
 
                 // Initialize getID3 engine
                 $this->_getID3 = new getID3();
+
+                // get id3tag encodings
+                $this->_raw2 = $this->_getID3->analyze($file);
+                if(function_exsits('mb_detect_encoding')) {
+                        if(mb_detect_encoding($this->_raw2['tags']['id3v1']['title']['0'])) {
+                                $this->encoding_id3v1 = mb_detect_encoding($this->_raw2['tags']['id3v1']['title']['0']);
+                        }
+                        else {
+                                $this->encoding_id3v1 = $encoding_id3v1;
+                        }
+                        if(mb_detect_encoding($this->_raw2['tags']['id3v2']['title']['0'])) {
+                                $this->encoding_id3v2 = mb_detect_encoding($this->_raw2['tags']['id3v2']['title']['0']);
+                        }
+                        else {
+                                $this->encoding_id3v2 = $encoding_id3v2;
+                        }
+                }
+                else {
+                        $this->encoding_id3v1 = $encoding_id3v1;
+                        $this->encoding_id3v2 = $encoding_id3v2;
+                }
+
                 $this->_getID3->option_md5_data         = false;
                 $this->_getID3->option_md5_data_source  = false;
                 $this->_getID3->option_tags_html        = false;
                 $this->_getID3->option_extra_info       = false;
                 $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; 
 
                 /* Check for ICONV */