Minor improvements to file handling.

Author: rliebz

dvn_client/src/file.py

@@ -11,21 +11,24 @@
 #local modules
 import utils
 
+
 class DvnFile(object):
     def __init__(self, name, editMediaUri, mimetype, updated, hostStudy):
         self.name = name
         self.editMediaUri = editMediaUri
         self.mimetype = mimetype
         self.updated = updated
         self.hostStudy = hostStudy
+        self.fileId = editMediaUri.split('/')[-2]
 
     def __repr__(self):
         return """
     DVN FILE:
     Name: {0}
     Uri: {1}
     Mime: {2}
-    """.format(self.name, self.editMediaUri, self.mimetype)
+    Id: {3}
+    """.format(self.name, self.editMediaUri, self.mimetype, self.fileId)
 
     # Note: Information about files comes from the statement of the study, not the entry
     # # TODO untested!!!!!!!
@@ -57,5 +60,4 @@ def CreateFromAtomStatementObject(cls, atomStatementEntry, hostStudy):
         mimetype = atomStatementEntry.content[editMediaUri]["type"]
         # Note: Updated element is meaningless at the moment
         updated = datetime.strptime(atomStatementEntry.updated, "%Y-%m-%dT%H:%M:%S.%fZ")
-        return cls(name, editMediaUri, mimetype, updated, hostStudy)
-        
+        return cls(name, editMediaUri, mimetype, updated, hostStudy)

dvn_client/src/study.py

@@ -137,7 +137,8 @@ def add_files(self, filepaths):
         for filepath in filepaths:
             filename = os.path.basename(filepath)
             if os.path.getsize(filepath) < 5:
-                raise DvnException('The DataVerse does not accept files less than 5 bytes.')
+                raise DvnException('The DataVerse does not currently accept files less than 5 bytes. '
+                                   '{} cannot be uploaded.'.format(filename))
             elif filename in [f.name for f in self.get_files()]:
                 raise DvnException('The file {} already exists on the DataVerse'.format(filename))
 
@@ -155,9 +156,8 @@ def add_files(self, filepaths):
         filename = os.path.basename(filepath)
 
         with open(filepath, "rb") as pkg:
-            depositReceipt = self.hostDataverse.connection.swordConnection.append(
-                dr=self.lastDepositReceipt,
-                se_iri=self.editMediaUri,
+            depositReceipt = self.hostDataverse.connection.swordConnection.add_file_to_resource(
+                edit_media_iri=self.editMediaUri,
                 payload=pkg,
                 mimetype='application/zip',
                 filename=filename,