wp/wp-includes/ID3/module.tag.lyrics3.php
author ymh <ymh.work@gmail.com>
Mon, 08 Sep 2025 19:44:41 +0200
changeset 23 417f20492bf7
parent 19 3d72ae0968f4
permissions -rw-r--r--
Update Docker configuration and plugin versions - Upgrade MariaDB from 10.6 to 11 with auto-upgrade support - Add WordPress debug environment variable to FPM container - Update PHP-FPM Dockerfile base image - Update Include Mastodon Feed plugin with bug fixes and improvements - Update Portfolio plugin (v2.58) with latest translations and demo data enhancements - Remove old README.md from Mastodon Feed plugin 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
     1
<?php
16
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
     2
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
     3
/////////////////////////////////////////////////////////////////
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
     4
/// getID3() by James Heinrich <info@getid3.org>               //
16
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
     5
//  available at https://github.com/JamesHeinrich/getID3       //
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
     6
//            or https://www.getid3.org                        //
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
     7
//            or http://getid3.sourceforge.net                 //
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
     8
//  see readme.txt for more details                            //
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
     9
/////////////////////////////////////////////////////////////////
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    10
///                                                            //
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    11
// module.tag.lyrics3.php                                      //
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    12
// module for analyzing Lyrics3 tags                           //
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    13
// dependencies: module.tag.apetag.php (optional)              //
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    14
//                                                            ///
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    15
/////////////////////////////////////////////////////////////////
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    16
16
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
    17
if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
    18
	exit;
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
    19
}
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    20
class getid3_lyrics3 extends getid3_handler
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    21
{
16
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
    22
	/**
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
    23
	 * @return bool
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
    24
	 */
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    25
	public function Analyze() {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    26
		$info = &$this->getid3->info;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    27
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    28
		// http://www.volweb.cz/str/tags.htm
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    29
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    30
		if (!getid3_lib::intValueSupported($info['filesize'])) {
7
cf61fcea0001 resynchronize code repo with production
ymh <ymh.work@gmail.com>
parents: 5
diff changeset
    31
			$this->warning('Unable to check for Lyrics3 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB');
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    32
			return false;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    33
		}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    34
5
5e2f62d02dcd upgrade wordpress + plugins
ymh <ymh.work@gmail.com>
parents: 0
diff changeset
    35
		$this->fseek((0 - 128 - 9 - 6), SEEK_END);          // end - ID3v1 - "LYRICSEND" - [Lyrics3size]
19
3d72ae0968f4 upgrade wordpress to 6.0.2
ymh <ymh.work@gmail.com>
parents: 16
diff changeset
    36
		$lyrics3offset = null;
3d72ae0968f4 upgrade wordpress to 6.0.2
ymh <ymh.work@gmail.com>
parents: 16
diff changeset
    37
		$lyrics3version = null;
3d72ae0968f4 upgrade wordpress to 6.0.2
ymh <ymh.work@gmail.com>
parents: 16
diff changeset
    38
		$lyrics3size   = null;
5
5e2f62d02dcd upgrade wordpress + plugins
ymh <ymh.work@gmail.com>
parents: 0
diff changeset
    39
		$lyrics3_id3v1 = $this->fread(128 + 9 + 6);
16
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
    40
		$lyrics3lsz    = (int) substr($lyrics3_id3v1, 0, 6); // Lyrics3size
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    41
		$lyrics3end    = substr($lyrics3_id3v1,  6,   9); // LYRICSEND or LYRICS200
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    42
		$id3v1tag      = substr($lyrics3_id3v1, 15, 128); // ID3v1
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    43
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    44
		if ($lyrics3end == 'LYRICSEND') {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    45
			// Lyrics3v1, ID3v1, no APE
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    46
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    47
			$lyrics3size    = 5100;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    48
			$lyrics3offset  = $info['filesize'] - 128 - $lyrics3size;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    49
			$lyrics3version = 1;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    50
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    51
		} elseif ($lyrics3end == 'LYRICS200') {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    52
			// Lyrics3v2, ID3v1, no APE
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    53
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    54
			// LSZ = lyrics + 'LYRICSBEGIN'; add 6-byte size field; add 'LYRICS200'
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    55
			$lyrics3size    = $lyrics3lsz + 6 + strlen('LYRICS200');
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    56
			$lyrics3offset  = $info['filesize'] - 128 - $lyrics3size;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    57
			$lyrics3version = 2;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    58
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    59
		} elseif (substr(strrev($lyrics3_id3v1), 0, 9) == strrev('LYRICSEND')) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    60
			// Lyrics3v1, no ID3v1, no APE
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    61
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    62
			$lyrics3size    = 5100;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    63
			$lyrics3offset  = $info['filesize'] - $lyrics3size;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    64
			$lyrics3version = 1;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    65
			$lyrics3offset  = $info['filesize'] - $lyrics3size;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    66
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    67
		} elseif (substr(strrev($lyrics3_id3v1), 0, 9) == strrev('LYRICS200')) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    68
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    69
			// Lyrics3v2, no ID3v1, no APE
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    70
16
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
    71
			$lyrics3size    = (int) strrev(substr(strrev($lyrics3_id3v1), 9, 6)) + 6 + strlen('LYRICS200'); // LSZ = lyrics + 'LYRICSBEGIN'; add 6-byte size field; add 'LYRICS200'
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    72
			$lyrics3offset  = $info['filesize'] - $lyrics3size;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    73
			$lyrics3version = 2;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    74
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    75
		} else {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    76
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    77
			if (isset($info['ape']['tag_offset_start']) && ($info['ape']['tag_offset_start'] > 15)) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    78
5
5e2f62d02dcd upgrade wordpress + plugins
ymh <ymh.work@gmail.com>
parents: 0
diff changeset
    79
				$this->fseek($info['ape']['tag_offset_start'] - 15);
5e2f62d02dcd upgrade wordpress + plugins
ymh <ymh.work@gmail.com>
parents: 0
diff changeset
    80
				$lyrics3lsz = $this->fread(6);
5e2f62d02dcd upgrade wordpress + plugins
ymh <ymh.work@gmail.com>
parents: 0
diff changeset
    81
				$lyrics3end = $this->fread(9);
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    82
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    83
				if ($lyrics3end == 'LYRICSEND') {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    84
					// Lyrics3v1, APE, maybe ID3v1
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    85
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    86
					$lyrics3size    = 5100;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    87
					$lyrics3offset  = $info['ape']['tag_offset_start'] - $lyrics3size;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    88
					$info['avdataend'] = $lyrics3offset;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    89
					$lyrics3version = 1;
7
cf61fcea0001 resynchronize code repo with production
ymh <ymh.work@gmail.com>
parents: 5
diff changeset
    90
					$this->warning('APE tag located after Lyrics3, will probably break Lyrics3 compatability');
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    91
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    92
				} elseif ($lyrics3end == 'LYRICS200') {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    93
					// Lyrics3v2, APE, maybe ID3v1
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    94
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    95
					$lyrics3size    = $lyrics3lsz + 6 + strlen('LYRICS200'); // LSZ = lyrics + 'LYRICSBEGIN'; add 6-byte size field; add 'LYRICS200'
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    96
					$lyrics3offset  = $info['ape']['tag_offset_start'] - $lyrics3size;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    97
					$lyrics3version = 2;
7
cf61fcea0001 resynchronize code repo with production
ymh <ymh.work@gmail.com>
parents: 5
diff changeset
    98
					$this->warning('APE tag located after Lyrics3, will probably break Lyrics3 compatability');
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    99
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   100
				}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   101
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   102
			}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   103
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   104
		}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   105
16
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
   106
		if (isset($lyrics3offset) && isset($lyrics3version) && isset($lyrics3size)) {
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   107
			$info['avdataend'] = $lyrics3offset;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   108
			$this->getLyrics3Data($lyrics3offset, $lyrics3version, $lyrics3size);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   109
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   110
			if (!isset($info['ape'])) {
7
cf61fcea0001 resynchronize code repo with production
ymh <ymh.work@gmail.com>
parents: 5
diff changeset
   111
				if (isset($info['lyrics3']['tag_offset_start'])) {
cf61fcea0001 resynchronize code repo with production
ymh <ymh.work@gmail.com>
parents: 5
diff changeset
   112
					$GETID3_ERRORARRAY = &$info['warning'];
cf61fcea0001 resynchronize code repo with production
ymh <ymh.work@gmail.com>
parents: 5
diff changeset
   113
					getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.apetag.php', __FILE__, true);
cf61fcea0001 resynchronize code repo with production
ymh <ymh.work@gmail.com>
parents: 5
diff changeset
   114
					$getid3_temp = new getID3();
16
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
   115
					$getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
7
cf61fcea0001 resynchronize code repo with production
ymh <ymh.work@gmail.com>
parents: 5
diff changeset
   116
					$getid3_apetag = new getid3_apetag($getid3_temp);
cf61fcea0001 resynchronize code repo with production
ymh <ymh.work@gmail.com>
parents: 5
diff changeset
   117
					$getid3_apetag->overrideendoffset = $info['lyrics3']['tag_offset_start'];
cf61fcea0001 resynchronize code repo with production
ymh <ymh.work@gmail.com>
parents: 5
diff changeset
   118
					$getid3_apetag->Analyze();
cf61fcea0001 resynchronize code repo with production
ymh <ymh.work@gmail.com>
parents: 5
diff changeset
   119
					if (!empty($getid3_temp->info['ape'])) {
cf61fcea0001 resynchronize code repo with production
ymh <ymh.work@gmail.com>
parents: 5
diff changeset
   120
						$info['ape'] = $getid3_temp->info['ape'];
cf61fcea0001 resynchronize code repo with production
ymh <ymh.work@gmail.com>
parents: 5
diff changeset
   121
					}
cf61fcea0001 resynchronize code repo with production
ymh <ymh.work@gmail.com>
parents: 5
diff changeset
   122
					if (!empty($getid3_temp->info['replay_gain'])) {
cf61fcea0001 resynchronize code repo with production
ymh <ymh.work@gmail.com>
parents: 5
diff changeset
   123
						$info['replay_gain'] = $getid3_temp->info['replay_gain'];
cf61fcea0001 resynchronize code repo with production
ymh <ymh.work@gmail.com>
parents: 5
diff changeset
   124
					}
cf61fcea0001 resynchronize code repo with production
ymh <ymh.work@gmail.com>
parents: 5
diff changeset
   125
					unset($getid3_temp, $getid3_apetag);
cf61fcea0001 resynchronize code repo with production
ymh <ymh.work@gmail.com>
parents: 5
diff changeset
   126
				} else {
cf61fcea0001 resynchronize code repo with production
ymh <ymh.work@gmail.com>
parents: 5
diff changeset
   127
					$this->warning('Lyrics3 and APE tags appear to have become entangled (most likely due to updating the APE tags with a non-Lyrics3-aware tagger)');
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   128
				}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   129
			}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   130
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   131
		}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   132
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   133
		return true;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   134
	}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   135
16
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
   136
	/**
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
   137
	 * @param int $endoffset
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
   138
	 * @param int $version
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
   139
	 * @param int $length
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
   140
	 *
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
   141
	 * @return bool
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
   142
	 */
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   143
	public function getLyrics3Data($endoffset, $version, $length) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   144
		// http://www.volweb.cz/str/tags.htm
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   145
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   146
		$info = &$this->getid3->info;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   147
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   148
		if (!getid3_lib::intValueSupported($endoffset)) {
7
cf61fcea0001 resynchronize code repo with production
ymh <ymh.work@gmail.com>
parents: 5
diff changeset
   149
			$this->warning('Unable to check for Lyrics3 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB');
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   150
			return false;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   151
		}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   152
5
5e2f62d02dcd upgrade wordpress + plugins
ymh <ymh.work@gmail.com>
parents: 0
diff changeset
   153
		$this->fseek($endoffset);
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   154
		if ($length <= 0) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   155
			return false;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   156
		}
5
5e2f62d02dcd upgrade wordpress + plugins
ymh <ymh.work@gmail.com>
parents: 0
diff changeset
   157
		$rawdata = $this->fread($length);
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   158
16
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
   159
		$ParsedLyrics3 = array();
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
   160
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   161
		$ParsedLyrics3['raw']['lyrics3version'] = $version;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   162
		$ParsedLyrics3['raw']['lyrics3tagsize'] = $length;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   163
		$ParsedLyrics3['tag_offset_start']      = $endoffset;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   164
		$ParsedLyrics3['tag_offset_end']        = $endoffset + $length - 1;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   165
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   166
		if (substr($rawdata, 0, 11) != 'LYRICSBEGIN') {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   167
			if (strpos($rawdata, 'LYRICSBEGIN') !== false) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   168
7
cf61fcea0001 resynchronize code repo with production
ymh <ymh.work@gmail.com>
parents: 5
diff changeset
   169
				$this->warning('"LYRICSBEGIN" expected at '.$endoffset.' but actually found at '.($endoffset + strpos($rawdata, 'LYRICSBEGIN')).' - this is invalid for Lyrics3 v'.$version);
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   170
				$info['avdataend'] = $endoffset + strpos($rawdata, 'LYRICSBEGIN');
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   171
				$rawdata = substr($rawdata, strpos($rawdata, 'LYRICSBEGIN'));
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   172
				$length = strlen($rawdata);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   173
				$ParsedLyrics3['tag_offset_start'] = $info['avdataend'];
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   174
				$ParsedLyrics3['raw']['lyrics3tagsize'] = $length;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   175
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   176
			} else {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   177
7
cf61fcea0001 resynchronize code repo with production
ymh <ymh.work@gmail.com>
parents: 5
diff changeset
   178
				$this->error('"LYRICSBEGIN" expected at '.$endoffset.' but found "'.substr($rawdata, 0, 11).'" instead');
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   179
				return false;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   180
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   181
			}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   182
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   183
		}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   184
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   185
		switch ($version) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   186
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   187
			case 1:
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   188
				if (substr($rawdata, strlen($rawdata) - 9, 9) == 'LYRICSEND') {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   189
					$ParsedLyrics3['raw']['LYR'] = trim(substr($rawdata, 11, strlen($rawdata) - 11 - 9));
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   190
					$this->Lyrics3LyricsTimestampParse($ParsedLyrics3);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   191
				} else {
7
cf61fcea0001 resynchronize code repo with production
ymh <ymh.work@gmail.com>
parents: 5
diff changeset
   192
					$this->error('"LYRICSEND" expected at '.($this->ftell() - 11 + $length - 9).' but found "'.substr($rawdata, strlen($rawdata) - 9, 9).'" instead');
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   193
					return false;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   194
				}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   195
				break;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   196
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   197
			case 2:
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   198
				if (substr($rawdata, strlen($rawdata) - 9, 9) == 'LYRICS200') {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   199
					$ParsedLyrics3['raw']['unparsed'] = substr($rawdata, 11, strlen($rawdata) - 11 - 9 - 6); // LYRICSBEGIN + LYRICS200 + LSZ
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   200
					$rawdata = $ParsedLyrics3['raw']['unparsed'];
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   201
					while (strlen($rawdata) > 0) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   202
						$fieldname = substr($rawdata, 0, 3);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   203
						$fieldsize = (int) substr($rawdata, 3, 5);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   204
						$ParsedLyrics3['raw'][$fieldname] = substr($rawdata, 8, $fieldsize);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   205
						$rawdata = substr($rawdata, 3 + 5 + $fieldsize);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   206
					}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   207
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   208
					if (isset($ParsedLyrics3['raw']['IND'])) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   209
						$i = 0;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   210
						$flagnames = array('lyrics', 'timestamps', 'inhibitrandom');
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   211
						foreach ($flagnames as $flagname) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   212
							if (strlen($ParsedLyrics3['raw']['IND']) > $i++) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   213
								$ParsedLyrics3['flags'][$flagname] = $this->IntString2Bool(substr($ParsedLyrics3['raw']['IND'], $i, 1 - 1));
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   214
							}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   215
						}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   216
					}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   217
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   218
					$fieldnametranslation = array('ETT'=>'title', 'EAR'=>'artist', 'EAL'=>'album', 'INF'=>'comment', 'AUT'=>'author');
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   219
					foreach ($fieldnametranslation as $key => $value) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   220
						if (isset($ParsedLyrics3['raw'][$key])) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   221
							$ParsedLyrics3['comments'][$value][] = trim($ParsedLyrics3['raw'][$key]);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   222
						}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   223
					}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   224
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   225
					if (isset($ParsedLyrics3['raw']['IMG'])) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   226
						$imagestrings = explode("\r\n", $ParsedLyrics3['raw']['IMG']);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   227
						foreach ($imagestrings as $key => $imagestring) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   228
							if (strpos($imagestring, '||') !== false) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   229
								$imagearray = explode('||', $imagestring);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   230
								$ParsedLyrics3['images'][$key]['filename']     =                                (isset($imagearray[0]) ? $imagearray[0] : '');
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   231
								$ParsedLyrics3['images'][$key]['description']  =                                (isset($imagearray[1]) ? $imagearray[1] : '');
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   232
								$ParsedLyrics3['images'][$key]['timestamp']    = $this->Lyrics3Timestamp2Seconds(isset($imagearray[2]) ? $imagearray[2] : '');
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   233
							}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   234
						}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   235
					}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   236
					if (isset($ParsedLyrics3['raw']['LYR'])) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   237
						$this->Lyrics3LyricsTimestampParse($ParsedLyrics3);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   238
					}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   239
				} else {
7
cf61fcea0001 resynchronize code repo with production
ymh <ymh.work@gmail.com>
parents: 5
diff changeset
   240
					$this->error('"LYRICS200" expected at '.($this->ftell() - 11 + $length - 9).' but found "'.substr($rawdata, strlen($rawdata) - 9, 9).'" instead');
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   241
					return false;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   242
				}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   243
				break;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   244
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   245
			default:
7
cf61fcea0001 resynchronize code repo with production
ymh <ymh.work@gmail.com>
parents: 5
diff changeset
   246
				$this->error('Cannot process Lyrics3 version '.$version.' (only v1 and v2)');
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   247
				return false;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   248
		}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   249
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   250
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   251
		if (isset($info['id3v1']['tag_offset_start']) && ($info['id3v1']['tag_offset_start'] <= $ParsedLyrics3['tag_offset_end'])) {
7
cf61fcea0001 resynchronize code repo with production
ymh <ymh.work@gmail.com>
parents: 5
diff changeset
   252
			$this->warning('ID3v1 tag information ignored since it appears to be a false synch in Lyrics3 tag data');
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   253
			unset($info['id3v1']);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   254
			foreach ($info['warning'] as $key => $value) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   255
				if ($value == 'Some ID3v1 fields do not use NULL characters for padding') {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   256
					unset($info['warning'][$key]);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   257
					sort($info['warning']);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   258
					break;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   259
				}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   260
			}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   261
		}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   262
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   263
		$info['lyrics3'] = $ParsedLyrics3;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   264
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   265
		return true;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   266
	}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   267
16
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
   268
	/**
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
   269
	 * @param string $rawtimestamp
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
   270
	 *
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
   271
	 * @return int|false
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
   272
	 */
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   273
	public function Lyrics3Timestamp2Seconds($rawtimestamp) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   274
		if (preg_match('#^\\[([0-9]{2}):([0-9]{2})\\]$#', $rawtimestamp, $regs)) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   275
			return (int) (($regs[1] * 60) + $regs[2]);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   276
		}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   277
		return false;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   278
	}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   279
16
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
   280
	/**
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
   281
	 * @param array $Lyrics3data
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
   282
	 *
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
   283
	 * @return bool
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
   284
	 */
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   285
	public function Lyrics3LyricsTimestampParse(&$Lyrics3data) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   286
		$lyricsarray = explode("\r\n", $Lyrics3data['raw']['LYR']);
16
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
   287
		$notimestamplyricsarray = array();
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   288
		foreach ($lyricsarray as $key => $lyricline) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   289
			$regs = array();
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   290
			unset($thislinetimestamps);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   291
			while (preg_match('#^(\\[[0-9]{2}:[0-9]{2}\\])#', $lyricline, $regs)) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   292
				$thislinetimestamps[] = $this->Lyrics3Timestamp2Seconds($regs[0]);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   293
				$lyricline = str_replace($regs[0], '', $lyricline);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   294
			}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   295
			$notimestamplyricsarray[$key] = $lyricline;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   296
			if (isset($thislinetimestamps) && is_array($thislinetimestamps)) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   297
				sort($thislinetimestamps);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   298
				foreach ($thislinetimestamps as $timestampkey => $timestamp) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   299
					if (isset($Lyrics3data['synchedlyrics'][$timestamp])) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   300
						// timestamps only have a 1-second resolution, it's possible that multiple lines
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   301
						// could have the same timestamp, if so, append
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   302
						$Lyrics3data['synchedlyrics'][$timestamp] .= "\r\n".$lyricline;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   303
					} else {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   304
						$Lyrics3data['synchedlyrics'][$timestamp] = $lyricline;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   305
					}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   306
				}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   307
			}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   308
		}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   309
		$Lyrics3data['unsynchedlyrics'] = implode("\r\n", $notimestamplyricsarray);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   310
		if (isset($Lyrics3data['synchedlyrics']) && is_array($Lyrics3data['synchedlyrics'])) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   311
			ksort($Lyrics3data['synchedlyrics']);
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   312
		}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   313
		return true;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   314
	}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   315
16
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
   316
	/**
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
   317
	 * @param string $char
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
   318
	 *
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
   319
	 * @return bool|null
a86126ab1dd4 update enmi-conf
ymh <ymh.work@gmail.com>
parents: 7
diff changeset
   320
	 */
0
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   321
	public function IntString2Bool($char) {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   322
		if ($char == '1') {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   323
			return true;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   324
		} elseif ($char == '0') {
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   325
			return false;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   326
		}
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   327
		return null;
d970ebf37754 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   328
	}
7
cf61fcea0001 resynchronize code repo with production
ymh <ymh.work@gmail.com>
parents: 5
diff changeset
   329
}