Changeset 1741

Timestamp:

09/04/08 15:20:49 (3 months ago)

Author:

momo-i

Message:

Fixed #300 (Thx abs0) and Fixed didn't catch exception first analyze.

Location:

trunk

Files:

• docs/CHANGELOG (modified) (1 diff)
• lib/class/vainfo.class.php (modified) (2 diffs)

trunk/docs/CHANGELOG

@@ -5 +5 @@
 --------------------------------------------------------------------------
   v.3.5-Alpha1
+        - Fixed vainfo.class.php didn't catch exception for first analyze.
+        - Fixed iconv() returns an empty strings (Thx abs0)
         - Updated getid3 for multi-byte characters, but some wrong id3tags
                 have occurred exception error.

trunk/lib/class/vainfo.class.php

@@ -69 +69 @@
 
                 // get id3tag encodings
-                $this->_raw2 = $this->_getID3->analyze($file);
+                try {
+                        $this->_raw2 = $this->_getID3->analyze($file);
+                }
+                catch (Exception $error) {
+                        debug_event('getid3',$error->message,'1');
+                }
+
                 if(function_exists('mb_detect_encoding')) {
                         $this->encoding_id3v1 = array();
@@ -567 +573 @@
                 if ($this->_iconv) { 
                         /* Guess that it's UTF-8 */
+                        /* Try GNU iconv //TRANSLIT extension first */
                         if (!$encoding) { $encoding = $this->_getID3->encoding; }
                         $charset = $this->encoding . '//TRANSLIT';
-                        $tag = iconv($encoding,$charset,$tag);
-                }
-
-                return $tag;
+                        $enc_tag = iconv($encoding,$charset,$tag);
+                        if(strcmp($enc_tag, "") == 0) {
+                                $enc_tag = iconv($encoding,$this->encoding,$tag);
+                        }
+                }
+
+                return $enc_tag;
 
         } // _clean_tag