From 00cc35f63287fe35ba6d9cf81f27670d5072f66f Mon Sep 17 00:00:00 2001
From: Billy Zhu <yuxiangz@andrew.cmu.edu>
Date: Sun, 19 Nov 2017 14:40:44 -0500
Subject: [PATCH] send md5 on open; accept all uploaded files

---
 restful-tango/tangoREST.py | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/restful-tango/tangoREST.py b/restful-tango/tangoREST.py
index c61dff1c..b3d52f59 100644
--- a/restful-tango/tangoREST.py
+++ b/restful-tango/tangoREST.py
@@ -28,7 +28,6 @@ def __init__(self):
         self.found_dir = self.create(0, "Found directory")
         self.made_dir = self.create(0, "Created directory")
         self.file_uploaded = self.create(0, "Uploaded file")
-        self.file_exists = self.create(0, "File exists")
         self.job_added = self.create(0, "Job added")
         self.obtained_info = self.create(0, "Found info successfully")
         self.obtained_jobs = self.create(0, "Found list of jobs")
@@ -102,18 +101,19 @@ def getOutPath(self, key, courselab):
         labPath = self.getDirPath(key, courselab)
         return "%s/%s" % (labPath, self.OUTPUT_FOLDER)
 
-    def checkFileExists(self, directory, filename, fileMD5):
-        """ checkFileExists - Checks if a file exists in a
-            directory
+    def computeMD5(self, directory):
+        """ computeMD5 - Computes the MD5 hash of given files in the
+        given directory
         """
+        result = {}
         for elem in os.listdir(directory):
-            if elem == filename:
-                try:
-                    body = open("%s/%s" % (directory, elem)).read()
-                    md5hash = hashlib.md5(body).hexdigest()
-                    return md5hash == fileMD5
-                except IOError:
-                    continue
+            try:
+                body = open("%s/%s" % (directory, elem)).read()
+                md5hash = hashlib.md5(body).hexdigest()
+                result[elem] = md5hash
+            except IOError:
+                continue
+        return result
 
     def createTangoMachine(self, image, vmms=Config.VMMS_NAME,
                            vmObj={'cores': 1, 'memory': 512}):
@@ -244,7 +244,7 @@ def open(self, key, courselab):
                     self.log.info(
                         "Found directory for (%s, %s)" % (key, courselab))
                     statusObj = self.status.found_dir
-                    statusObj['files'] = {}
+                    statusObj['files'] = self.computeMD5(labPath)
                     return statusObj
                 else:
                     outputPath = self.getOutPath(key, courselab)
@@ -262,8 +262,7 @@ def open(self, key, courselab):
             return self.status.wrong_key
 
     def upload(self, key, courselab, file, body):
-        """ upload - Upload file as an input file in key-courselab if the
-        same file doesn't exist already
+        """ upload - Upload file as an input file in key-courselab
         """
         self.log.debug("Received upload request(%s, %s, %s)" %
                        (key, courselab, file))
@@ -271,11 +270,6 @@ def upload(self, key, courselab, file, body):
             labPath = self.getDirPath(key, courselab)
             try:
                 if os.path.exists(labPath):
-                    fileMD5 = hashlib.md5(body).hexdigest()
-                    if self.checkFileExists(labPath, file, fileMD5):
-                        self.log.info(
-                            "File (%s, %s, %s) exists" % (key, courselab, file))
-                        return self.status.file_exists
                     absPath = "%s/%s" % (labPath, file)
                     fh = open(absPath, "wt")
                     fh.write(body)