Keep the filemtime for files when downloading them in a zip/tar
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
parent
ca7b9e5490
commit
d2ff6c569e
|
@ -76,8 +76,9 @@ class Streamer {
|
||||||
$file = $dir . '/' . $filename;
|
$file = $dir . '/' . $filename;
|
||||||
if(\OC\Files\Filesystem::is_file($file)) {
|
if(\OC\Files\Filesystem::is_file($file)) {
|
||||||
$filesize = \OC\Files\Filesystem::filesize($file);
|
$filesize = \OC\Files\Filesystem::filesize($file);
|
||||||
|
$fileTime = \OC\Files\Filesystem::filemtime($file);
|
||||||
$fh = \OC\Files\Filesystem::fopen($file, 'r');
|
$fh = \OC\Files\Filesystem::fopen($file, 'r');
|
||||||
$this->addFileFromStream($fh, $internalDir . $filename, $filesize);
|
$this->addFileFromStream($fh, $internalDir . $filename, $filesize, $fileTime);
|
||||||
fclose($fh);
|
fclose($fh);
|
||||||
}elseif(\OC\Files\Filesystem::is_dir($file)) {
|
}elseif(\OC\Files\Filesystem::is_dir($file)) {
|
||||||
$this->addDirRecursive($file, $internalDir);
|
$this->addDirRecursive($file, $internalDir);
|
||||||
|
@ -93,11 +94,18 @@ class Streamer {
|
||||||
* @param int $size Filesize
|
* @param int $size Filesize
|
||||||
* @return bool $success
|
* @return bool $success
|
||||||
*/
|
*/
|
||||||
public function addFileFromStream($stream, $internalName, $size){
|
public function addFileFromStream($stream, $internalName, $size, $time) {
|
||||||
|
$options = [];
|
||||||
|
if ($time) {
|
||||||
|
$options = [
|
||||||
|
'timestamp' => $time
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
if ($this->streamerInstance instanceof ZipStreamer) {
|
if ($this->streamerInstance instanceof ZipStreamer) {
|
||||||
return $this->streamerInstance->addFileFromStream($stream, $internalName);
|
return $this->streamerInstance->addFileFromStream($stream, $internalName, $options);
|
||||||
} else {
|
} else {
|
||||||
return $this->streamerInstance->addFileFromStream($stream, $internalName, $size);
|
return $this->streamerInstance->addFileFromStream($stream, $internalName, $size, $options);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -153,8 +153,9 @@ class OC_Files {
|
||||||
$file = $dir . '/' . $file;
|
$file = $dir . '/' . $file;
|
||||||
if (\OC\Files\Filesystem::is_file($file)) {
|
if (\OC\Files\Filesystem::is_file($file)) {
|
||||||
$fileSize = \OC\Files\Filesystem::filesize($file);
|
$fileSize = \OC\Files\Filesystem::filesize($file);
|
||||||
|
$fileTime = \OC\Files\Filesystem::filemtime($file);
|
||||||
$fh = \OC\Files\Filesystem::fopen($file, 'r');
|
$fh = \OC\Files\Filesystem::fopen($file, 'r');
|
||||||
$streamer->addFileFromStream($fh, basename($file), $fileSize);
|
$streamer->addFileFromStream($fh, basename($file), $fileSize, $fileTime);
|
||||||
fclose($fh);
|
fclose($fh);
|
||||||
} elseif (\OC\Files\Filesystem::is_dir($file)) {
|
} elseif (\OC\Files\Filesystem::is_dir($file)) {
|
||||||
$streamer->addDirRecursive($file);
|
$streamer->addDirRecursive($file);
|
||||||
|
|
Loading…
Reference in New Issue