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

Use mediavorus as core service

Browse Source
This commit is contained in:
Romain Neutron
2012-06-18 15:55:33 +02:00
parent c44f11fc8a
commit 50cf4ab8c8
25 changed files with 66 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/classes/task/period/archive.class.php
View File

@@ -1531,7 +1531,8 @@ class task_period_archive extends task_abstract
$stat1 = '0';
}
$media = MediaVorus::guess(new \SplFileInfo($pathfile));
$core = \bootstrap::getCore();
$media = $core['mediavorus']->guess(new \SplFileInfo($pathfile));
$databox = $collection->get_databox();
$metadatasStructure = $databox->get_meta_structure();
@@ -1597,7 +1598,7 @@ class task_period_archive extends task_abstract
$core = \bootstrap::getCore();
$status = databox_status::operation_or($stat0, $stat1);
$media = MediaVorus::guess(new \SplFileInfo($pathfile));
$media = $core['mediavorus']->guess(new \SplFileInfo($pathfile));
$databox = $collection->get_databox();
$metadatasStructure = $databox->get_meta_structure();

5
lib/classes/task/period/upgradetov31.class.php
View File

@@ -42,7 +42,8 @@ class task_period_upgradetov31 extends task_abstract
{
printf("taskid %s starting." . PHP_EOL, $this->getID());
// task can't be stopped here
$appbox = appbox::get_instance(\bootstrap::getCore());
$core = \bootstrap::getCore();
$appbox = appbox::get_instance($core);
$conn = $appbox->get_connection();
$running = true;
@@ -75,7 +76,7 @@ class task_period_upgradetov31 extends task_abstract
$uuid = uuid::generate_v4();
try {
$media = \MediaVorus\MediaVorus::guess(new \SplFileInfo($pathfile));
$media = $core->guess(new \SplFileInfo($pathfile));
$collection = \collection::get_from_coll_id($databox, $row['coll_id']);
$file = new \Alchemy\Phrasea\Border\File($media, $collection);