Refactor files' CacheEntry object creation to call cacheEntryFromData() all the time thus allowing proper casts to be done
Signed-off-by: Frédéric Fortier <frederic.fortier@oronospolytechnique.com>
This commit is contained in:
parent
cc511ac7b8
commit
55a37c1db9
|
@ -197,20 +197,8 @@ class Cache implements ICache {
|
||||||
FROM `*PREFIX*filecache` WHERE `parent` = ? ORDER BY `name` ASC';
|
FROM `*PREFIX*filecache` WHERE `parent` = ? ORDER BY `name` ASC';
|
||||||
$result = $this->connection->executeQuery($sql, [$fileId]);
|
$result = $this->connection->executeQuery($sql, [$fileId]);
|
||||||
$files = $result->fetchAll();
|
$files = $result->fetchAll();
|
||||||
foreach ($files as &$file) {
|
|
||||||
$file['mimetype'] = $this->mimetypeLoader->getMimetypeById($file['mimetype']);
|
|
||||||
$file['mimepart'] = $this->mimetypeLoader->getMimetypeById($file['mimepart']);
|
|
||||||
if ($file['storage_mtime'] == 0) {
|
|
||||||
$file['storage_mtime'] = $file['mtime'];
|
|
||||||
}
|
|
||||||
$file['permissions'] = (int)$file['permissions'];
|
|
||||||
$file['mtime'] = (int)$file['mtime'];
|
|
||||||
$file['storage_mtime'] = (int)$file['storage_mtime'];
|
|
||||||
$file['size'] = 0 + $file['size'];
|
|
||||||
$file['storage'] = (int)$file['storage'];
|
|
||||||
}
|
|
||||||
return array_map(function (array $data) {
|
return array_map(function (array $data) {
|
||||||
return new CacheEntry($data);
|
return self::cacheEntryFromData($data, $this->mimetypeLoader);;
|
||||||
}, $files);
|
}, $files);
|
||||||
} else {
|
} else {
|
||||||
return array();
|
return array();
|
||||||
|
@ -603,22 +591,18 @@ class Cache implements ICache {
|
||||||
|
|
||||||
$sql = '
|
$sql = '
|
||||||
SELECT `fileid`, `storage`, `path`, `parent`, `name`,
|
SELECT `fileid`, `storage`, `path`, `parent`, `name`,
|
||||||
`mimetype`, `mimepart`, `size`, `mtime`, `encrypted`,
|
`mimetype`, `storage_mtime`, `mimepart`, `size`, `mtime`,
|
||||||
`etag`, `permissions`, `checksum`
|
`encrypted`, `etag`, `permissions`, `checksum`
|
||||||
FROM `*PREFIX*filecache`
|
FROM `*PREFIX*filecache`
|
||||||
WHERE `storage` = ? AND `name` ILIKE ?';
|
WHERE `storage` = ? AND `name` ILIKE ?';
|
||||||
$result = $this->connection->executeQuery($sql,
|
$result = $this->connection->executeQuery($sql,
|
||||||
[$this->getNumericStorageId(), $pattern]
|
[$this->getNumericStorageId(), $pattern]
|
||||||
);
|
);
|
||||||
|
|
||||||
$files = [];
|
$files = $result->fetchAll();
|
||||||
while ($row = $result->fetch()) {
|
|
||||||
$row['mimetype'] = $this->mimetypeLoader->getMimetypeById($row['mimetype']);
|
|
||||||
$row['mimepart'] = $this->mimetypeLoader->getMimetypeById($row['mimepart']);
|
|
||||||
$files[] = $row;
|
|
||||||
}
|
|
||||||
return array_map(function(array $data) {
|
return array_map(function(array $data) {
|
||||||
return new CacheEntry($data);
|
return self::cacheEntryFromData($data, $this->mimetypeLoader);
|
||||||
}, $files);
|
}, $files);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -635,18 +619,15 @@ class Cache implements ICache {
|
||||||
} else {
|
} else {
|
||||||
$where = '`mimepart` = ?';
|
$where = '`mimepart` = ?';
|
||||||
}
|
}
|
||||||
$sql = 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `etag`, `permissions`, `checksum`
|
$sql = 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `storage_mtime`, `mtime`, `encrypted`, `etag`, `permissions`, `checksum`
|
||||||
FROM `*PREFIX*filecache` WHERE ' . $where . ' AND `storage` = ?';
|
FROM `*PREFIX*filecache` WHERE ' . $where . ' AND `storage` = ?';
|
||||||
$mimetype = $this->mimetypeLoader->getId($mimetype);
|
$mimetype = $this->mimetypeLoader->getId($mimetype);
|
||||||
$result = $this->connection->executeQuery($sql, array($mimetype, $this->getNumericStorageId()));
|
$result = $this->connection->executeQuery($sql, array($mimetype, $this->getNumericStorageId()));
|
||||||
$files = array();
|
|
||||||
while ($row = $result->fetch()) {
|
$files = $result->fetchAll();
|
||||||
$row['mimetype'] = $this->mimetypeLoader->getMimetypeById($row['mimetype']);
|
|
||||||
$row['mimepart'] = $this->mimetypeLoader->getMimetypeById($row['mimepart']);
|
|
||||||
$files[] = $row;
|
|
||||||
}
|
|
||||||
return array_map(function (array $data) {
|
return array_map(function (array $data) {
|
||||||
return new CacheEntry($data);
|
return self::cacheEntryFromData($data, $this->mimetypeLoader);
|
||||||
}, $files);
|
}, $files);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -661,7 +642,7 @@ class Cache implements ICache {
|
||||||
*/
|
*/
|
||||||
public function searchByTag($tag, $userId) {
|
public function searchByTag($tag, $userId) {
|
||||||
$sql = 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, ' .
|
$sql = 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, ' .
|
||||||
'`mimetype`, `mimepart`, `size`, `mtime`, ' .
|
'`mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, ' .
|
||||||
'`encrypted`, `etag`, `permissions`, `checksum` ' .
|
'`encrypted`, `etag`, `permissions`, `checksum` ' .
|
||||||
'FROM `*PREFIX*filecache` `file`, ' .
|
'FROM `*PREFIX*filecache` `file`, ' .
|
||||||
'`*PREFIX*vcategory_to_object` `tagmap`, ' .
|
'`*PREFIX*vcategory_to_object` `tagmap`, ' .
|
||||||
|
@ -688,12 +669,11 @@ class Cache implements ICache {
|
||||||
$tag
|
$tag
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
$files = array();
|
|
||||||
while ($row = $result->fetch()) {
|
$files = $result->fetchAll();
|
||||||
$files[] = $row;
|
|
||||||
}
|
|
||||||
return array_map(function (array $data) {
|
return array_map(function (array $data) {
|
||||||
return new CacheEntry($data);
|
return self::cacheEntryFromData($data, $this->mimetypeLoader);
|
||||||
}, $files);
|
}, $files);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue