ENH: refs #236. Don't allow duplicate bitstream names in a single revision

when uploading via the web API

Author: zachmullen

modules/api/controllers/components/ApiComponent.php

@@ -230,6 +230,16 @@ function uploadGeneratetoken($args)
         $revision->setLicense(null);
         $revision = $itemModel->addRevision($item, $revision);
         }
+
+      $siblings = $revision->getBitstreams();
+      foreach($siblings as $sibling)
+        {
+        if($sibling->getName() == $args['filename'])
+          {
+          // already have a file with this name. don't add new record.
+          return array('token' => '');
+          }
+        }
       Zend_Loader::loadClass('BitstreamDao', BASE_PATH.'/core/models/dao');
       $bitstream = new BitstreamDao();
       $bitstream->setChecksum($args['checksum']);

modules/api/tests/controllers/ApiCallMethodsTest.php

@@ -262,6 +262,7 @@ public function testUpload()
     $this->params['token'] = $this->_loginUsingApiKey();
     $this->params['method'] = 'midas.upload.generatetoken';
     $this->params['filename'] = 'test.txt';
+    $this->params['checksum'] = 'foo';
     // call should fail for the first item since we don't have write permission
     $this->params['itemid'] = $itemsFile[0]->getKey();
     $this->request->setMethod('POST');
@@ -274,9 +275,25 @@ public function testUpload()
     $usersFile = $this->loadData('User', 'default');
     $itemsFile = $this->loadData('Item', 'default');
 
+    //now upload using our token
+    $this->resetAll();
+    $string = '';
+    $length = 100;
+    for($i = 0; $i < $length; $i++)
+      {
+      $string .= 'a';
+      }
+    $fh = fopen(BASE_PATH.'/tmp/misc/test.txt', 'w');
+    fwrite($fh, $string);
+    fclose($fh);
+    $md5 = md5($string);
+    $assetstoreFile = BASE_PATH.'/data/assetstore/'.substr($md5, 0, 2).'/'.substr($md5, 2, 2).'/'.$md5;
+    unlink($assetstoreFile);
+
     $this->params['token'] = $this->_loginUsingApiKey();
     $this->params['method'] = 'midas.upload.generatetoken';
     $this->params['filename'] = 'test.txt';
+    $this->params['checksum'] = $md5;
     // use the second item since it has write permission set for our user
     $this->params['itemid'] = $itemsFile[1]->getKey();
     $this->request->setMethod('POST');
@@ -290,22 +307,6 @@ public function testUpload()
     $this->assertTrue(file_exists(BASE_PATH.'/tmp/misc/'.$token),
       'Token placeholder file '.$token.' was not created in the temp dir');
 
-    //now upload using our token
-    $this->resetAll();
-
-    $string = '';
-    $length = 100;
-    for($i = 0; $i < $length; $i++)
-      {
-      $string .= 'a';
-      }
-    $fh = fopen(BASE_PATH.'/tmp/misc/test.txt', 'w');
-    fwrite($fh, $string);
-    fclose($fh);
-    $md5 = md5($string);
-    $assetstoreFile = BASE_PATH.'/data/assetstore/'.substr($md5, 0, 2).'/'.substr($md5, 2, 2).'/'.$md5;
-    unlink($assetstoreFile);
-
     $this->params['method'] = 'midas.upload.perform';
     $this->params['uploadtoken'] = $token;
     $this->params['filename'] = 'test.txt';