Skip to content

Commit 3c8330a

Browse files
ChristophWurstChristophWurst
committed
Bump christophwurst/id3parser to v0.1.1
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
1 parent 86bfcb2 commit 3c8330a

File tree

8 files changed

+130
-119
lines changed

8 files changed

+130
-119
lines changed

‎christophwurst/id3parser/src/getID3/Tags/getid3_id3v1.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function Analyze() {
3939

4040
// If second-last byte of comment field is null and last byte of comment field is non-null
4141
// then this is ID3v1.1 and the comment field is 28 bytes long and the 30th byte is the track number
42-
if (($id3v1tag{125} === "\x00") && ($id3v1tag{126} !== "\x00")) {
42+
if (($id3v1tag[125] === "\x00") && ($id3v1tag[126] !== "\x00")) {
4343
$ParsedID3v1['track'] = ord(substr($ParsedID3v1['comment'], 29, 1));
4444
$ParsedID3v1['comment'] = substr($ParsedID3v1['comment'], 0, 28);
4545
}

‎christophwurst/id3parser/src/getID3/Tags/getid3_id3v2.php‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ public function Analyze() {
5151
$header = $this->fread(10);
5252
if (substr($header, 0, 3) == 'ID3' && strlen($header) == 10) {
5353

54-
$thisfile_id3v2['majorversion'] = ord($header{3});
55-
$thisfile_id3v2['minorversion'] = ord($header{4});
54+
$thisfile_id3v2['majorversion'] = ord($header[3]);
55+
$thisfile_id3v2['minorversion'] = ord($header[4]);
5656

5757
// shortcut
5858
$id3v2_majorversion = &$thisfile_id3v2['majorversion'];
@@ -71,7 +71,7 @@ public function Analyze() {
7171

7272
}
7373

74-
$id3_flags = ord($header{5});
74+
$id3_flags = ord($header[5]);
7575
switch ($id3v2_majorversion) {
7676
case 2:
7777
// %ab000000 in v2.2
@@ -204,7 +204,6 @@ public function Analyze() {
204204
$thisfile_id3v2['exthead']['flags']['restrictions'] = (bool) ($thisfile_id3v2['exthead']['flag_raw'] & 0x10);
205205

206206
if ($thisfile_id3v2['exthead']['flags']['update']) {
207-
$ext_header_chunk_length = getid3_lib::BigEndian2Int(substr($framedata, $extended_header_offset, 1)); // should be 0
208207
$extended_header_offset += 1;
209208
}
210209

@@ -216,7 +215,6 @@ public function Analyze() {
216215
}
217216

218217
if ($thisfile_id3v2['exthead']['flags']['restrictions']) {
219-
$ext_header_chunk_length = getid3_lib::BigEndian2Int(substr($framedata, $extended_header_offset, 1)); // should be 1
220218
$extended_header_offset += 1;
221219

222220
// %ppqrrstt
@@ -252,7 +250,7 @@ public function Analyze() {
252250
$thisfile_id3v2['padding']['length'] = strlen($framedata);
253251
$thisfile_id3v2['padding']['valid'] = true;
254252
for ($i = 0; $i < $thisfile_id3v2['padding']['length']; $i++) {
255-
if ($framedata{$i} != "\x00") {
253+
if ($framedata[$i] != "\x00") {
256254
$thisfile_id3v2['padding']['valid'] = false;
257255
$thisfile_id3v2['padding']['errorpos'] = $thisfile_id3v2['padding']['start'] + $i;
258256
$info['warning'][] = 'Invalid ID3v2 padding found at offset '.$thisfile_id3v2['padding']['errorpos'].' (the remaining '.($thisfile_id3v2['padding']['length'] - $i).' bytes are considered invalid)';
@@ -314,7 +312,7 @@ public function Analyze() {
314312

315313
$len = strlen($framedata);
316314
for ($i = 0; $i < $len; $i++) {
317-
if ($framedata{$i} != "\x00") {
315+
if ($framedata[$i] != "\x00") {
318316
$thisfile_id3v2['padding']['valid'] = false;
319317
$thisfile_id3v2['padding']['errorpos'] = $thisfile_id3v2['padding']['start'] + $i;
320318
$info['warning'][] = 'Invalid ID3v2 padding found at offset '.$thisfile_id3v2['padding']['errorpos'].' (the remaining '.($thisfile_id3v2['padding']['length'] - $i).' bytes are considered invalid)';
@@ -422,11 +420,11 @@ public function Analyze() {
422420
$footer = $this->fread(10);
423421
if (substr($footer, 0, 3) == '3DI') {
424422
$thisfile_id3v2['footer'] = true;
425-
$thisfile_id3v2['majorversion_footer'] = ord($footer{3});
426-
$thisfile_id3v2['minorversion_footer'] = ord($footer{4});
423+
$thisfile_id3v2['majorversion_footer'] = ord($footer[3]);
424+
$thisfile_id3v2['minorversion_footer'] = ord($footer[4]);
427425
}
428426
if ($thisfile_id3v2['majorversion_footer'] <= 4) {
429-
$id3_flags = ord(substr($footer{5}));
427+
$id3_flags = ord(substr($footer[5]));
430428
$thisfile_id3v2_flags['unsynch_footer'] = (bool) ($id3_flags & 0x80);
431429
$thisfile_id3v2_flags['extfoot_footer'] = (bool) ($id3_flags & 0x40);
432430
$thisfile_id3v2_flags['experim_footer'] = (bool) ($id3_flags & 0x20);
@@ -648,7 +646,7 @@ public function ParseID3v2Frame(&$parsedFrame) {
648646
//unset($parsedFrame['data']); do not unset, may be needed elsewhere, e.g. for replaygain
649647

650648

651-
} elseif ($parsedFrame['frame_name']{0} == 'T') { // 4.2. T??[?] Text information frame
649+
} elseif ($parsedFrame['frame_name'][0] == 'T') { // 4.2. T??[?] Text information frame
652650
// There may only be one text information frame of its kind in an tag.
653651
// <Header for 'Text information frame', ID: 'T000' - 'TZZZ',
654652
// excluding 'TXXX' described in 4.2.6.>
@@ -750,7 +748,7 @@ public function ParseID3v2Frame(&$parsedFrame) {
750748
unset($parsedFrame['data']);
751749

752750

753-
} elseif ($parsedFrame['frame_name']{0} == 'W') { // 4.3. W??? URL link frames
751+
} elseif ($parsedFrame['frame_name'][0] == 'W') { // 4.3. W??? URL link frames
754752
// There may only be one URL link frame of its kind in a tag,
755753
// except when stated otherwise in the frame description
756754
// <Header for 'URL link frame', ID: 'W000' - 'WZZZ', excluding 'WXXX'
@@ -817,15 +815,13 @@ public function ParseID3v2Frame(&$parsedFrame) {
817815
}
818816
} elseif ((count($IPLS_parts_unsorted) % 2) == 0) {
819817
$position = '';
820-
$person = '';
821818
foreach ($IPLS_parts_unsorted as $key => $value) {
822819
if (($key % 2) == 0) {
823820
$position = $value;
824821
} else {
825822
$person = $value;
826823
$IPLS_parts[] = array('position'=>$position, 'person'=>$person);
827824
$position = '';
828-
$person = '';
829825
}
830826
}
831827
} else {
@@ -901,6 +897,7 @@ public function ParseID3v2Frame(&$parsedFrame) {
901897
$parsedFrame['bitsforbytesdeviation'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], 8, 1));
902898
$parsedFrame['bitsformsdeviation'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], 9, 1));
903899
$parsedFrame['data'] = substr($parsedFrame['data'], 10);
900+
$deviationbitstream = '';
904901
while ($frame_offset < strlen($parsedFrame['data'])) {
905902
$deviationbitstream .= getid3_lib::BigEndian2Bin(substr($parsedFrame['data'], $frame_offset++, 1));
906903
}
@@ -969,7 +966,6 @@ public function ParseID3v2Frame(&$parsedFrame) {
969966
$parsedFrame['encodingid'] = $frame_textencoding;
970967
$parsedFrame['encoding'] = $this->TextEncodingNameLookup($frame_textencoding);
971968

972-
$parsedFrame['data'] = $parsedFrame['data'];
973969
$parsedFrame['language'] = $frame_language;
974970
$parsedFrame['languagename'] = $this->LanguageLookup($frame_language, false);
975971
$parsedFrame['description'] = $frame_description;
@@ -1025,7 +1021,7 @@ public function ParseID3v2Frame(&$parsedFrame) {
10251021
$parsedFrame['lyrics'][$timestampindex]['data'] = substr($frame_remainingdata, $frame_offset, $frame_terminatorpos - $frame_offset);
10261022

10271023
$frame_remainingdata = substr($frame_remainingdata, $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)));
1028-
if (($timestampindex == 0) && (ord($frame_remainingdata{0}) != 0)) {
1024+
if (($timestampindex == 0) && (ord($frame_remainingdata[0]) != 0)) {
10291025
// timestamp probably omitted for first data item
10301026
} else {
10311027
$parsedFrame['lyrics'][$timestampindex]['timestamp'] = getid3_lib::BigEndian2Int(substr($frame_remainingdata, 0, 4));
@@ -1212,7 +1208,6 @@ public function ParseID3v2Frame(&$parsedFrame) {
12121208
}
12131209
$frame_offset += $frame_bytesvolume;
12141210
$parsedFrame['peakvolume']['bass'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, $frame_bytesvolume));
1215-
$frame_offset += $frame_bytesvolume;
12161211
}
12171212
}
12181213
unset($parsedFrame['data']);
@@ -1306,7 +1301,7 @@ public function ParseID3v2Frame(&$parsedFrame) {
13061301
$parsedFrame['feedbackRR'] = ord(substr($parsedFrame['data'], $frame_offset++, 1));
13071302
$parsedFrame['feedbackRL'] = ord(substr($parsedFrame['data'], $frame_offset++, 1));
13081303
$parsedFrame['premixLR'] = ord(substr($parsedFrame['data'], $frame_offset++, 1));
1309-
$parsedFrame['premixRL'] = ord(substr($parsedFrame['data'], $frame_offset++, 1));
1304+
$parsedFrame['premixRL'] = ord(substr($parsedFrame['data'], $frame_offset, 1));
13101305
unset($parsedFrame['data']);
13111306

13121307

@@ -1552,7 +1547,7 @@ public function ParseID3v2Frame(&$parsedFrame) {
15521547
$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
15531548
$frame_ownerid = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
15541549
if (ord($frame_ownerid) === 0) {
1555-
$frame_ownerid == '';
1550+
$frame_ownerid = '';
15561551
}
15571552
$frame_offset = $frame_terminatorpos + strlen("\x00");
15581553
$parsedFrame['ownerid'] = $frame_ownerid;
@@ -1878,7 +1873,6 @@ public function ParseID3v2Frame(&$parsedFrame) {
18781873
$rg_track_adjustment = getid3_lib::Dec2Bin(substr($parsedFrame['data'], $frame_offset, 2));
18791874
$frame_offset += 2;
18801875
$rg_album_adjustment = getid3_lib::Dec2Bin(substr($parsedFrame['data'], $frame_offset, 2));
1881-
$frame_offset += 2;
18821876
$parsedFrame['raw']['track']['name'] = getid3_lib::Bin2Dec(substr($rg_track_adjustment, 0, 3));
18831877
$parsedFrame['raw']['track']['originator'] = getid3_lib::Bin2Dec(substr($rg_track_adjustment, 3, 3));
18841878
$parsedFrame['raw']['track']['signbit'] = getid3_lib::Bin2Dec(substr($rg_track_adjustment, 6, 1));
@@ -3334,10 +3328,10 @@ public static function IsValidID3v2FrameName($framename, $id3v2majorversion) {
33343328

33353329
public static function IsANumber($numberstring, $allowdecimal=false, $allownegative=false) {
33363330
for ($i = 0; $i < strlen($numberstring); $i++) {
3337-
if ((chr($numberstring{$i}) < chr('0')) || (chr($numberstring{$i}) > chr('9'))) {
3338-
if (($numberstring{$i} == '.') && $allowdecimal) {
3331+
if ((chr($numberstring[$i]) < chr('0')) || (chr($numberstring[$i]) > chr('9'))) {
3332+
if (($numberstring[$i] == '.') && $allowdecimal) {
33393333
// allowed
3340-
} elseif (($numberstring{$i} == '-') && $allownegative && ($i == 0)) {
3334+
} elseif (($numberstring[$i] == '-') && $allownegative && ($i == 0)) {
33413335
// allowed
33423336
} else {
33433337
return false;

0 commit comments

Comments
 (0)