yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-03 17:59:21 +02:00
Code Issues Releases Wiki Activity

[BUGFIX] Fix some metadata errors

Browse source
This commit is contained in:
René Bigler 2015-11-19 22:56:07 +01:00
parent 61de51ef93
commit e96b0ff073
5 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/class/Metadata/Model/Metadata.php
View file

@ -98,9 +98,9 @@ class Metadata extends \Lib\DatabaseObject implements \Lib\Interfaces\Model
/** /**
* *
* @param \library_item $object * @param integer $object
*/ */
public function setObjectId(\library_item $object) public function setObjectId($object)
{ {
$this->objectId = $object; $this->objectId = $object;
} }

4
lib/class/Repository.php
View file

@ -23,6 +23,8 @@
namespace Lib; namespace Lib;
use Lib\Interfaces\Model;
/** /**
* Description of Repository * Description of Repository
* *
@ -178,7 +180,7 @@ class Repository
* @param string $property * @param string $property
* @param mixed $value * @param mixed $value
*/ */
protected function setPrivateProperty(Object $object, $property, $value) protected function setPrivateProperty(Model $object, $property, $value)
{ {
$reflectionClass = new \ReflectionClass(get_class($object)); $reflectionClass = new \ReflectionClass(get_class($object));
$ReflectionProperty = $reflectionClass->getProperty($property); $ReflectionProperty = $reflectionClass->getProperty($property);

1
lib/class/catalog.class.php
View file

@ -2219,3 +2219,4 @@ abstract class Catalog extends database_object
} }
// end of catalog class // end of catalog class

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

@ -853,6 +853,11 @@ class Song extends database_object implements media, library_item
// Foreach them // Foreach them
foreach ($fields as $key=>$value) { foreach ($fields as $key=>$value) {
// Skip the item if it is no string nor something we can turn into a string
if (!is_string($song->$key) || (is_object($song->$key) && method_exists($song->key, '__toString'))) {
continue;
}
$key = trim($key); $key = trim($key);
if (empty($key) || in_array($key,$skip_array)) { if (empty($key) || in_array($key,$skip_array)) {
continue; continue;
@ -2031,3 +2036,4 @@ class Song extends database_object implements media, library_item
return $deleted; return $deleted;
} }
} // end of song class } // end of song class

16
modules/catalog/local/local.catalog.php
View file

@ -813,16 +813,13 @@ class Catalog_local extends Catalog
*/ */
protected function getCleanMetadata(library_item $libraryItem, $metadata) protected function getCleanMetadata(library_item $libraryItem, $metadata)
{ {
$tags = array_diff($metadata, get_object_vars($libraryItem)); $tags = array_diff_key(
$keys = array_merge( $metadata,
isset($libraryItem::$aliases) ? $libraryItem::$aliases : array(), get_object_vars($libraryItem),
array_keys(get_object_vars($libraryItem)) array_flip($libraryItem::$aliases ?: array())
); );
foreach ($keys as $key) {
unset($tags[$key]);
}
return $tags; return array_filter($tags);
} }
/** /**
@ -861,7 +858,7 @@ class Catalog_local extends Catalog
$tags = $this->getCleanMetadata($media, $results); $tags = $this->getCleanMetadata($media, $results);
if (method_exists($media, 'updateOrInsertMetadata') && $media::isCustomMetadataEnabled()) { if (method_exists($media, 'updateOrInsertMetadata') && $media::isCustomMetadataEnabled()) {
$tags = array_diff_key($results, array_flip($media->getDisabledMetadataFields())); $tags = array_diff_key($tags, array_flip($media->getDisabledMetadataFields()));
foreach ($tags as $tag => $value) { foreach ($tags as $tag => $value) {
$field = $media->getField($tag); $field = $media->getField($tag);
$media->updateOrInsertMetadata($field, $value); $media->updateOrInsertMetadata($field, $value);
@ -869,3 +866,4 @@ class Catalog_local extends Catalog
} }
} }
} // end of local catalog class } // end of local catalog class