From e3b95e8473679c2f65abc84c07d121ea66059aee Mon Sep 17 00:00:00 2001 From: Victor Dubiniuk Date: Wed, 23 Sep 2015 19:00:15 +0300 Subject: Introduce streamer --- lib/private/files.php | 96 ++++++++++++++++++--------------------------------- 1 file changed, 33 insertions(+), 63 deletions(-) (limited to 'lib/private/files.php') diff --git a/lib/private/files.php b/lib/private/files.php index 658e708e5de..638d148adc4 100644 --- a/lib/private/files.php +++ b/lib/private/files.php @@ -57,20 +57,15 @@ class OC_Files { /** * @param string $filename * @param string $name - * @param bool $zip */ - private static function sendHeaders($filename, $name, $zip = false) { + private static function sendHeaders($filename, $name) { OC_Response::setContentDispositionHeader($name, 'attachment'); header('Content-Transfer-Encoding: binary'); OC_Response::disableCaching(); - if ($zip) { - header('Content-Type: application/zip'); - } else { - $filesize = \OC\Files\Filesystem::filesize($filename); - header('Content-Type: '.\OC_Helper::getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename))); - if ($filesize > -1) { - OC_Response::setContentLengthHeader($filesize); - } + $filesize = \OC\Files\Filesystem::filesize($filename); + header('Content-Type: '.\OC_Helper::getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename))); + if ($filesize > -1) { + OC_Response::setContentLengthHeader($filesize); } } @@ -79,9 +74,9 @@ class OC_Files { * * @param string $dir * @param string $files ; separated list of files to download - * @param boolean $only_header ; boolean to only send header of the request + * @param boolean $onlyHeader ; boolean to only send header of the request */ - public static function get($dir, $files, $only_header = false) { + public static function get($dir, $files, $onlyHeader = false) { $view = \OC\Files\Filesystem::getView(); if (is_array($files) && count($files) === 1) { @@ -89,45 +84,48 @@ class OC_Files { } if (is_array($files)) { - $get_type = self::ZIP_FILES; + $getType = self::ZIP_FILES; $basename = basename($dir); if ($basename) { - $name = $basename . '.zip'; + $name = $basename; } else { - $name = 'download.zip'; + $name = 'download'; } $filename = $dir . '/' . $name; } else { $filename = $dir . '/' . $files; if (\OC\Files\Filesystem::is_dir($dir . '/' . $files)) { - $get_type = self::ZIP_DIR; + $getType = self::ZIP_DIR; // downloading root ? if ($files === '') { - $name = 'download.zip'; + $name = 'download'; } else { - $name = $files . '.zip'; + $name = $files; } } else { - $get_type = self::FILE; + $getType = self::FILE; $name = $files; } } - if ($get_type === self::FILE) { - $zip = false; + if ($getType === self::FILE) { + $streamer = false; } else { - $zip = new ZipStreamer\ZipStreamer(); + $streamer = new OC_Streamer(); } OC_Util::obEnd(); try { - if ($get_type === self::FILE) { + if ($getType === self::FILE) { $view->lockFile($filename, ILockingProvider::LOCK_SHARED); } - if ($zip or \OC\Files\Filesystem::isReadable($filename)) { - self::sendHeaders($filename, $name, $zip); + + if ($streamer) { + $streamer->sendHeaders($name); + } elseif (\OC\Files\Filesystem::isReadable($filename)) { + self::sendHeaders($filename, $name); } elseif (!\OC\Files\Filesystem::file_exists($filename)) { header("HTTP/1.0 404 Not Found"); $tmpl = new OC_Template('', '404', 'guest'); @@ -137,33 +135,34 @@ class OC_Files { header("HTTP/1.0 403 Forbidden"); die('403 Forbidden'); } - if ($only_header) { + if ($onlyHeader) { return; } - if ($zip) { + if ($streamer) { $executionTime = intval(ini_get('max_execution_time')); set_time_limit(0); - if ($get_type === self::ZIP_FILES) { + if ($getType === self::ZIP_FILES) { foreach ($files as $file) { $file = $dir . '/' . $file; if (\OC\Files\Filesystem::is_file($file)) { + $fileSize = \OC\Files\Filesystem::filesize($file); $fh = \OC\Files\Filesystem::fopen($file, 'r'); - $zip->addFileFromStream($fh, basename($file)); + $streamer->addFileFromStream($fh, basename($file), $fileSize); fclose($fh); } elseif (\OC\Files\Filesystem::is_dir($file)) { - self::zipAddDir($file, $zip); + $streamer->addDirRecoursive($file); } } - } elseif ($get_type === self::ZIP_DIR) { + } elseif ($getType === self::ZIP_DIR) { $file = $dir . '/' . $files; - self::zipAddDir($file, $zip); + $streamer->addDirRecoursive($file); } - $zip->finalize(); + $streamer->finalize(); set_time_limit($executionTime); } else { \OC\Files\Filesystem::readfile($filename); } - if ($get_type === self::FILE) { + if ($getType === self::FILE) { $view->unlockFile($filename, ILockingProvider::LOCK_SHARED); } } catch (\OCP\Lock\LockedException $ex) { @@ -177,35 +176,6 @@ class OC_Files { } } - /** - * @param string $dir - * @param ZipStreamer $zip - * @param string $internalDir - */ - public static function zipAddDir($dir, ZipStreamer $zip, $internalDir='') { - $dirname=basename($dir); - $rootDir = $internalDir.$dirname; - if (!empty($rootDir)) { - $zip->addEmptyDir($rootDir); - } - $internalDir.=$dirname.='/'; - // prevent absolute dirs - $internalDir = ltrim($internalDir, '/'); - - $files=\OC\Files\Filesystem::getDirectoryContent($dir); - foreach($files as $file) { - $filename=$file['name']; - $file=$dir.'/'.$filename; - if(\OC\Files\Filesystem::is_file($file)) { - $fh = \OC\Files\Filesystem::fopen($file, 'r'); - $zip->addFileFromStream($fh, $internalDir.$filename); - fclose($fh); - }elseif(\OC\Files\Filesystem::is_dir($file)) { - self::zipAddDir($file, $zip, $internalDir); - } - } - } - /** * set the maximum upload size limit for apache hosts using .htaccess * -- cgit v1.2.3 From 28df7be3192560b1b3616b98a5a1f057410ebab0 Mon Sep 17 00:00:00 2001 From: Victor Dubiniuk Date: Thu, 24 Sep 2015 01:08:42 +0300 Subject: Add namespace. Fix broken zip --- lib/private/files.php | 3 ++- lib/private/streamer.php | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'lib/private/files.php') diff --git a/lib/private/files.php b/lib/private/files.php index 638d148adc4..21b3cd1d409 100644 --- a/lib/private/files.php +++ b/lib/private/files.php @@ -41,6 +41,7 @@ */ use OC\Lock\NoopLockingProvider; +use OC\Streamer; use OCP\Lock\ILockingProvider; /** @@ -113,7 +114,7 @@ class OC_Files { if ($getType === self::FILE) { $streamer = false; } else { - $streamer = new OC_Streamer(); + $streamer = new Streamer(); } OC_Util::obEnd(); diff --git a/lib/private/streamer.php b/lib/private/streamer.php index aec5fb922ee..b530961afd2 100644 --- a/lib/private/streamer.php +++ b/lib/private/streamer.php @@ -19,10 +19,12 @@ * */ -use \ZipStreamer\ZipStreamer; +namespace OC; + +use ZipStreamer\ZipStreamer; use DeepDiver1975\TarStreamer\TarStreamer; -class OC_Streamer { +class Streamer { // array of regexp. Matching user agents will get tar instead of zip private $preferTarFor = [ '/macintosh|mac os x/i' ]; @@ -36,7 +38,7 @@ class OC_Streamer { /** @var \OCP\IRequest */ $request = \OC::$server->getRequest(); - if ($request->isUserAgent($this->preferTar)) { + if ($request->isUserAgent($this->preferTarFor)) { $this->streamerInstance = new TarStreamer(); } else { $this->streamerInstance = new ZipStreamer(); @@ -75,7 +77,7 @@ class OC_Streamer { if(\OC\Files\Filesystem::is_file($file)) { $filesize = \OC\Files\Filesystem::filesize($file); $fh = \OC\Files\Filesystem::fopen($file, 'r'); - $this->streamerInstance->addFileFromStream($fh, $internalDir . $filename, $filesize); + $this->addFileFromStream($fh, $internalDir . $filename, $filesize); fclose($fh); }elseif(\OC\Files\Filesystem::is_dir($file)) { $this->addDirRecoursive($file, $internalDir); -- cgit v1.2.3 From 027fb4e3fe44f3ca075c96258afe55438f98dd6c Mon Sep 17 00:00:00 2001 From: Victor Dubiniuk Date: Thu, 24 Sep 2015 18:23:10 +0300 Subject: More corrections --- lib/private/files.php | 4 ++-- lib/private/streamer.php | 14 +++++--------- 2 files changed, 7 insertions(+), 11 deletions(-) (limited to 'lib/private/files.php') diff --git a/lib/private/files.php b/lib/private/files.php index 21b3cd1d409..86ebf40cc57 100644 --- a/lib/private/files.php +++ b/lib/private/files.php @@ -151,12 +151,12 @@ class OC_Files { $streamer->addFileFromStream($fh, basename($file), $fileSize); fclose($fh); } elseif (\OC\Files\Filesystem::is_dir($file)) { - $streamer->addDirRecoursive($file); + $streamer->addDirRecursive($file); } } } elseif ($getType === self::ZIP_DIR) { $file = $dir . '/' . $files; - $streamer->addDirRecoursive($file); + $streamer->addDirRecursive($file); } $streamer->finalize(); set_time_limit($executionTime); diff --git a/lib/private/streamer.php b/lib/private/streamer.php index b530961afd2..2502807330b 100644 --- a/lib/private/streamer.php +++ b/lib/private/streamer.php @@ -31,9 +31,6 @@ class Streamer { // streamer instance private $streamerInstance; - /** @var string*/ - private $extension; - public function __construct(){ /** @var \OCP\IRequest */ $request = \OC::$server->getRequest(); @@ -47,12 +44,11 @@ class Streamer { /** * Send HTTP headers - * @param string name - * @return bool + * @param string $name */ public function sendHeaders($name){ $extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar'; - return $this->streamerInstance->sendHeaders($name . $extension); + $this->streamerInstance->sendHeaders($name . $extension); } /** @@ -60,13 +56,13 @@ class Streamer { * @param string $dir * @param string $internalDir */ - public function addDirRecoursive($dir, $internalDir='') { + public function addDirRecursive($dir, $internalDir='') { $dirname = basename($dir); $rootDir = $internalDir . $dirname; if (!empty($rootDir)) { $this->streamerInstance->addEmptyDir($rootDir); } - $internalDir.= $dirname .= '/'; + $internalDir .= $dirname . '/'; // prevent absolute dirs $internalDir = ltrim($internalDir, '/'); @@ -80,7 +76,7 @@ class Streamer { $this->addFileFromStream($fh, $internalDir . $filename, $filesize); fclose($fh); }elseif(\OC\Files\Filesystem::is_dir($file)) { - $this->addDirRecoursive($file, $internalDir); + $this->addDirRecursive($file, $internalDir); } } } -- cgit v1.2.3