cvs: pear /File_Archive Archive.php package.xml /File_Archive/Archive Predicate.php Reader.php /File_Archive/Archive/Reader Ar.php Bzip2.php
ChangeName.php Concat.php Directory.php Filter.php Gzip.php Multi.php Select.php Tar.php Uncompress.php Zip.php /File_Archive/Archive/Writer Ar.php
MemoryArchive.php Tar.php Zip.php

From: Date: Thu, 26 May 2005 21:30:19 +0000
Subject: cvs: pear /File_Archive Archive.php package.xml /File_Archive/Archive Predicate.php Reader.php /File_Archive/Archive/Reader Ar.php Bzip2.php
ChangeName.php Concat.php Directory.php Filter.php Gzip.php Multi.php Select.php Tar.php Uncompress.php Zip.php /File_Archive/Archive/Writer Ar.php
MemoryArchive.php Tar.php Zip.php
Groups: php.pear.cvs 
Request: Send a blank email to pear-cvs+get-32144@lists.php.net to get a copy of this message
vincentlascaux Thu May 26 17:30:19 2005 EDT Modified files: /pear/File_Archive Archive.php package.xml /pear/File_Archive/Archive Predicate.php Reader.php /pear/File_Archive/Archive/Reader Ar.php Bzip2.php ChangeName.php Concat.php Directory.php Filter.php Gzip.php Multi.php Select.php Tar.php Uncompress.php Zip.php /pear/File_Archive/Archive/Writer Ar.php MemoryArchive.php Tar.php Zip.php Log: + Prepare for release + Use complete path for any require_once

http://cvs.php.net/diff.php/pear/File_Archive/Archive.php?r1=1.49&r2=1.50&ty=u Index: pear/File_Archive/Archive.php diff -u pear/File_Archive/Archive.php:1.49 pear/File_Archive/Archive.php:1.50 --- pear/File_Archive/Archive.php:1.49 Thu May 26 13:11:07 2005 +++ pear/File_Archive/Archive.php Thu May 26 17:30:18 2005 @@ -27,7 +27,7 @@ * @author Vincent Lascaux <vincentlascaux@php.net> * @copyright 1997-2005 The PHP Group * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version CVS: $Id: Archive.php,v 1.49 2005/05/26 17:11:07 vincentlascaux Exp $ + * @version CVS: $Id: Archive.php,v 1.50 2005/05/26 21:30:18 vincentlascaux Exp $ * @link http://pear.php.net/package/File_Archive */ @@ -163,8 +163,8 @@ return $source; } - require_once "Archive/Reader/Uncompress.php"; - require_once "Archive/Reader/ChangeName.php"; + require_once "File/Archive/Reader/Uncompress.php"; + require_once "File/Archive/Reader/ChangeName.php"; //No need to un compress more than $directoryDepth //That's not perfect, and some archives will still be uncompressed just @@ -191,14 +191,14 @@ //If the URL can be interpreted as a directory, and we are reading from the file system if ((empty($URL) || is_dir($URL)) && $source == null) { - require_once "Archive/Reader/Directory.php"; + require_once "File/Archive/Reader/Directory.php"; $result = new File_Archive_Reader_Uncompress( new File_Archive_Reader_Directory($std, '', $directoryDepth), $uncompressionLevel ); if ($directoryDepth >= 0) { - require_once "Archive/Predicate/MaxDepth.php"; + require_once "File/Archive/Predicate/MaxDepth.php"; $tmp = new File_Archive_Reader_Filter( new File_Archive_Predicate_MaxDepth($directoryDepth), @@ -221,12 +221,12 @@ //If the URL can be interpreted as a file, and we are reading from the file system } else if (is_file($URL) && substr($URL, -1)!='/' && $source == null) { - require_once "Archive/Reader/File.php"; + require_once "File/Archive/Reader/File.php"; return new File_Archive_Reader_File($URL, $realSymbolic); //Else, we will have to build a complex reader } else { - require_once "Archive/Reader/File.php"; + require_once "File/Archive/Reader/File.php"; $parsedURL = parse_url($std); $realPath = isset($parsedURL['path']) ? $parsedURL['path'] : ''; @@ -294,7 +294,7 @@ } else { //Select in the source the file $file - require_once "Archive/Reader/Select.php"; + require_once "File/Archive/Reader/Select.php"; $result = new File_Archive_Reader_Uncompress( new File_Archive_Reader_Select($file, $source), @@ -313,7 +313,7 @@ if ($directoryDepth >= 0) { //Limit the maximum depth if necessary - require_once "Archive/Predicate/MaxDepth.php"; + require_once "File/Archive/Predicate/MaxDepth.php"; $tmp = new File_Archive_Reader_Filter( new File_Archive_Predicate( @@ -400,26 +400,26 @@ File_Archive::readArchive('bz2', $source, $sourceOpened) ); case 'tar': - require_once "Archive/Reader/Tar.php"; + require_once "File/Archive/Reader/Tar.php"; return new File_Archive_Reader_Tar($source, $sourceOpened); case 'gz': case 'gzip': - require_once "Archive/Reader/Gzip.php"; + require_once "File/Archive/Reader/Gzip.php"; return new File_Archive_Reader_Gzip($source, $sourceOpened); case 'zip': - require_once "Archive/Reader/Zip.php"; + require_once "File/Archive/Reader/Zip.php"; return new File_Archive_Reader_Zip($source, $sourceOpened); case 'bz2': case 'bzip2': - require_once "Archive/Reader/Bzip2.php"; + require_once "File/Archive/Reader/Bzip2.php"; return new File_Archive_Reader_Bzip2($source, $sourceOpened); case 'deb': case 'ar': - require_once "Archive/Reader/Ar.php"; + require_once "File/Archive/Reader/Ar.php"; return new File_Archive_Reader_Ar($source, $sourceOpened); default: return false; @@ -439,7 +439,7 @@ */ function readMemory($memory, $filename, $stat=array(), $mime=null) { - require_once "Archive/Reader/Memory.php"; + require_once "File/Archive/Reader/Memory.php"; return new File_Archive_Reader_Memory($memory, $filename, $stat, $mime); } @@ -455,7 +455,7 @@ */ function readMulti($sources = array()) { - require_once "Archive/Reader/Multi.php"; + require_once "File/Archive/Reader/Multi.php"; $result = new File_Archive_Reader_Multi(); foreach ($sources as $index => $foo) { if (PEAR::isError($sources[$index])) { @@ -488,7 +488,7 @@ */ function readConcat(&$source, $filename, $stat=array(), $mime=null) { - require_once "Archive/Reader/Concat.php"; + require_once "File/Archive/Reader/Concat.php"; return new File_Archive_Reader_Concat($source, $filename, $stat, $mime); } @@ -502,7 +502,7 @@ */ function filter($predicate, $source) { - require_once "Archive/Reader/Filter.php"; + require_once "File/Archive/Reader/Filter.php"; return new File_Archive_Reader_Filter($predicate, $source); } /** @@ -512,7 +512,7 @@ */ function predTrue() { - require_once "Archive/Predicate/True.php"; + require_once "File/Archive/Predicate/True.php"; return new File_Archive_Predicate_True(); } /** @@ -522,7 +522,7 @@ */ function predFalse() { - require_once "Archive/Predicate/False.php"; + require_once "File/Archive/Predicate/False.php"; return new File_Archive_Predicate_False(); } /** @@ -535,7 +535,7 @@ */ function predAnd() { - require_once "Archive/Predicate/And.php"; + require_once "File/Archive/Predicate/And.php"; $pred = new File_Archive_Predicate_And(); $args = func_get_args(); foreach ($args as $p) { @@ -553,7 +553,7 @@ */ function predOr() { - require_once "Archive/Predicate/Or.php"; + require_once "File/Archive/Predicate/Or.php"; $pred = new File_Archive_Predicate_Or(); $args = func_get_args(); foreach ($args as $p) { @@ -569,7 +569,7 @@ */ function predNot($pred) { - require_once "Archive/Predicate/Not.php"; + require_once "File/Archive/Predicate/Not.php"; return new File_Archive_Predicate_Not($pred); } /** @@ -580,7 +580,7 @@ */ function predMinSize($size) { - require_once "Archive/Predicate/MinSize.php"; + require_once "File/Archive/Predicate/MinSize.php"; return new File_Archive_Predicate_MinSize($size); } /** @@ -592,7 +592,7 @@ */ function predMinTime($time) { - require_once "Archive/Predicate/MinTime.php"; + require_once "File/Archive/Predicate/MinTime.php"; return new File_Archive_Predicate_MinTime($time); } /** @@ -604,7 +604,7 @@ */ function predMaxDepth($depth) { - require_once "Archive/Predicate/MaxDepth.php"; + require_once "File/Archive/Predicate/MaxDepth.php"; return new File_Archive_Predicate_MaxDepth($depth); } /** @@ -616,7 +616,7 @@ */ function predExtension($list) { - require_once "Archive/Predicate/Extension.php"; + require_once "File/Archive/Predicate/Extension.php"; return new File_Archive_Predicate_Extension($list); } /** @@ -629,7 +629,7 @@ */ function predMIME($list) { - require_once "Archive/Predicate/MIME.php"; + require_once "File/Archive/Predicate/MIME.php"; return new File_Archive_Predicate_MIME($list); } /** @@ -641,7 +641,7 @@ */ function predEreg($ereg) { - require_once "Archive/Predicate/Ereg.php"; + require_once "File/Archive/Predicate/Ereg.php"; return new File_Archive_Predicate_Ereg($ereg); } /** @@ -653,7 +653,7 @@ */ function predEregi($ereg) { - require_once "Archive/Predicate/Eregi.php"; + require_once "File/Archive/Predicate/Eregi.php"; return new File_Archive_Predicate_Eregi($ereg); } /** @@ -680,7 +680,7 @@ */ function predCustom($expression) { - require_once "Archive/Predicate/Custom.php"; + require_once "File/Archive/Predicate/Custom.php"; return new File_Archive_Predicate_Custom($expression); } @@ -697,7 +697,7 @@ */ function toMail($to, $headers, $message, $mail = null) { - require_once "Archive/Writer/Mail.php"; + require_once "File/Archive/Writer/Mail.php"; return new File_Archive_Writer_Mail($to, $headers, $message, $mail); } /** @@ -710,7 +710,7 @@ */ function toFiles($baseDir = "") { - require_once "Archive/Writer/Files.php"; + require_once "File/Archive/Writer/Files.php"; return new File_Archive_Writer_Files($baseDir); } /** @@ -734,7 +734,7 @@ } function toVariable(&$v) { - require_once "Archive/Writer/Memory.php"; + require_once "File/Archive/Writer/Memory.php"; return new File_Archive_Writer_Memory($v); } /** @@ -752,7 +752,7 @@ return $b; } - require_once "Archive/Writer/Multi.php"; + require_once "File/Archive/Writer/Multi.php"; return new File_Archive_Writer_Multi($a, $b); } /** @@ -765,7 +765,7 @@ */ function toOutput($sendHeaders = true) { - require_once "Archive/Writer/Output.php"; + require_once "File/Archive/Writer/Output.php"; return new File_Archive_Writer_Output($sendHeaders); } /** @@ -808,14 +808,14 @@ unset($next); switch($extension) { case "tar": - require_once "Archive/Writer/Tar.php"; + require_once "File/Archive/Writer/Tar.php"; $next = new File_Archive_Writer_Tar( $currentFilename, $writer, $stat, $autoClose ); unset($writer); $writer =& $next; break; case "zip": - require_once "Archive/Writer/Zip.php"; + require_once "File/Archive/Writer/Zip.php"; $next = new File_Archive_Writer_Zip( $currentFilename, $writer, $stat, $autoClose ); @@ -823,7 +823,7 @@ break; case "gz": case "gzip": - require_once "Archive/Writer/Gzip.php"; + require_once "File/Archive/Writer/Gzip.php"; $next = new File_Archive_Writer_Gzip( $currentFilename, $writer, $stat, $autoClose ); @@ -831,7 +831,7 @@ break; case "bz2": case "bzip2": - require_once "Archive/Writer/Bzip2.php"; + require_once "File/Archive/Writer/Bzip2.php"; $next = new File_Archive_Writer_Bzip2( $currentFilename, $writer, $stat, $autoClose ); @@ -839,7 +839,7 @@ break; case "deb": case "ar": - require_once "Archive/Writer/Ar.php"; + require_once "File/Archive/Writer/Ar.php"; $next = new File_Archive_Writer_Ar( $currentFilename, $writer, $stat, $autoClose ); http://cvs.php.net/diff.php/pear/File_Archive/package.xml?r1=1.13&r2=1.14&ty=u Index: pear/File_Archive/package.xml diff -u pear/File_Archive/package.xml:1.13 pear/File_Archive/package.xml:1.14 --- pear/File_Archive/package.xml:1.13 Thu May 26 13:55:40 2005 +++ pear/File_Archive/package.xml Thu May 26 17:30:18 2005 @@ -2,12 +2,12 @@ <package version="1.0"> <name>File_Archive</name> <summary> - File_Archive will let you manipulate easily the tar, gz, bz2 and zip files + File_Archive will let you manipulate easily the tar, gz, tgz, bz2, tbz, zip, ar (or deb) files </summary> <description> This library is strongly object oriented. It makes it very easy to use, writing simple code, yet the library is very powerfull. - File_Archive is made of two objects : readers and writers. Are currently implemented readers from file, directory, tar, gz, zip and bzip2 archives. - You can write to file(s), send mails with files attached, or create tar, gz, zip, bzip2 archives. + It lets you easily read or generate tar, gz, tgz, bz2, tbz, zip, ar (or deb) archives to files, memory, mail or standard output. + See poocl.la-grotte.org for a tutorial </description> <license>LGPL</license> <maintainers> @@ -25,11 +25,15 @@ </maintainer> </maintainers> <release> - <version>1.1.0</version> - <date>2005-05-08</date> + <version>1.2.0</version> + <date>2005-05-26</date> <state>stable</state> <notes> - + Add the makeAppendWriter function on readers to allow to append data to an existing archive + + Add an ar (or deb) reader / writer + + Add a getFileList() on any reader to quickly retrieve file list + + File_Archive::readArchive properly handles tgz and tbz extensions + + Better error handling + + Various bug fixes </notes> <filelist> <dir name="File" role="php"> @@ -54,6 +58,7 @@ <file>True.php</file> </dir> <dir name="Reader" role="php"> + <file>Ar.php</file> <file>Archive.php</file> <file>Bzip2.php</file> <file>ChangeName.php</file> @@ -72,6 +77,7 @@ <file>Zip.php</file> </dir> <dir name="Writer" role="php"> + <file>Ar.php</file> <file>Archive.php</file> <file>Bzip2.php</file> <file>Files.php</file> http://cvs.php.net/diff.php/pear/File_Archive/Archive/Predicate.php?r1=1.6&r2=1.7&ty=u Index: pear/File_Archive/Archive/Predicate.php diff -u pear/File_Archive/Archive/Predicate.php:1.6 pear/File_Archive/Archive/Predicate.php:1.7 --- pear/File_Archive/Archive/Predicate.php:1.6 Thu Apr 21 06:01:45 2005 +++ pear/File_Archive/Archive/Predicate.php Thu May 26 17:30:18 2005 @@ -28,11 +28,11 @@ * @author Vincent Lascaux <vincentlascaux@php.net> * @copyright 1997-2005 The PHP Group * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version CVS: $Id: Predicate.php,v 1.6 2005/04/21 10:01:45 vincentlascaux Exp $ + * @version CVS: $Id: Predicate.php,v 1.7 2005/05/26 21:30:18 vincentlascaux Exp $ * @link http://pear.php.net/package/File_Archive */ -require_once "Reader.php"; +require_once "File/Archive/Reader.php"; /** * A predicate is an object that can evaluate to true or false depending on the http://cvs.php.net/diff.php/pear/File_Archive/Archive/Reader.php?r1=1.23&r2=1.24&ty=u Index: pear/File_Archive/Archive/Reader.php diff -u pear/File_Archive/Archive/Reader.php:1.23 pear/File_Archive/Archive/Reader.php:1.24 --- pear/File_Archive/Archive/Reader.php:1.23 Thu May 26 11:57:37 2005 +++ pear/File_Archive/Archive/Reader.php Thu May 26 17:30:18 2005 @@ -27,7 +27,7 @@ * @author Vincent Lascaux <vincentlascaux@php.net> * @copyright 1997-2005 The PHP Group * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version CVS: $Id: Reader.php,v 1.23 2005/05/26 15:57:37 vincentlascaux Exp $ + * @version CVS: $Id: Reader.php,v 1.24 2005/05/26 21:30:18 vincentlascaux Exp $ * @link http://pear.php.net/package/File_Archive */ @@ -157,7 +157,7 @@ */ function getMime() { - require_once "Reader/MimeList.php"; + require_once "File/Archive/Reader/MimeList.php"; return File_Archive_Reader_GetMime($this->getFilename()); } http://cvs.php.net/diff.php/pear/File_Archive/Archive/Reader/Ar.php?r1=1.6&r2=1.7&ty=u Index: pear/File_Archive/Archive/Reader/Ar.php diff -u pear/File_Archive/Archive/Reader/Ar.php:1.6 pear/File_Archive/Archive/Reader/Ar.php:1.7 --- pear/File_Archive/Archive/Reader/Ar.php:1.6 Thu May 26 11:27:14 2005 +++ pear/File_Archive/Archive/Reader/Ar.php Thu May 26 17:30:18 2005 @@ -27,7 +27,7 @@ * @link http://pear.php.net/package/File_Archive */ -require_once "Archive.php"; +require_once "File/Archive/Reader/Archive.php"; /** * Read an Ar archive @@ -170,7 +170,7 @@ 'size' => $size, 9 => $mtime, 'mtime' => $mtime - ); + ); return true; } @@ -199,7 +199,7 @@ function makeWriter($seek = 0, $fileModif = true) { require_once "File/Archive/Writer/Ar.php"; - + $writer = $this->source->makeWriter(); $this->source = null; $this->close(); http://cvs.php.net/diff.php/pear/File_Archive/Archive/Reader/Bzip2.php?r1=1.10&r2=1.11&ty=u Index: pear/File_Archive/Archive/Reader/Bzip2.php diff -u pear/File_Archive/Archive/Reader/Bzip2.php:1.10 pear/File_Archive/Archive/Reader/Bzip2.php:1.11 --- pear/File_Archive/Archive/Reader/Bzip2.php:1.10 Thu May 26 12:12:19 2005 +++ pear/File_Archive/Archive/Reader/Bzip2.php Thu May 26 17:30:18 2005 @@ -25,11 +25,11 @@ * @author Vincent Lascaux <vincentlascaux@php.net> * @copyright 1997-2005 The PHP Group * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version CVS: $Id: Bzip2.php,v 1.10 2005/05/26 16:12:19 vincentlascaux Exp $ + * @version CVS: $Id: Bzip2.php,v 1.11 2005/05/26 21:30:18 vincentlascaux Exp $ * @link http://pear.php.net/package/File_Archive */ -require_once "Archive.php"; +require_once "File/Archive/Writer/Archive.php"; require_once "File/Archive/Writer/Files.php"; /** http://cvs.php.net/diff.php/pear/File_Archive/Archive/Reader/ChangeName.php?r1=1.14&r2=1.15&ty=u Index: pear/File_Archive/Archive/Reader/ChangeName.php diff -u pear/File_Archive/Archive/Reader/ChangeName.php:1.14 pear/File_Archive/Archive/Reader/ChangeName.php:1.15 --- pear/File_Archive/Archive/Reader/ChangeName.php:1.14 Thu May 26 11:57:37 2005 +++ pear/File_Archive/Archive/Reader/ChangeName.php Thu May 26 17:30:18 2005 @@ -25,11 +25,11 @@ * @author Vincent Lascaux <vincentlascaux@php.net> * @copyright 1997-2005 The PHP Group * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version CVS: $Id: ChangeName.php,v 1.14 2005/05/26 15:57:37 vincentlascaux Exp $ + * @version CVS: $Id: ChangeName.php,v 1.15 2005/05/26 21:30:18 vincentlascaux Exp $ * @link http://pear.php.net/package/File_Archive */ -require_once "Relay.php"; +require_once "File/Archive/Reader/Relay.php"; /** * Add a directory to the public name of all the files of a reader http://cvs.php.net/diff.php/pear/File_Archive/Archive/Reader/Concat.php?r1=1.11&r2=1.12&ty=u Index: pear/File_Archive/Archive/Reader/Concat.php diff -u pear/File_Archive/Archive/Reader/Concat.php:1.11 pear/File_Archive/Archive/Reader/Concat.php:1.12 --- pear/File_Archive/Archive/Reader/Concat.php:1.11 Thu May 26 11:57:37 2005 +++ pear/File_Archive/Archive/Reader/Concat.php Thu May 26 17:30:18 2005 @@ -25,11 +25,11 @@ * @author Vincent Lascaux <vincentlascaux@php.net> * @copyright 1997-2005 The PHP Group * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version CVS: $Id: Concat.php,v 1.11 2005/05/26 15:57:37 vincentlascaux Exp $ + * @version CVS: $Id: Concat.php,v 1.12 2005/05/26 21:30:18 vincentlascaux Exp $ * @link http://pear.php.net/package/File_Archive */ -require_once "Relay.php"; +require_once "File/Archive/Reader/Relay.php"; /** * This reader provides one single file that is the concatenation of the data of http://cvs.php.net/diff.php/pear/File_Archive/Archive/Reader/Directory.php?r1=1.13&r2=1.14&ty=u Index: pear/File_Archive/Archive/Reader/Directory.php diff -u pear/File_Archive/Archive/Reader/Directory.php:1.13 pear/File_Archive/Archive/Reader/Directory.php:1.14 --- pear/File_Archive/Archive/Reader/Directory.php:1.13 Thu May 26 11:57:37 2005 +++ pear/File_Archive/Archive/Reader/Directory.php Thu May 26 17:30:18 2005 @@ -25,12 +25,12 @@ * @author Vincent Lascaux <vincentlascaux@php.net> * @copyright 1997-2005 The PHP Group * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version CVS: $Id: Directory.php,v 1.13 2005/05/26 15:57:37 vincentlascaux Exp $ + * @version CVS: $Id: Directory.php,v 1.14 2005/05/26 21:30:18 vincentlascaux Exp $ * @link http://pear.php.net/package/File_Archive */ -require_once "Relay.php"; -require_once "File.php"; +require_once "File/Archive/Reader/Relay.php"; +require_once "File/Archive/Reader/File.php"; /** * Recursively reads a directory http://cvs.php.net/diff.php/pear/File_Archive/Archive/Reader/Filter.php?r1=1.8&r2=1.9&ty=u Index: pear/File_Archive/Archive/Reader/Filter.php diff -u pear/File_Archive/Archive/Reader/Filter.php:1.8 pear/File_Archive/Archive/Reader/Filter.php:1.9 --- pear/File_Archive/Archive/Reader/Filter.php:1.8 Thu Apr 21 06:01:48 2005 +++ pear/File_Archive/Archive/Reader/Filter.php Thu May 26 17:30:18 2005 @@ -25,11 +25,11 @@ * @author Vincent Lascaux <vincentlascaux@php.net> * @copyright 1997-2005 The PHP Group * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version CVS: $Id: Filter.php,v 1.8 2005/04/21 10:01:48 vincentlascaux Exp $ + * @version CVS: $Id: Filter.php,v 1.9 2005/05/26 21:30:18 vincentlascaux Exp $ * @link http://pear.php.net/package/File_Archive */ -require_once "Relay.php"; +require_once "File/Archive/Reader/Relay.php"; /** * Filter out the files that do not respect a given predicat http://cvs.php.net/diff.php/pear/File_Archive/Archive/Reader/Gzip.php?r1=1.19&r2=1.20&ty=u Index: pear/File_Archive/Archive/Reader/Gzip.php diff -u pear/File_Archive/Archive/Reader/Gzip.php:1.19 pear/File_Archive/Archive/Reader/Gzip.php:1.20 --- pear/File_Archive/Archive/Reader/Gzip.php:1.19 Thu May 26 12:12:19 2005 +++ pear/File_Archive/Archive/Reader/Gzip.php Thu May 26 17:30:18 2005 @@ -25,11 +25,11 @@ * @author Vincent Lascaux <vincentlascaux@php.net> * @copyright 1997-2005 The PHP Group * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version CVS: $Id: Gzip.php,v 1.19 2005/05/26 16:12:19 vincentlascaux Exp $ + * @version CVS: $Id: Gzip.php,v 1.20 2005/05/26 21:30:18 vincentlascaux Exp $ * @link http://pear.php.net/package/File_Archive */ -require_once "Archive.php"; +require_once "File/Archive/Reader/Archive.php"; require_once "File/Archive/Writer/Files.php"; /** http://cvs.php.net/diff.php/pear/File_Archive/Archive/Reader/Multi.php?r1=1.9&r2=1.10&ty=u Index: pear/File_Archive/Archive/Reader/Multi.php diff -u pear/File_Archive/Archive/Reader/Multi.php:1.9 pear/File_Archive/Archive/Reader/Multi.php:1.10 --- pear/File_Archive/Archive/Reader/Multi.php:1.9 Fri Apr 8 06:18:06 2005 +++ pear/File_Archive/Archive/Reader/Multi.php Thu May 26 17:30:18 2005 @@ -25,11 +25,11 @@ * @author Vincent Lascaux <vincentlascaux@php.net> * @copyright 1997-2005 The PHP Group * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version CVS: $Id: Multi.php,v 1.9 2005/04/08 10:18:06 vincentlascaux Exp $ + * @version CVS: $Id: Multi.php,v 1.10 2005/05/26 21:30:18 vincentlascaux Exp $ * @link http://pear.php.net/package/File_Archive */ -require_once "Relay.php"; +require_once "File/Archive/Reader/Relay.php"; /** * Regroups several readers to make them appear as a single one http://cvs.php.net/diff.php/pear/File_Archive/Archive/Reader/Select.php?r1=1.2&r2=1.3&ty=u Index: pear/File_Archive/Archive/Reader/Select.php diff -u pear/File_Archive/Archive/Reader/Select.php:1.2 pear/File_Archive/Archive/Reader/Select.php:1.3 --- pear/File_Archive/Archive/Reader/Select.php:1.2 Thu Apr 21 06:01:48 2005 +++ pear/File_Archive/Archive/Reader/Select.php Thu May 26 17:30:18 2005 @@ -25,11 +25,11 @@ * @author Vincent Lascaux <vincentlascaux@php.net> * @copyright 1997-2005 The PHP Group * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version CVS: $Id: Select.php,v 1.2 2005/04/21 10:01:48 vincentlascaux Exp $ + * @version CVS: $Id: Select.php,v 1.3 2005/05/26 21:30:18 vincentlascaux Exp $ * @link http://pear.php.net/package/File_Archive */ -require_once "Relay.php"; +require_once "File/Archive/Reader/Relay.php"; /** * Reader that keeps the files selected by File_Archive::select function http://cvs.php.net/diff.php/pear/File_Archive/Archive/Reader/Tar.php?r1=1.19&r2=1.20&ty=u Index: pear/File_Archive/Archive/Reader/Tar.php diff -u pear/File_Archive/Archive/Reader/Tar.php:1.19 pear/File_Archive/Archive/Reader/Tar.php:1.20 --- pear/File_Archive/Archive/Reader/Tar.php:1.19 Thu May 26 11:57:37 2005 +++ pear/File_Archive/Archive/Reader/Tar.php Thu May 26 17:30:18 2005 @@ -25,11 +25,11 @@ * @author Vincent Lascaux <vincentlascaux@php.net> * @copyright 1997-2005 The PHP Group * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version CVS: $Id: Tar.php,v 1.19 2005/05/26 15:57:37 vincentlascaux Exp $ + * @version CVS: $Id: Tar.php,v 1.20 2005/05/26 21:30:18 vincentlascaux Exp $ * @link http://pear.php.net/package/File_Archive */ -require_once "Archive.php"; +require_once "File/Archive/Reader/Archive.php"; /** * Read a tar archive http://cvs.php.net/diff.php/pear/File_Archive/Archive/Reader/Uncompress.php?r1=1.27&r2=1.28&ty=u Index: pear/File_Archive/Archive/Reader/Uncompress.php diff -u pear/File_Archive/Archive/Reader/Uncompress.php:1.27 pear/File_Archive/Archive/Reader/Uncompress.php:1.28 --- pear/File_Archive/Archive/Reader/Uncompress.php:1.27 Wed May 25 12:48:22 2005 +++ pear/File_Archive/Archive/Reader/Uncompress.php Thu May 26 17:30:18 2005 @@ -25,12 +25,12 @@ * @author Vincent Lascaux <vincentlascaux@php.net> * @copyright 1997-2005 The PHP Group * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version CVS: $Id: Uncompress.php,v 1.27 2005/05/25 16:48:22 vincentlascaux Exp $ + * @version CVS: $Id: Uncompress.php,v 1.28 2005/05/26 21:30:18 vincentlascaux Exp $ * @link http://pear.php.net/package/File_Archive */ require_once "File/Archive/Reader.php"; -require_once "ChangeName.php"; +require_once "File/Archive/Reader/ChangeName.php"; /** * Recursively uncompress every file it finds http://cvs.php.net/diff.php/pear/File_Archive/Archive/Reader/Zip.php?r1=1.17&r2=1.18&ty=u Index: pear/File_Archive/Archive/Reader/Zip.php diff -u pear/File_Archive/Archive/Reader/Zip.php:1.17 pear/File_Archive/Archive/Reader/Zip.php:1.18 --- pear/File_Archive/Archive/Reader/Zip.php:1.17 Thu May 26 11:57:37 2005 +++ pear/File_Archive/Archive/Reader/Zip.php Thu May 26 17:30:18 2005 @@ -25,11 +25,11 @@ * @author Vincent Lascaux <vincentlascaux@php.net> * @copyright 1997-2005 The PHP Group * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version CVS: $Id: Zip.php,v 1.17 2005/05/26 15:57:37 vincentlascaux Exp $ + * @version CVS: $Id: Zip.php,v 1.18 2005/05/26 21:30:18 vincentlascaux Exp $ * @link http://pear.php.net/package/File_Archive */ -require_once "Archive.php"; +require_once "File/Archive/Reader/Archive.php"; /** * ZIP archive reader http://cvs.php.net/diff.php/pear/File_Archive/Archive/Writer/Ar.php?r1=1.9&r2=1.10&ty=u Index: pear/File_Archive/Archive/Writer/Ar.php diff -u pear/File_Archive/Archive/Writer/Ar.php:1.9 pear/File_Archive/Archive/Writer/Ar.php:1.10 --- pear/File_Archive/Archive/Writer/Ar.php:1.9 Thu May 26 11:27:14 2005 +++ pear/File_Archive/Archive/Writer/Ar.php Thu May 26 17:30:18 2005 @@ -27,16 +27,16 @@ * @link http://pear.php.net/package/File_Archive */ -require_once "Archive.php"; +require_once "File/Archive/Writer/Archive.php"; /** * Write the files as an AR archive */ class File_Archive_Writer_Ar extends File_Archive_Writer_Archive { - + /** - * @var string Current data of the file. + * @var string Current data of the file. * @access private */ var $_buffer = ""; @@ -52,10 +52,10 @@ * @access private */ var $_useBuffer; - + /** * @var array Stats of the current filename - * @access private + * @access private */ var $_currentStat = array (); @@ -64,7 +64,7 @@ * @access private */ var $_atStart = true; - + /** * Returns the header of the current file. * @@ -77,7 +77,7 @@ * @return string The built header struct */ function arHeader ($filename, $stat) - { + { $mode = isset($stat[2]) ? $stat[2] : 0x8000; $uid = isset($stat[4]) ? $stat[4] : 0; $gid = isset($stat[5]) ? $stat[5] : 0; @@ -97,8 +97,8 @@ $struct .= sprintf("%-16s", $filename); $struct .= sprintf("%-12d%-6d%-6d%-8s%-10d`\n", $time, $uid, $gid, $mode, $size); - } - return $struct; + } + return $struct; } /** @@ -119,7 +119,7 @@ /** - * Flush the memory we have in the ar. + * Flush the memory we have in the ar. * * Build the buffer if its called at the end or initialize * it if we are just creating it from the start. @@ -137,7 +137,7 @@ $this->arHeader($this->_currentFilename, $this->_currentStat) ); $this->innerWriter->writeData($this->_buffer); - } + } $this->innerWriter->writeData($this->arFooter($this->_currentFilename, $this->_currentStat[7])); } $this->_buffer = ""; @@ -147,22 +147,22 @@ * @see File_Archive_Writer::newFile() * */ - function newFile($filename, $stat = array (), - $mime = "application/octet-stream") + function newFile($filename, $stat = array (), + $mime = "application/octet-stream") { - $this->flush(); + $this->flush(); /** * If the file is empty, there's no reason to have a buffer - * or use memory + * or use memory */ - $this->_useBuffer = !isset($stats[7]); + $this->_useBuffer = !isset($stats[7]); /** * Becaue ar fileformats doesn't support files in directories, - * then we need to just save with the filename an ommit the + * then we need to just save with the filename an ommit the * directory */ $this->_currentFilename = basename($filename); - $this->_currentStat = $stat; + $this->_currentStat = $stat; if(!$this->_useBuffer) { return $this->innerWriter->writeData($this->arHeader($filename, $stat)); @@ -185,7 +185,7 @@ { if ($this->_useBuffer) { $this->_buffer .= $data; - } else { + } else { $this->innerWriter->writeData($data); } @@ -197,7 +197,7 @@ { if ($this->_useBuffer) { $this->_buffer .= file_get_contents($filename); - } else { + } else { $this->innerWriter->writeFile($filename); } } http://cvs.php.net/diff.php/pear/File_Archive/Archive/Writer/MemoryArchive.php?r1=1.12&r2=1.13&ty=u Index: pear/File_Archive/Archive/Writer/MemoryArchive.php diff -u pear/File_Archive/Archive/Writer/MemoryArchive.php:1.12 pear/File_Archive/Archive/Writer/MemoryArchive.php:1.13 --- pear/File_Archive/Archive/Writer/MemoryArchive.php:1.12 Fri May 6 10:09:01 2005 +++ pear/File_Archive/Archive/Writer/MemoryArchive.php Thu May 26 17:30:18 2005 @@ -26,12 +26,12 @@ * @author Vincent Lascaux <vincentlascaux@php.net> * @copyright 1997-2005 The PHP Group * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version CVS: $Id: MemoryArchive.php,v 1.12 2005/05/06 14:09:01 vincentlascaux Exp $ + * @version CVS: $Id: MemoryArchive.php,v 1.13 2005/05/26 21:30:18 vincentlascaux Exp $ * @link http://pear.php.net/package/File_Archive */ -require_once "Archive.php"; -require_once "Memory.php"; +require_once "File/Archive/Writer/Archive.php"; +require_once "File/Archive/Writer/Memory.php"; /** * Base class for all the archiveWriters that can only work on complete files http://cvs.php.net/diff.php/pear/File_Archive/Archive/Writer/Tar.php?r1=1.16&r2=1.17&ty=u Index: pear/File_Archive/Archive/Writer/Tar.php diff -u pear/File_Archive/Archive/Writer/Tar.php:1.16 pear/File_Archive/Archive/Writer/Tar.php:1.17 --- pear/File_Archive/Archive/Writer/Tar.php:1.16 Mon May 23 14:54:36 2005 +++ pear/File_Archive/Archive/Writer/Tar.php Thu May 26 17:30:18 2005 @@ -25,11 +25,11 @@ * @author Vincent Lascaux <vincentlascaux@php.net> * @copyright 1997-2005 The PHP Group * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version CVS: $Id: Tar.php,v 1.16 2005/05/23 18:54:36 vincentlascaux Exp $ + * @version CVS: $Id: Tar.php,v 1.17 2005/05/26 21:30:18 vincentlascaux Exp $ * @link http://pear.php.net/package/File_Archive */ -require_once "Archive.php"; +require_once "File/Archive/Writer/Archive.php"; /** * Write the files as a TAR archive http://cvs.php.net/diff.php/pear/File_Archive/Archive/Writer/Zip.php?r1=1.11&r2=1.12&ty=u Index: pear/File_Archive/Archive/Writer/Zip.php diff -u pear/File_Archive/Archive/Writer/Zip.php:1.11 pear/File_Archive/Archive/Writer/Zip.php:1.12 --- pear/File_Archive/Archive/Writer/Zip.php:1.11 Fri May 6 16:19:50 2005 +++ pear/File_Archive/Archive/Writer/Zip.php Thu May 26 17:30:18 2005 @@ -25,11 +25,11 @@ * @author Vincent Lascaux <vincentlascaux@php.net> * @copyright 1997-2005 The PHP Group * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version CVS: $Id: Zip.php,v 1.11 2005/05/06 20:19:50 vincentlascaux Exp $ + * @version CVS: $Id: Zip.php,v 1.12 2005/05/26 21:30:18 vincentlascaux Exp $ * @link http://pear.php.net/package/File_Archive */ -require_once "MemoryArchive.php"; +require_once "File/Archive/Writer/MemoryArchive.php"; /** * ZIP archive writer
« previous php.pear.cvs (#32144) next »