Changeset 5802

Timestamp:

11/01/07 23:46:59 (6 years ago)

Author:

Jonathan.Todd

Message:

sfAmazonS3FSPlugin: Added s3 module to browse s3 files

Files:

• plugins/sfAmazonS3FSPlugin/lib/BasesfAmazonS3.class.php (modified) (2 diffs)
• plugins/sfAmazonS3FSPlugin/lib/model/sfAmazonS3BucketObject.php (modified) (6 diffs)
• plugins/sfAmazonS3FSPlugin/lib/model/sfAmazonS3BucketObjectPeer.php (modified) (1 diff)
• plugins/sfAmazonS3FSPlugin/modules/s3 (added)
• plugins/sfAmazonS3FSPlugin/modules/s3/actions (added)
• plugins/sfAmazonS3FSPlugin/modules/s3/actions/actions.class.php (added)
• plugins/sfAmazonS3FSPlugin/modules/s3/templates (added)
• plugins/sfAmazonS3FSPlugin/modules/s3/templates/listAllBucketKeysSuccess.php (added)
• plugins/sfAmazonS3FSPlugin/modules/s3/templates/listBucketKeysSuccess.php (added)
• plugins/sfAmazonS3FSPlugin/modules/s3/templates/listBucketsSuccess.php (added)
• plugins/sfAmazonS3FSPlugin/modules/s3_bucket_object/templates/showSuccess.php (modified) (1 diff)

plugins/sfAmazonS3FSPlugin/lib/BasesfAmazonS3.class.php

@@ -961 +961 @@
-  protected function validateResponseCode($successCode)
-  {
+    //echo $this->responseCode.' - '.$this->responseString."<br>";
-    if ($this->responseCode == $successCode)
-    {
-      return true;
-    }
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    return false;
-  }
@@ -1052 +1055 @@
-    }
-
+    // TODO: Fix return
+    return $this->parsedXml;
-    return $bucketKeys;
-  }

plugins/sfAmazonS3FSPlugin/lib/model/sfAmazonS3BucketObject.php

@@ -17 +17 @@
-  protected $localFilePath = null;
-  
+  // On save this determines whether or not to update existing file based
+  // on file name and path
+  protected $updateExistingFile = false;
+  
-  public function __toString()
-  {
@@ -67 +71 @@
-
-      // TODO: Fix this hack. Fileinfo method above should work on servers
-pn
+jpe
-
-    }
@@ -132 +136 @@
-  }
-  
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  public function save($con = null)
-  {
@@ -142 +159 @@
-      $file = $this->getLocalFilePath();
-    
+    // File is valid, add it
-    if($file)
-    {
+      // Update existing?
+      if($this->updateExistingFile)
+      {
+        $existingBucketObject = sfAmazonS3BucketObjectPeer::retrieveByFilePath($this->getPath(),$this->getFileName());
+        
+        // Existing file found
+        if($existingBucketObject)
+        {
+          // Existing file is older, we will update it
+          if($this->getMtime() > $existingBucketObject->getMtime())
+          {
+            $this->setId($existingBucketObject->getId()); 
+          }
+          // Exiting file is newer, no need to update
+          else
+            return -1;
+        }
+      }
+      
-      $sfAmazonS3 = new sfAmazonS3(sfConfig::get('app_amazon_s3_fs_aws_access_key_id'), sfConfig::get('app_amazon_s3_fs_secret_access_key'));
-      
@@ -172 +209 @@
-  }
-  
+  /*
+   * Delete S3 bucket object
+   * 
+   * Will only delete from DB if delete from S3 is successful
+   */
+  public function delete($con = null)
+  {
+    $sfAmazonS3 = new sfAmazonS3(sfConfig::get('app_amazon_s3_fs_aws_access_key_id'), sfConfig::get('app_amazon_s3_fs_secret_access_key'));
+    $result = $sfAmazonS3->deleteBucketObject($this->getBucketName(), $this->getKeyName());
+    
+    if($result)
+      return parent::delete();
+    return false;
+  }
+  
+  /*
+   * Id path creates a path from an ID which has a limit of 1000 files per directory
+   */
-  public function getIdPath()
-  {
@@ -244 +299 @@
-    return parent::setMtime($v);
-  }
+  
+  public function setUpdateExistingFile($v)
+  {
+    $this->updateExistingFile = $v ? true : false;
+  }
-}

plugins/sfAmazonS3FSPlugin/lib/model/sfAmazonS3BucketObjectPeer.php

@@ -10 +10 @@
-class sfAmazonS3BucketObjectPeer extends BasesfAmazonS3BucketObjectPeer
-{
+  public function retrieveByFilePath($path, $file, $con = null)
+  {
+    if ($con === null) {
+      $con = Propel::getConnection(self::DATABASE_NAME);
+    }
+
+    $criteria = new Criteria(sfAmazonS3BucketObjectPeer::DATABASE_NAME);
+
+    $criteria->add(sfAmazonS3BucketObjectPeer::PATH, $path, Criteria::LIKE);
+    $criteria->add(sfAmazonS3BucketObjectPeer::FILE_NAME, $file, Criteria::LIKE);
+
+    $v = sfAmazonS3BucketObjectPeer::doSelect($criteria, $con);
+
+    if(count($v) > 1)
+      throw new sfException("Assert Failed: There shouldn't be multiple rows with the same path and file_name\n");
+      
+    return !empty($v) > 0 ? $v[0] : null;
+  }
+  
-}

plugins/sfAmazonS3FSPlugin/modules/s3_bucket_object/templates/showSuccess.php

@@ -56 +56 @@
-</table>
-<hr />
-edit', 's3_bucket_object/edit?id='.$sf_amazon_s3_bucket_object->getId()
+delete', 's3_bucket_object/delete?id='.$sf_amazon_s3_bucket_object->getId(), 'post=true&confirm=Are you sure?'
-&nbsp;<?php echo link_to('list', 's3_bucket_object/list') ?>