Removed the recognition reporting files. Don't need them anymore

Author: Damien Detcherry

get_capturio.py

@@ -15,10 +15,8 @@
 from models.image_storage import ImageStorage
 from models.image_recognition import ImageRecognition
 
-from config import Config
 from incoming_mail import IncomingMailHandler
 from get_capturio_mail import GetMailHandler
-from encryption import Encryption
 from moodstocks import Moodstocks
 
 class GetCapturioHandler(InboundMailHandler):
@@ -201,38 +199,19 @@ def buildResponseMail(self, recognitionID):
 		requesterAttachment = (self.requestedVcardName, self.requestedVcardContent)
 		requesterAttachments = [requesterAttachment]
 
-		conf = Config()
-		site_url = conf.site_url
-		
-		# We encrypt the recognition ID for the error reporting URL for the requester
-		encryptedIDForRequester = Encryption.getEncryptedIDForRequesterError(recognitionID)
-		logging.info("Encrypted ID for Requester: %s" % encryptedIDForRequester)
-		
-		urlForRequester = site_url + "reportrequester?id=%s&crypt=%s" % (recognitionID, encryptedIDForRequester)
-		logging.info("URL that the requester can use to report an error: %s", urlForRequester)
-		
-		self.responseHandler.sendResponse("vcardAttached", requesterAttachments, urlForRequester)
+		self.responseHandler.sendResponse("vcardAttached", requesterAttachments)
 
 		#----------------------------
 
 		self.alertRecognition = GetMailHandler(self.requestedMail)
 
-		# We encrypt the recognition ID for the error reporting URL for the requester
-		encryptedIDForRequested = Encryption.getEncryptedIDForRequestedError(recognitionID)
-		logging.info("Encrypted ID for Requested: %s" % encryptedIDForRequested)
-		
-		urlForRequested = site_url + "reportrequested?id=%s&crypt=%s" % (recognitionID, encryptedIDForRequested)
-		logging.info("URL that the requested can use to report an error: %s", urlForRequested)	
-		
 		# We now instantiate the attachment for the requested 
 		if((self.requesterVcardName) and (self.requesterVcardContent)):
 			requestedAttachment = (self.requesterVcardName, self.requesterVcardContent)
 			requestedAttachments = [requestedAttachment]
-		
-			self.alertRecognition.sendAlert("justCapturedRequesterWithVcard", requestedAttachments, urlForRequested, self.requesterLabel, self.requesterMail)
-		
+			self.alertRecognition.sendAlert("justCapturedRequesterWithVcard", requestedAttachments, self.requesterLabel, self.requesterMail)
 		else:
-			self.alertRecognition.sendAlert("justCapturedRequesterWithoutVcard", None, urlForRequested, self.requesterLabel, self.requesterMail)
+			self.alertRecognition.sendAlert("justCapturedRequesterWithoutVcard", None, self.requesterLabel, self.requesterMail)
 
 
 application = webapp.WSGIApplication([GetCapturioHandler.mapping()], debug=True)

get_capturio_mail.py

@@ -10,7 +10,7 @@ def __init__(self, senderMail):
 			to = senderMail
 		)
 
-	def sendResponse(self, typeOfResponse, attachments = None, url = None):
+	def sendResponse(self, typeOfResponse, attachments = None):
 		if(typeOfResponse == "noAttachment"):
 			self.responseMail.subject = "We didn't find any ID image in your last email"
 			self.responseMail.body = """			
@@ -27,7 +27,7 @@ def sendResponse(self, typeOfResponse, attachments = None, url = None):
 We're sorry but we did not recognize the extension of your image. Please make sure to send a .jpeg/.jpg , .png or .gif image.		
 			"""				
 		elif(typeOfResponse == "noMatchingImage"):
-			self.responseMail.subject = "We didn't find any vcard associated with your image"
+			self.responseMail.subject = "We don't know this image"
 			self.responseMail.body = """
 We're sorry but we don't know this image. Please retry with a picture with more light and/or precision.
 			"""
@@ -40,9 +40,7 @@ def sendResponse(self, typeOfResponse, attachments = None, url = None):
 			self.responseMail.subject = "[Capturio rocks] Please find attached the vcard you requested"
 			self.responseMail.body = """
 Please find attached the vcard associated with the image you sent earlier. Isn't it magical? Feel free to send us other images. 
-
-If this is not the right vcard (more than exceptional), please click the following link to report it: %s. Our team will take a look at it ASAP. Thanks for helping us improve our service.
-			""" % (url)
+			""" 
 			self.responseMail.attachments = attachments	
 		elif(typeOfResponse == "error"):
 			self.responseMail.subject = "An error occurred"
@@ -56,9 +54,9 @@ def sendResponse(self, typeOfResponse, attachments = None, url = None):
 		signature = """
 Ping us soon again!
 
-Captur.io's crew
+Captur.io crew
 
-PS: If your vcard is not associated yet with your ID, send both to post@captur.io. For more information, go to http://captur.io		
+PS: If your vcard is not associated yet with one of your personal object, just send both to post@captur.io. For more information, go to http://captur.io		
 		"""
 
 		self.responseMail.body = hello + self.responseMail.body + signature	
@@ -67,31 +65,27 @@ def sendResponse(self, typeOfResponse, attachments = None, url = None):
 		logging.info("responseMail sent")
 
 
-	def sendAlert(self, typeOfResponse, attachments = None, url = None, label = None, mail = None):
+	def sendAlert(self, typeOfResponse, attachments = None, label = None, mail = None):
 
 		if(typeOfResponse == "justCapturedRequesterWithVcard"):
-			self.responseMail.subject = "You have been captured by another person on Captur.io"
+			self.responseMail.subject = "[Vcard attached] You have been captured by another person on Captur.io"
 			self.responseMail.body = """
-The following person: %s (%s) captured you with Capturio! He just receives your vcard because you have probably shown him your ID! Please find also attached his own vcard.
-
-If you think there is an error, please click the following link to report it: %s. Our team will take a look at it ASAP. Thanks for helping us improve our service.
-			""" % (label, mail, url)
+The following person: %s (%s) captured you with Capturio! He just receives your vcard because you have probably shown him your Capturio object! Please find also attached his own vcard.
+			""" % (label, mail)
 			self.responseMail.attachments = attachments		
 		elif(typeOfResponse == "justCapturedRequesterWithoutVcard"):
 			self.responseMail.subject = "You have been captured by another person on Captur.io"
 			self.responseMail.body = """
-The following person: %s (%s) captured you with Capturio! He just receives your vcard because you have probably shown him your ID!
-
-If you think there is an error, please click the following link to report it: %s. Our team will take a look at it ASAP. Thanks for helping us improve our service.
-			""" % (label, mail, url)
+The following person: %s (%s) captured you with Capturio! He just receives your vcard because you have probably shown him your Capturio object!
+			""" % (label, mail)
 
 		hello = """
 Hey,
 		"""
 		signature = """
 Ping us soon again!
 
-Capturio's crew
+Capturio crew
 		"""
 
 		self.responseMail.body = hello + self.responseMail.body + signature	

post_capturio_mail.py

@@ -73,7 +73,7 @@ def sendResponse(self, typeOfResponse, URL = ""):
 		signature = """
 Ping us soon again!
 
-Capturio's crew
+Capturio crew
 		"""
 
 		self.responseMail.body = hello + self.responseMail.body + signature