Changeset 29734 for trunk/src/wp-includes/ID3/module.tag.id3v2.php

Timestamp:

09/11/2014 07:06:33 PM (10 years ago)

Author:

wonderboymusic

Message:

Update getID3 library to 1.9.8.

Changes:
​https://github.com/JamesHeinrich/getID3/compare/1.9.7...v1.9.8

Fixes #29627.

File:

• trunk/src/wp-includes/ID3/module.tag.id3v2.php (modified) (8 diffs)

trunk/src/wp-includes/ID3/module.tag.id3v2.php

@@ -4 +4 @@
 //  available at http://getid3.sourceforge.net                 //
 //            or http://www.getid3.org                         //
+//          also https://github.com/JamesHeinrich/getID3       //
 /////////////////////////////////////////////////////////////////
 // See readme.txt for more details                             //
@@ -52 +53 @@
 
 
-        fseek($this->getid3->fp, $this->StartingOffset, SEEK_SET);
-        $header = fread($this->getid3->fp, 10);
+        $this->fseek($this->StartingOffset);
+        $header = $this->fread(10);
         if (substr($header, 0, 3) == 'ID3'  &&  strlen($header) == 10) {
 
@@ -132 +133 @@
         if ($sizeofframes > 0) {
 
-            $framedata = fread($this->getid3->fp, $sizeofframes); // read all frames from file into $framedata variable
+            $framedata = $this->fread($sizeofframes); // read all frames from file into $framedata variable
 
             //    if entire frame data is unsynched, de-unsynch it now (ID3v2.3.x)
@@ -424 +425 @@
 
         if (isset($thisfile_id3v2_flags['isfooter']) && $thisfile_id3v2_flags['isfooter']) {
-            $footer = fread($this->getid3->fp, 10);
+            $footer = $this->fread(10);
             if (substr($footer, 0, 3) == '3DI') {
                 $thisfile_id3v2['footer'] = true;
@@ -643 +644 @@
             $parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)));
             if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
-                $info['id3v2']['comments'][$parsedFrame['framenameshort']][] = trim(getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']));
+                $commentkey = ($parsedFrame['description'] ? $parsedFrame['description'] : (isset($info['id3v2']['comments'][$parsedFrame['framenameshort']]) ? count($info['id3v2']['comments'][$parsedFrame['framenameshort']]) : 0));
+                if (!isset($info['id3v2']['comments'][$parsedFrame['framenameshort']]) || !array_key_exists($commentkey, $info['id3v2']['comments'][$parsedFrame['framenameshort']])) {
+                    $info['id3v2']['comments'][$parsedFrame['framenameshort']][$commentkey] = trim(getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']));
+                } else {
+                    $info['id3v2']['comments'][$parsedFrame['framenameshort']][]            = trim(getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']));
+                }
             }
             //unset($parsedFrame['data']); do not unset, may be needed elsewhere, e.g. for replaygain
@@ -1078 +1084 @@
                 $parsedFrame['data']         = $frame_text;
                 if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
-                    $info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']);
+                    $commentkey = ($parsedFrame['description'] ? $parsedFrame['description'] : (!empty($info['id3v2']['comments'][$parsedFrame['framenameshort']]) ? count($info['id3v2']['comments'][$parsedFrame['framenameshort']]) : 0));
+                    if (!isset($info['id3v2']['comments'][$parsedFrame['framenameshort']]) || !array_key_exists($commentkey, $info['id3v2']['comments'][$parsedFrame['framenameshort']])) {
+                        $info['id3v2']['comments'][$parsedFrame['framenameshort']][$commentkey] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']);
+                    } else {
+                        $info['id3v2']['comments'][$parsedFrame['framenameshort']][]            = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']);
+                    }
                 }
 
@@ -1886 +1897 @@
             $parsedFrame['bitsperpoint'] = ord(substr($parsedFrame['data'], $frame_offset++, 1));
             $frame_bytesperpoint = ceil($parsedFrame['bitsperpoint'] / 8);
-            for ($i = 0; $i < $frame_indexpoints; $i++) {
+            for ($i = 0; $i < $parsedFrame['indexpoints']; $i++) {
                 $parsedFrame['indexes'][$i] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, $frame_bytesperpoint));
                 $frame_offset += $frame_bytesperpoint;
@@ -3412 +3423 @@
 
 }
-