Task cleanup

web/tasks.py

@@ -7,39 +7,39 @@ from rq import get_current_job
 BLOCKSIZE = 65535
 
 
+def set_meta(job, message):
+    job.meta["status"] = message
+    job.save_meta()
+
+
 def check_hash(algorithm, filename, hashval):
     job = get_current_job()
     if job:
-        job.meta["status"] = "Processing: 0%"
-        job.save_meta()
-
         if filename == "" or hashval == "":
-            return "ERROR: Invalid Arguents"
+            set_meta(job, "FAILED: Invalid Job")
+            return
 
         if algorithm == "sha256":
             hashfunc = hashlib.sha256()
         else:
-            return "ERROR: Unknown Algorithm"
+            set_meta(job, "FAILED: Unknown Algorithm")
+            return
 
         filesize = os.path.getsize(filename)
         filepos = 0
         with open(filename, "rb") as f:
             file_buffer = f.read(BLOCKSIZE)
             filepos += len(file_buffer)
-            job.meta["status"] = "Processing: {}%".format(filepos / filesize * 100)
-            job.save_meta()
+            set_meta(job, "Processing: {}%".format(filepos / filesize * 100))
             while len(file_buffer) > 0:
                 hashfunc.update(file_buffer)
                 file_buffer = f.read(BLOCKSIZE)
 
-        job.meta["status"] = "Processing: {}%".format(filesize / filesize * 100)
-        job.save_meta()
+        set_meta(job, "Processing: {}%".format(filesize / filesize * 100))
 
         # time.sleep(5)
 
         if hashfunc.hexdigest() == hashval:
-            job.meta["status"] = "OK: Hash Value Matches"
+            set_meta(job, "OK: Hash Value Matches")
         else:
-            job.meta["status"] = "FAILED: Invalid Hash"
-
-        job.save_meta()
+            set_meta(job, "FAILED: Invalid Hash")