From: Tomas Musil <tomik.musil@gmail.com>
Date: Mon, 2 Apr 2012 13:28:47 +0000 (+0200)
Subject: merge
X-Git-Url: http://git.tomasm.cz/krypto.git/commitdiff_plain/d57f411cc12d3006a9a90c03e01fe7b3cfa54446?hp=7cf21962d42a0e4136f55a245b83474be4a42e90

merge
---

diff --git a/robot.py b/robot.py
index 16897a6..79282fc 100755
--- a/robot.py
+++ b/robot.py
@@ -79,7 +79,12 @@ if 'L' in opsny:
         posli_mail(odesilatel, "Omluva", "Omlouvam se,"
                    " ale Vase zprava uz bohuzel neni na serveru ulozena.\n")
         sys.exit()
-telo = mail.get_payload().strip()
+
+if mail.is_multipart():
+    telo = mail.get_payload(0).get_payload().strip()
+else:
+    telo = mail.get_payload().strip()
+
 if len(ocesat(telo, False)) < 2:
     posli_mail(odesilatel, "Omluva", "Omlouvam se,"
                    " ale Vase zprava je prilis kratka.\n")
@@ -149,8 +154,9 @@ if mod_x and len(zprava) >= 10:
 
 # Vigenere
 if 'V' in opsny:
+    # TODO?poradne cteni opsnu
     analyza.append("\nHeslo k Vigenerovi (" + opsny[-1] + "):")
-    vig_heslo, vig_text = vigere.vsechno(zprava, int(opsny[-1]))
+    vig_heslo, vig_text = vigenere.vsechno(zprava, int(opsny[-1]))
     analyza.append(vig_heslo)
     analyza.append(vig_text)
 
diff --git a/vigenere.py b/vigenere.py
index 6f3f741..3197d07 100644
--- a/vigenere.py
+++ b/vigenere.py
@@ -8,9 +8,9 @@ from spolecne import cisla_na_text
 def soucet(x, y):
     return x + y
 
-def vysledek(zprava, delka_h):
+def vsechno(zprava, delka_h):
     """Najde heslo dane delky, pri jehoz aplikaci budou frekvence znaku nejlepe
-    odpovidat cestine."""
+    odpovidat cestine a patricne posunuty text."""
     rozklady = rozklad(ocesat(zprava, False), delka_h)
     posuny = [nej_posun(text) for text in rozklady]
     posunute = [''.join([posun(c, posuny[i]) for c in rozklady[i]]) for i in range(len(posuny))]