hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #64 from romainneutron/APISubdefRoute

Browse Source 
Add options to the API embed route
This commit is contained in:
Romain
2012-05-03 06:09:30 -07:00
parent b186e11303 871a0eeeb8
commit 4d055f9b51
4 changed files with 115 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/classes/API/V1/adapter.class.php
View File

@@ -451,7 +451,11 @@ class API_V1_adapter extends API_V1_Abstract
$record = $this->appbox->get_databox($databox_id)->get_record($record_id);
$ret = array();
foreach ($record->get_embedable_medias() as $name => $media) {
$devices = $request->get('devices', array());
$mimes = $request->get('mimes', array());
foreach ($record->get_embedable_medias($devices, $mimes) as $name => $media) {
$ret[$name] = $this->list_embedable_media($media, $this->appbox->get_registry());
}
@@ -1117,7 +1121,6 @@ class API_V1_adapter extends API_V1_Abstract
* @todo ajouter une option pour avoir les values serialisées
* dans un cas multi
*/
return array(
'meta_id' => $value->getId(),
'meta_structure_id' => $field->get_meta_struct_id(),

40
lib/classes/record/adapter.class.php
View File

@@ -354,9 +354,10 @@ class record_adapter implements record_Interface, cache_cacheableInterface
*
* @return Array
*/
public function get_embedable_medias()
public function get_embedable_medias($devices = null, $mimes = null)
{
return $this->get_subdefs();
return $this->getSubdfefByDeviceAndMime($devices, $mimes);
}
/**
@@ -610,22 +611,35 @@ class record_adapter implements record_Interface, cache_cacheableInterface
*/
public function getSubdfefByDeviceAndMime($devices = null, $mimes = null)
{
$subdefNames = array();
$subdefNames = $subdefs = array();
$searchDevices = array_merge((array) $devices, databox_subdef::DEVICE_ALL);
$availableSubdefs = $this->get_subdefs();
foreach ($this->databox->get_subdef_structure() as $databoxSubdef) {
if (isset($availableSubdefs['document'])) {
if ($devices && ! array_intersect($databoxSubdef->getDevices(), $searchDevices)) {
continue;
$mime_ok = ! $mimes || in_array($availableSubdefs['document']->get_mime(), (array) $mime);
$devices_ok = ! $devices || array_intersect($availableSubdefs['document']->getDevices(), (array) $devices);
if ($mime_ok && $devices_ok) {
$subdefs['document'] = $availableSubdefs['document'];
}
array_push($subdefNames, $databoxSubdef->get_name());
}
$subdefs = array();
$searchDevices = array_merge((array) $devices, (array) databox_subdef::DEVICE_ALL);
foreach ($this->get_subdefs() as $subdef) {
foreach ($this->databox->get_subdef_structure() as $databoxSubdefs) {
foreach ($databoxSubdefs as $databoxSubdef) {
if ($devices && ! array_intersect($databoxSubdef->getDevices(), $searchDevices)) {
continue;
}
array_push($subdefNames, $databoxSubdef->get_name());
}
}
foreach ($availableSubdefs as $subdef) {
if ( ! in_array($subdef->get_name(), $subdefNames)) {
continue;
@@ -639,7 +653,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
continue;
}
$subdefs[] = $subdef;
$subdefs[$subdef->get_name()] = $subdef;
}
return $subdefs;
@@ -1650,7 +1664,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
$this->generate_subdef($subdef, $pathdest);
if (file_exists($pathdest)) {
$baseurl = $subdef->get_baseurl() ? $subdef->get_baseurl() . substr(dirname($pathdest), strlen($subdef->get_path()) + 1) : '';
$baseurl = $subdef->get_baseurl() ? $subdef->get_baseurl() . substr(dirname($pathdest), strlen($subdef->get_path())) : '';
media_subdef::create($this, $subdef->get_name(), new system_file($pathdest), $baseurl);
}