Merge "[FileBackend] Use the new CloudFiles metadata functions."

diff --combined includes/filebackend/SwiftFileBackend.php
index f6d81bb,ae15df8..5dfad9e
--- 1/includes/filebackend/SwiftFileBackend.php
--- 2/includes/filebackend/SwiftFileBackend.php
+++ b/includes/filebackend/SwiftFileBackend.php
@@@ -201,6 -201,12 +201,6 @@@ class SwiftFileBackend extends FileBack
                // (a) Check the destination container and object
                try {
                        $dContObj = $this->getContainer( $dstCont );
 -                      if ( empty( $params['overwrite'] ) &&
 -                              $this->fileExists( array( 'src' => $params['dst'], 'latest' => 1 ) ) )
 -                      {
 -                              $status->fatal( 'backend-fail-alreadyexists', $params['dst'] );
 -                              return $status;
 -                      }
                } catch ( NoSuchContainerException $e ) {
                        $status->fatal( 'backend-fail-create', $params['dst'] );
                        return $status;
@@@ -217,8 -223,7 +217,7 @@@
                        // Create a fresh CF_Object with no fields preloaded.
                        // We don't want to preserve headers, metadata, and such.
                        $obj = new CF_Object( $dContObj, $dstRel, false, false ); // skip HEAD
-                       // Note: metadata keys stored as [Upper case char][[Lower case char]...]
-                       $obj->metadata = array( 'Sha1base36' => $sha1Hash );
+                       $obj->setMetadataValues( array( 'Sha1base36' => $sha1Hash ) );
                        // Manually set the ETag (https://github.com/rackspace/php-cloudfiles/issues/59).
                        // The MD5 here will be checked within Swift against its own MD5.
                        $obj->set_etag( md5( $params['content'] ) );
@@@ -234,10 -239,14 +233,10 @@@
                        if ( !empty( $params['async'] ) ) { // deferred
                                $op = $obj->write_async( $params['content'] );
                                $status->value = new SwiftFileOpHandle( $this, $params, 'Create', $op );
 -                              if ( !empty( $params['overwrite'] ) ) { // file possibly mutated
 -                                      $status->value->affectedObjects[] = $obj;
 -                              }
 +                              $status->value->affectedObjects[] = $obj;
                        } else { // actually write the object in Swift
                                $obj->write( $params['content'] );
 -                              if ( !empty( $params['overwrite'] ) ) { // file possibly mutated
 -                                      $this->purgeCDNCache( array( $obj ) );
 -                              }
 +                              $this->purgeCDNCache( array( $obj ) );
                        }
                } catch ( CDNNotEnabledException $e ) {
                        // CDN not enabled; nothing to see here
@@@ -277,6 -286,12 +276,6 @@@
                // (a) Check the destination container and object
                try {
                        $dContObj = $this->getContainer( $dstCont );
 -                      if ( empty( $params['overwrite'] ) &&
 -                              $this->fileExists( array( 'src' => $params['dst'], 'latest' => 1 ) ) )
 -                      {
 -                              $status->fatal( 'backend-fail-alreadyexists', $params['dst'] );
 -                              return $status;
 -                      }
                } catch ( NoSuchContainerException $e ) {
                        $status->fatal( 'backend-fail-copy', $params['src'], $params['dst'] );
                        return $status;
@@@ -298,8 -313,7 +297,7 @@@
                        // Create a fresh CF_Object with no fields preloaded.
                        // We don't want to preserve headers, metadata, and such.
                        $obj = new CF_Object( $dContObj, $dstRel, false, false ); // skip HEAD
-                       // Note: metadata keys stored as [Upper case char][[Lower case char]...]
-                       $obj->metadata = array( 'Sha1base36' => $sha1Hash );
+                       $obj->setMetadataValues( array( 'Sha1base36' => $sha1Hash ) );
                        // The MD5 here will be checked within Swift against its own MD5.
                        $obj->set_etag( md5_file( $params['src'] ) );
                        // Use the same content type as StreamFile for security
@@@ -321,11 -335,15 +319,11 @@@
                                        $op = $obj->write_async( $fp, filesize( $params['src'] ), true );
                                        $status->value = new SwiftFileOpHandle( $this, $params, 'Store', $op );
                                        $status->value->resourcesToClose[] = $fp;
 -                                      if ( !empty( $params['overwrite'] ) ) { // file possibly mutated
 -                                              $status->value->affectedObjects[] = $obj;
 -                                      }
 +                                      $status->value->affectedObjects[] = $obj;
                                }
                        } else { // actually write the object in Swift
                                $obj->load_from_filename( $params['src'], true ); // calls $obj->write()
 -                              if ( !empty( $params['overwrite'] ) ) { // file possibly mutated
 -                                      $this->purgeCDNCache( array( $obj ) );
 -                              }
 +                              $this->purgeCDNCache( array( $obj ) );
                        }
                } catch ( CDNNotEnabledException $e ) {
                        // CDN not enabled; nothing to see here
@@@ -376,6 -394,12 +374,6 @@@
                try {
                        $sContObj = $this->getContainer( $srcCont );
                        $dContObj = $this->getContainer( $dstCont );
 -                      if ( empty( $params['overwrite'] ) &&
 -                              $this->fileExists( array( 'src' => $params['dst'], 'latest' => 1 ) ) )
 -                      {
 -                              $status->fatal( 'backend-fail-alreadyexists', $params['dst'] );
 -                              return $status;
 -                      }
                } catch ( NoSuchContainerException $e ) {
                        $status->fatal( 'backend-fail-copy', $params['src'], $params['dst'] );
                        return $status;
@@@ -394,10 -418,14 +392,10 @@@
                        if ( !empty( $params['async'] ) ) { // deferred
                                $op = $sContObj->copy_object_to_async( $srcRel, $dContObj, $dstRel, null, $hdrs );
                                $status->value = new SwiftFileOpHandle( $this, $params, 'Copy', $op );
 -                              if ( !empty( $params['overwrite'] ) ) { // file possibly mutated
 -                                      $status->value->affectedObjects[] = $dstObj;
 -                              }
 +                              $status->value->affectedObjects[] = $dstObj;
                        } else { // actually write the object in Swift
                                $sContObj->copy_object_to( $srcRel, $dContObj, $dstRel, null, $hdrs );
 -                              if ( !empty( $params['overwrite'] ) ) { // file possibly mutated
 -                                      $this->purgeCDNCache( array( $dstObj ) );
 -                              }
 +                              $this->purgeCDNCache( array( $dstObj ) );
                        }
                } catch ( CDNNotEnabledException $e ) {
                        // CDN not enabled; nothing to see here
@@@ -444,6 -472,12 +442,6 @@@
                try {
                        $sContObj = $this->getContainer( $srcCont );
                        $dContObj = $this->getContainer( $dstCont );
 -                      if ( empty( $params['overwrite'] ) &&
 -                              $this->fileExists( array( 'src' => $params['dst'], 'latest' => 1 ) ) )
 -                      {
 -                              $status->fatal( 'backend-fail-alreadyexists', $params['dst'] );
 -                              return $status;
 -                      }
                } catch ( NoSuchContainerException $e ) {
                        $status->fatal( 'backend-fail-move', $params['src'], $params['dst'] );
                        return $status;
@@@ -464,11 -498,15 +462,11 @@@
                                $op = $sContObj->move_object_to_async( $srcRel, $dContObj, $dstRel, null, $hdrs );
                                $status->value = new SwiftFileOpHandle( $this, $params, 'Move', $op );
                                $status->value->affectedObjects[] = $srcObj;
 -                              if ( !empty( $params['overwrite'] ) ) { // file possibly mutated
 -                                      $status->value->affectedObjects[] = $dstObj;
 -                              }
 +                              $status->value->affectedObjects[] = $dstObj;
                        } else { // actually write the object in Swift
                                $sContObj->move_object_to( $srcRel, $dContObj, $dstRel, null, $hdrs );
                                $this->purgeCDNCache( array( $srcObj ) );
 -                              if ( !empty( $params['overwrite'] ) ) { // file possibly mutated
 -                                      $this->purgeCDNCache( array( $dstObj ) );
 -                              }
 +                              $this->purgeCDNCache( array( $dstObj ) );
                        }
                } catch ( CDNNotEnabledException $e ) {
                        // CDN not enabled; nothing to see here
@@@ -721,7 -759,7 +719,7 @@@
                                // Convert dates like "Tue, 03 Jan 2012 22:01:04 GMT" to TS_MW
                                'mtime' => wfTimestamp( TS_MW, $srcObj->last_modified ),
                                'size'  => (int)$srcObj->content_length,
-                               'sha1'  => $srcObj->metadata['Sha1base36']
+                               'sha1'  => $srcObj->getMetadataValue( 'Sha1base36' )
                        );
                } catch ( NoSuchContainerException $e ) {
                } catch ( NoSuchObjectException $e ) {
@@@ -742,7 -780,7 +740,7 @@@
         * @throws Exception cloudfiles exceptions
         */
        protected function addMissingMetadata( CF_Object $obj, $path ) {
-               if ( isset( $obj->metadata['Sha1base36'] ) ) {
+               if ( $obj->getMetadataValue( 'Sha1base36' ) !== null ) {
                        return true; // nothing to do
                }
                wfProfileIn( __METHOD__ );
@@@ -754,14 -792,14 +752,14 @@@
                        if ( $tmpFile ) {
                                $hash = $tmpFile->getSha1Base36();
                                if ( $hash !== false ) {
-                                       $obj->metadata['Sha1base36'] = $hash;
+                                       $obj->setMetadataValues( array( 'Sha1base36' => $hash ) );
                                        $obj->sync_metadata(); // save to Swift
                                        wfProfileOut( __METHOD__ );
                                        return true; // success
                                }
                        }
                }
-               $obj->metadata['Sha1base36'] = false;
+               $obj->setMetadataValues( array( 'Sha1base36' => false ) );
                wfProfileOut( __METHOD__ );
                return false; // failed
        }