yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-04 18:29:40 +02:00
Code Issues Releases Wiki Activity

Handle BOM empty utf-8 string on song comparison

Browse source
This commit is contained in:
Afterster 2015-10-04 23:53:01 +02:00
parent cfb8599d0e
commit c6d403fe5b
1 changed files with 34 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

39
lib/class/song.class.php
View file

@ -823,7 +823,7 @@ class Song extends database_object implements media, library_item
unset($song->catalog,$song->played,$song->enabled,$song->addition_time,$song->update_time,$song->type); unset($song->catalog,$song->played,$song->enabled,$song->addition_time,$song->update_time,$song->type);
$array = array(); $array = array();
$string_array = array('title','comment','lyrics'); $string_array = array('title','comment','lyrics','composer','tags');
$skip_array = array('id','tag_id','mime','artist_mbid','album_mbid','albumartist_mbid','albumartist','mbid','mb_albumid_group','waveform','object_cnt'); $skip_array = array('id','tag_id','mime','artist_mbid','album_mbid','albumartist_mbid','albumartist','mbid','mb_albumid_group','waveform','object_cnt');
// Pull out all the currently set vars // Pull out all the currently set vars
@ -831,15 +831,33 @@ class Song extends database_object implements media, library_item
// Foreach them // Foreach them
foreach ($fields as $key=>$value) { foreach ($fields as $key=>$value) {
if (in_array($key,$skip_array)) { $key = trim($key);
if (empty($key) || in_array($key,$skip_array)) {
continue; continue;
} }
$songData = is_array($song->$key) ? implode(" ", $song->$key) : $song->$key; // Represent the value as a string for simpler comparaison.
$newSongData = is_array($new_song->$key) ? implode(" ", $new_song->$key) : $new_song->$key; // For array, ensure to sort similarly old/new values
if (is_array($song->$key)) {
$arr = $song->$key;
sort($arr);
$songData = implode(" ", $arr);
} else {
$songData = $song->$key;
}
if (is_array($new_song->$key)) {
$arr = $new_song->$key;
sort($arr);
$newSongData = implode(" ", $arr);
} else {
$newSongData = $new_song->$key;
}
// If it's a stringie thing // If it's a stringie thing
if (in_array($key, $string_array)) { if (in_array($key, $string_array)) {
if (trim(stripslashes($songData)) != trim(stripslashes($newSongData))) { $songData = self::clean_string_field_value($songData);
$newSongData = self::clean_string_field_value($newSongData);
if ($songData != $newSongData) {
$array['change'] = true; $array['change'] = true;
$array['element'][$key] = 'OLD: ' . $songData . ' --> ' . $newSongData; $array['element'][$key] = 'OLD: ' . $songData . ' --> ' . $newSongData;
} }
@ -859,6 +877,17 @@ class Song extends database_object implements media, library_item
return $array; return $array;
} // compare_song_information } // compare_song_information
private static function clean_string_field_value($value)
{
$value = trim(stripslashes(preg_replace('/\s+/', ' ', $value)));
// Strings containing only UTF-8 BOM = empty string
if (strlen($value) == 2 && (ord($value[0]) == 0xFF || ord($value[0]) == 0xFE)) {
$value = "";
}
return $value;
}
/** /**
* update * update