X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Ffilerepo%2FFileRepo.php;h=cbcc6c8dd1578b2a82218e781c7bc721da9e92d8;hb=0a32a34775b8f8042868a14903d3c217cf2c46bc;hp=651ee271276b206719b44bf2e0ded2b0c007067f;hpb=ba39f8b3f83a34f94c4f570d5b040ac26d2d1ec1;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index 651ee27127..cbcc6c8dd1 100644
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -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;
 		}
@@ -1054,13 +1061,14 @@ class FileRepo {
 	/**
 	 * 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
@@ -1075,8 +1083,9 @@ class FileRepo {
 		$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 ) ) {
@@ -1100,6 +1109,9 @@ class FileRepo {
 				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,
@@ -1117,25 +1129,28 @@ class FileRepo {
 			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;
@@ -1146,8 +1161,8 @@ class FileRepo {
 		// 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';
@@ -1405,6 +1420,17 @@ class FileRepo {
 		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
 	 *