franzz/spot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rebuild delta mode

Browse Source
This commit is contained in:
Franzz
2021-08-31 20:21:39 +02:00
parent 9119fcca74
commit f00e0b738f
5 changed files with 362 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
inc/Media.php
View File

@@ -69,16 +69,19 @@ class Media extends PhpObject {
return Spot::getResult(($sError==''), $sError, $asData);
}
public function getMediasInfo($iMediaId=0) {
$bOwnMedia = ($iMediaId > 0);
if($bOwnMedia && empty($this->asMedia) || !$bOwnMedia && empty($this->asMedias)) {
public function getMediasInfo($oMediaIds=null) {
$bOwnMedia = is_numeric($oMediaIds); //1 value
$bConstraintArray = is_array($oMediaIds); //Custom Constraints
if($bOwnMedia && empty($this->asMedia) || !$bOwnMedia && empty($this->asMedias) || $bConstraintArray) {
if($this->oProject->getProjectId()) {
$asParams = array(
'select' => array(Db::getId(self::MEDIA_TABLE), 'filename', 'taken_on', 'posted_on', 'timezone', 'rotate', 'type AS subtype', 'comment'),
'from' => self::MEDIA_TABLE,
'constraint'=> array(Db::getId(Project::PROJ_TABLE) => $this->oProject->getProjectId())
);
if($bOwnMedia) $asParams['constraint'][Db::getId(self::MEDIA_TABLE)] = $iMediaId;
if($bOwnMedia) $asParams['constraint'][Db::getId(self::MEDIA_TABLE)] = $oMediaIds;
if($bConstraintArray) $asParams = array_merge($asParams, $oMediaIds);
$asMedias = $this->oDb->selectRows($asParams);
foreach($asMedias as &$asMedia) {
@@ -86,13 +89,13 @@ class Media extends PhpObject {
$asMedia['thumb_path'] = $this->getMediaThumbnail($asMedia['filename']);
}
if(!empty($asMedias)) {
if(!empty($asMedias) && !$bConstraintArray) {
if($bOwnMedia) $this->asMedia = array_shift($asMedias);
else $this->asMedias = $asMedias;
}
}
}
return $bOwnMedia?$this->asMedia:$this->asMedias;
return $bOwnMedia?$this->asMedia:$asMedias;
}
public function getInfo() {