Merge pull request #54 from mytardis/develop

Merging into master for v0.6.0-beta5 build
mytardis · Jul 28, 2016 · d60cf31 · d60cf31
2 parents 3090889 + 29f2f4f
commit d60cf31
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 8 deletions.
diff --git a/mydata/__init__.py b/mydata/__init__.py
@@ -3,7 +3,7 @@
 """
 import sys
 
-__version__ = "0.6.0-beta4"
+__version__ = "0.6.0-beta5"
 
 
 try:

diff --git a/mydata/controllers/uploads.py b/mydata/controllers/uploads.py
@@ -201,13 +201,23 @@ def Md5ProgressCallback(bytesProcessed):
             datasetUri = self.folderModel.GetDatasetModel().GetResourceUri()
             dataFileCreatedTime = \
                 self.folderModel.GetDataFileCreatedTime(self.dataFileIndex)
-            dataFileJson = {"dataset": datasetUri,
-                            "filename": dataFileName,
-                            "directory": dataFileDirectory,
-                            "md5sum": dataFileMd5Sum,
-                            "size": dataFileSize,
-                            "mimetype": dataFileMimeType,
-                            "created_time": dataFileCreatedTime}
+            dataFileModifiedTime = \
+                self.folderModel.GetDataFileModifiedTime(self.dataFileIndex)
+            dataFileJson = {
+                "dataset": datasetUri,
+                "filename": dataFileName,
+                "directory": dataFileDirectory,
+                "md5sum": dataFileMd5Sum,
+                "size": dataFileSize,
+                "mimetype": dataFileMimeType,
+                "created_time": dataFileCreatedTime,
+                "modification_time": dataFileModifiedTime,
+            }
+            if self.foldersController.uploadMethod == \
+                    UploadMethod.VIA_STAGING:
+                dataFileJson['uploader_uuid'] = self.settingsModel.GetUuid()
+                dataFileJson['requester_key_fingerprint'] = \
+                    self.settingsModel.GetSshKeyPair().GetFingerprint()
 
             if self.uploadModel.Canceled():
                 self.foldersController.SetCanceled()

diff --git a/mydata/models/folder.py b/mydata/models/folder.py
@@ -124,6 +124,16 @@ def GetDataFileCreatedTime(self, dataFileIndex):
             logger.error(traceback.format_exc())
             return None
 
+    def GetDataFileModifiedTime(self, dataFileIndex):
+        absoluteFilePath = self.GetDataFilePath(dataFileIndex)
+        try:
+            modifiedTimeIsoString = datetime.fromtimestamp(
+                os.stat(absoluteFilePath).st_mtime).isoformat()
+            return modifiedTimeIsoString
+        except:  # pylint: disable=bare-except
+            logger.error(traceback.format_exc())
+            return None
+
     def SetExperiment(self, experimentModel):
         self.experimentModel = experimentModel