(bug 19289) importDump.php can now handle bzip2 and 7zip.

[lhc/web/wiklou.git] / maintenance / dumpTextPass.php

diff --git a/maintenance/dumpTextPass.php b/maintenance/dumpTextPass.php
index 38420ee..3db8c2a 100644 (file)
--- a/maintenance/dumpTextPass.php
+++ b/maintenance/dumpTextPass.php
@@ -26,75 +26,7 @@ $originalDir = getcwd();
 
 require_once( dirname(__FILE__) . '/commandLine.inc' );
 require_once( 'backup.inc' );
-
-/**
- * Stream wrapper around 7za filter program.
- * Required since we can't pass an open file resource to XMLReader->open()
- * which is used for the text prefetch.
- *
- * @ingroup Maintenance
- */
-class SevenZipStream {
-       var $stream;
-       
-       private function stripPath( $path ) {
-               $prefix = 'mediawiki.compress.7z://';
-               return substr( $path, strlen( $prefix ) );
-       }
-       
-       function stream_open( $path, $mode, $options, &$opened_path ) {
-               if( $mode{0} == 'r' ) {
-                       $options = 'e -bd -so';
-               } elseif( $mode{0} == 'w' ) {
-                       $options = 'a -bd -si';
-               } else {
-                       return false;
-               }
-               $arg = wfEscapeShellArg( $this->stripPath( $path ) );
-               $command = "7za $options $arg";
-               if( !wfIsWindows() ) {
-                       // Suppress the stupid messages on stderr
-                       $command .= ' 2>/dev/null';
-               }
-               $this->stream = popen( $command, $mode );
-               return ($this->stream !== false);
-       }
-       
-       function url_stat( $path, $flags ) {
-               return stat( $this->stripPath( $path ) );
-       }
-       
-       // This is all so lame; there should be a default class we can extend
-       
-       function stream_close() {
-               return fclose( $this->stream );
-       }
-       
-       function stream_flush() {
-               return fflush( $this->stream );
-       }
-       
-       function stream_read( $count ) {
-               return fread( $this->stream, $count );
-       }
-       
-       function stream_write( $data ) {
-               return fwrite( $this->stream, $data );
-       }
-       
-       function stream_tell() {
-               return ftell( $this->stream );
-       }
-       
-       function stream_eof() {
-               return feof( $this->stream );
-       }
-       
-       function stream_seek( $offset, $whence ) {
-               return fseek( $this->stream, $offset, $whence );
-       }
-}
-stream_wrapper_register( 'mediawiki.compress.7z', 'SevenZipStream' );
+require_once( '7zip.inc' );
 
 /**
  * @ingroup Maintenance