Merge "Various simple optimizations for the chunked upload process."

diff --combined includes/filerepo/FileRepo.php
index 5201552,7bcadd8..cbcc6c8
--- 1/includes/filerepo/FileRepo.php
--- 2/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@@ -1027,25 -1027,18 +1027,25 @@@ class FileRepo 
         * Returns a FileRepoStatus object. On success, the value contains "new" or
         * "archived", to indicate whether the file was new with that name.
         *
 +       * Options to $options include:
 +       *   - headers : name/value map of HTTP headers to use in response to GET/HEAD requests
 +       *
         * @param $srcPath String: the source file system path, storage path, or URL
         * @param $dstRel String: the destination relative path
         * @param $archiveRel String: the relative path where the existing file is to
         *        be archived, if there is one. Relative to the public zone root.
         * @param $flags Integer: bitfield, may be FileRepo::DELETE_SOURCE to indicate
         *        that the source file should be deleted if possible
 +       * @param $options Array Optional additional parameters
         * @return FileRepoStatus
         */
 -      public function publish( $srcPath, $dstRel, $archiveRel, $flags = 0 ) {
 +      public function publish(
 +              $srcPath, $dstRel, $archiveRel, $flags = 0, array $options = array()
 +      ) {
                $this->assertWritableRepo(); // fail out if read-only
  
 -              $status = $this->publishBatch( array( array( $srcPath, $dstRel, $archiveRel ) ), $flags );
 +              $status = $this->publishBatch(
 +                      array( array( $srcPath, $dstRel, $archiveRel, $options ) ), $flags );
                if ( $status->successCount == 0 ) {
                        $status->ok = false;
                }
@@@ -1061,14 -1054,13 +1061,14 @@@
        /**
         * Publish a batch of files
         *
 -       * @param $triplets Array: (source, dest, archive) triplets as per publish()
 +       * @param $ntuples Array: (source, dest, archive) triplets or
 +       *        (source, dest, archive, options) 4-tuples as per publish().
         * @param $flags Integer: bitfield, may be FileRepo::DELETE_SOURCE to indicate
         *        that the source files should be deleted if possible
         * @throws MWException
         * @return FileRepoStatus
         */
 -      public function publishBatch( array $triplets, $flags = 0 ) {
 +      public function publishBatch( array $ntuples, $flags = 0 ) {
                $this->assertWritableRepo(); // fail out if read-only
  
                $backend = $this->backend; // convenience
@@@ -1083,9 -1075,8 +1083,9 @@@
                $operations = array();
                $sourceFSFilesToDelete = array(); // cleanup for disk source files
                // Validate each triplet and get the store operation...
 -              foreach ( $triplets as $i => $triplet ) {
 -                      list( $srcPath, $dstRel, $archiveRel ) = $triplet;
 +              foreach ( $ntuples as $i => $ntuple ) {
 +                      list( $srcPath, $dstRel, $archiveRel ) = $ntuple;
 +                      $options = isset( $ntuple[3] ) ? $ntuple[3] : array();
                        // Resolve source to a storage path if virtual
                        $srcPath = $this->resolveToStoragePath( $srcPath );
                        if ( !$this->validateFilename( $dstRel ) ) {
@@@ -1109,9 -1100,6 +1109,9 @@@
                                return $this->newFatal( 'directorycreateerror', $archiveDir );
                        }
  
 +                      // Set any desired headers to be use in GET/HEAD responses
 +                      $headers = isset( $options['headers'] ) ? $options['headers'] : array();
 +
                        // Archive destination file if it exists.
                        // This will check if the archive file also exists and fail if does.
                        // This is a sanity check to avoid data loss. On Windows and Linux,
@@@ -1129,28 -1117,25 +1129,28 @@@
                        if ( FileBackend::isStoragePath( $srcPath ) ) {
                                if ( $flags & self::DELETE_SOURCE ) {
                                        $operations[] = array(
 -                                              'op'           => 'move',
 -                                              'src'          => $srcPath,
 -                                              'dst'          => $dstPath,
 -                                              'overwrite'    => true // replace current
 +                                              'op'        => 'move',
 +                                              'src'       => $srcPath,
 +                                              'dst'       => $dstPath,
 +                                              'overwrite' => true, // replace current
 +                                              'headers'   => $headers
                                        );
                                } else {
                                        $operations[] = array(
 -                                              'op'           => 'copy',
 -                                              'src'          => $srcPath,
 -                                              'dst'          => $dstPath,
 -                                              'overwrite'    => true // replace current
 +                                              'op'        => 'copy',
 +                                              'src'       => $srcPath,
 +                                              'dst'       => $dstPath,
 +                                              'overwrite' => true, // replace current
 +                                              'headers'   => $headers
                                        );
                                }
                        } else { // FS source path
                                $operations[] = array(
 -                                      'op'           => 'store',
 -                                      'src'          => $srcPath,
 -                                      'dst'          => $dstPath,
 -                                      'overwrite'    => true // replace current
 +                                      'op'        => 'store',
 +                                      'src'       => $srcPath,
 +                                      'dst'       => $dstPath,
 +                                      'overwrite' => true, // replace current
 +                                      'headers'   => $headers
                                );
                                if ( $flags & self::DELETE_SOURCE ) {
                                        $sourceFSFilesToDelete[] = $srcPath;
@@@ -1161,8 -1146,8 +1161,8 @@@
                // Execute the operations for each triplet
                $status->merge( $backend->doOperations( $operations ) );
                // Find out which files were archived...
 -              foreach ( $triplets as $i => $triplet ) {
 -                      list( $srcPath, $dstRel, $archiveRel ) = $triplet;
 +              foreach ( $ntuples as $i => $ntuple ) {
 +                      list( $srcPath, $dstRel, $archiveRel ) = $ntuple;
                        $archivePath = $this->getZonePath( 'public' ) . "/$archiveRel";
                        if ( $this->fileExists( $archivePath ) ) {
                                $status->value[$i] = 'archived';
@@@ -1420,6 -1405,17 +1420,17 @@@
                return $this->backend->getFileTimestamp( array( 'src' => $path ) );
        }
  
+       /**
+        * Get the size of a file with a given virtual URL/storage path
+        *
+        * @param $virtualUrl string
+        * @return integer|bool False on failure
+        */
+       public function getFileSize( $virtualUrl ) {
+               $path = $this->resolveToStoragePath( $virtualUrl );
+               return $this->backend->getFileSize( array( 'src' => $path ) );
+       }
+ 
        /**
         * Get the sha1 (base 36) of a file with a given virtual URL/storage path
         *