bugfix

[krypto.git] / robot.py

diff --git a/robot.py b/robot.py
index 58fed48..a49c337 100755 (executable)
--- a/robot.py
+++ b/robot.py
@@ -22,12 +22,16 @@ class settings:
 settings = pickle.load(open('./robot_settings'))
 os.chdir(settings.path)
 
 settings = pickle.load(open('./robot_settings'))
 os.chdir(settings.path)
 

-def posli_mail(komu, co, text):
+def posli_mail(komu, co, text, loguj=None):

     msg = MIMEText(text)
     msg['Subject'] = co
     msg['From'] = settings.name + " <" + settings.mail  + ">"
     msg['To'] = komu
     smtplib.SMTP('localhost').sendmail(settings.mail, komu, msg.as_string())
     msg = MIMEText(text)
     msg['Subject'] = co
     msg['From'] = settings.name + " <" + settings.mail  + ">"
     msg['To'] = komu
     smtplib.SMTP('localhost').sendmail(settings.mail, komu, msg.as_string())

+    if loguj:
+        f = open(loguj, 'w')
+        f.write(msg.as_string())
+        f.close()

 
 # Cteni mailu
 mail = email.message_from_file(sys.stdin)
 
 # Cteni mailu
 mail = email.message_from_file(sys.stdin)


@@ -57,7 +61,17 @@ if opsny == 'H':
     sys.exit()
 if 'L' in opsny:
     mail = pickle.load(open('./msg_last.tmp'))
     sys.exit()
 if 'L' in opsny:
     mail = pickle.load(open('./msg_last.tmp'))

-    if ((re.match(r".*\<(.*)\>.*", mail['From']).group(1) or mail['From']) != (re.match(r".*\<(.*)\>.*", odesilatel).group(1) or odesilatel)):
+    m1 = re.match(r".*\<(.*)\>.*", mail['From'])
+    m2 = re.match(r".*\<(.*)\>.*", odesilatel)
+    if m1:
+        f1 = m1.group(1)
+    else:
+        f1 = mail['From']
+    if m2:
+        f2 = m2.group(1)
+    else:
+        f2 = odesilatel
+    if (f1 != f2):

         posli_mail(odesilatel, "Omluva", "Omlouvam se,"
                    " ale Vase zprava uz bohuzel neni na serveru ulozena.\n")
         sys.exit()
         posli_mail(odesilatel, "Omluva", "Omlouvam se,"
                    " ale Vase zprava uz bohuzel neni na serveru ulozena.\n")
         sys.exit()


@@ -129,11 +143,9 @@ if mod_x:
 
 # Posuny v abecede
 (posun, posunuty_text) = posuny.nejlepsi(zprava)
 
 # Posuny v abecede
 (posun, posunuty_text) = posuny.nejlepsi(zprava)

-
-

 if 'P' in opsny or 'A' in opsny:
     analyza.append("\nPosuny v abecede (nejlepsi posun {0}):".format(posun))
 if 'P' in opsny or 'A' in opsny:
     analyza.append("\nPosuny v abecede (nejlepsi posun {0}):".format(posun))

-    analyza.append("{0} {1}".format(i, posuny.vsechny(zprava)[i]) for i in range(26))
+    analyza.append("\n".join("{0:>2} {1}".format(i + 1, posuny.vsechny(zprava)[i]) for i in range(26)))

 else:
     analyza.append("\nNejlepsi posun ({0}):".format(posun))
     analyza.append(posunuty_text)
 else:
     analyza.append("\nNejlepsi posun ({0}):".format(posun))
     analyza.append(posunuty_text)


@@ -160,27 +172,18 @@ analyza.append(''.join(["\nS pozdravem\nVas Robot\n"
                         "\n--\nPro napovedu zaslete mail s predmetem \"",
                         settings.subject," H\".\n"]))
 
                         "\n--\nPro napovedu zaslete mail s predmetem \"",
                         settings.subject," H\".\n"]))
 

-# Kompozice odpovedi
-msg = MIMEText("\n".join(analyza))
-msg['Subject'] = "Analyza Vasi zpravy"
-msg['From'] = settings.name + " <" + settings.mail  + ">"
-msg['To'] = odesilatel
-

 # Odeslani odpovedi
 # Odeslani odpovedi

-s = smtplib.SMTP('localhost')
-s.sendmail(settings.mail, odesilatel, msg.as_string())
-s.quit()
-
-# Zalogovani posledni zpravy
-f = open('./robot_last.tmp', 'w')
-f.write(msg.as_string())
-f.close()
+posli_mail(odesilatel, "Analyza Vasi zpravy", "\n".join(analyza), './robot_last.tmp')

 
 f = open('./msg_last.tmp', 'w')
 pickle.dump(mail, f)
 f.close()
 
 f = open('./robot.log', 'a')
 
 f = open('./msg_last.tmp', 'w')
 pickle.dump(mail, f)
 f.close()
 
 f = open('./robot.log', 'a')

-odesilatel2 = re.match(r".*\<(.*)\>.*", odesilatel) or odesilatel
+m = re.match(r".*\<(.*)\>.*", odesilatel)
+if m:
+    odesilatel2 = m.group(1)
+else:
+    odesilatel2 = odesilatel

 f.write(asctime() + " " +  odesilatel2 + " " + opsny + "\n")
 f.close()
 f.write(asctime() + " " +  odesilatel2 + " " + opsny + "\n")
 f.close()