bugfix

[krypto.git] / robot.py

diff --git a/robot.py b/robot.py
index 98792db..f227eb5 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)


@@ -72,7 +76,9 @@ if 'L' in opsny:
                    " ale Vase zprava uz bohuzel neni na serveru ulozena.\n")
         sys.exit()
 telo = mail.get_payload().strip()
                    " ale Vase zprava uz bohuzel neni na serveru ulozena.\n")
         sys.exit()
 telo = mail.get_payload().strip()

-if len(telo) < 2:
+if len(ocesat(telo, False)) < 2:
+    posli_mail(odesilatel, "Omluva", "Omlouvam se,"
+                   " ale Vase zprava je prilis kratka.\n")

     sys.exit()
 zprava = telo.upper()
 analyza = []
     sys.exit()
 zprava = telo.upper()
 analyza = []


@@ -125,17 +131,20 @@ for char in sorted(freq, key=freq.get, reverse=True):
                    float(freq[char])/celkem))
 
 # Index koincidence
                    float(freq[char])/celkem))
 
 # Index koincidence

-# TODO verze s mezerami
-analyza.append("\nIndexy koincidence (vzdy bez mezer):")
-analyza.append(koincidence.tabulka_indexu(zprava))
+if mod_m:
+    analyza.append("\nIndex koincidence (s mezerami):")
+    analyza.append('{0:.2%}'.format(koincidence.index_koincidence(zprava, True)))
+if mod_x:
+    analyza.append("\nIndexy koincidence (bez mezer):")
+    analyza.append(koincidence.tabulka_indexu(zprava))

 
 # Jakobsen
 if mod_m:
     analyza.append("\nJakobsen (s mezerami):")
 
 # Jakobsen
 if mod_m:
     analyza.append("\nJakobsen (s mezerami):")

-    analyza.append(jakobsen.desifruj(zprava, './ref'))
+    analyza.append(jakobsen.desifruj(zprava))

 if mod_x:
     analyza.append("\nJakobsen (bez mezer):")
 if mod_x:
     analyza.append("\nJakobsen (bez mezer):")

-    analyza.append(jakobsen.desifruj(zprava, './bref'))
+    analyza.append(jakobsen.desifruj(zprava, False))

 
 # Posuny v abecede
 (posun, posunuty_text) = posuny.nejlepsi(zprava)
 
 # Posuny v abecede
 (posun, posunuty_text) = posuny.nejlepsi(zprava)


@@ -169,12 +178,7 @@ analyza.append(''.join(["\nS pozdravem\nVas Robot\n"
                         settings.subject," H\".\n"]))
 
 # Odeslani odpovedi
                         settings.subject," H\".\n"]))
 
 # Odeslani odpovedi

-posli_mail(odesilatel, "Analyza Vasi zpravy", "\n".join(analyza))
-
-# 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 = open('./msg_last.tmp', 'w')
 pickle.dump(mail, f)