bugfixes

[krypto.git] / robot.py

diff --git a/robot.py b/robot.py
index 7292736..daad9b8 100755 (executable)
--- a/robot.py
+++ b/robot.py
@@ -9,8 +9,10 @@ from ocesavac import ocesat
 import jakobsen
 from jakobsen import reference
 import koincidence
 import jakobsen
 from jakobsen import reference
 import koincidence

+import posuny

 import pickle
 import os
 import pickle
 import os

+import re

 
 ABECEDA = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 
 
 ABECEDA = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 


@@ -33,19 +35,39 @@ predmet, _, opsny = mail['Subject'].strip().upper().partition(' ')
 odesilatel = mail['From']
 if predmet != settings.subject:
     sys.exit()
 odesilatel = mail['From']
 if predmet != settings.subject:
     sys.exit()

-if (opsny == 'H'):
+if opsny == 'H':

     posli_mail(odesilatel, "Napoveda", "Napoveda:\n"
                "Prikazy robotovi vkladejte do predmetu zpravy zaslane na adresu " + 
                settings.mail + ".\nNa velikosti pismen nezalezi."
                "\n\nSeznam prikazu:\n"
                "\"" + settings.subject + "\"   Analyza zpravy z tela mailu.\n" 
                "\"" + settings.subject + " L\" Opakovana analyza posledni zpravy.\n" +
     posli_mail(odesilatel, "Napoveda", "Napoveda:\n"
                "Prikazy robotovi vkladejte do predmetu zpravy zaslane na adresu " + 
                settings.mail + ".\nNa velikosti pismen nezalezi."
                "\n\nSeznam prikazu:\n"
                "\"" + settings.subject + "\"   Analyza zpravy z tela mailu.\n" 
                "\"" + settings.subject + " L\" Opakovana analyza posledni zpravy.\n" +

+               "\"" + settings.subject + " X\" Vynuti analyzu bez mezer.\n"
+               "\"" + settings.subject + " M\" Vynuti analyzu s mezerami.\n"
+               "\"" + settings.subject + " B\" Vypise cetnost vsech bigramu.\n"
+               "\"" + settings.subject + " P\" Vypise vsechny posunuti textu.\n"
+               "\"" + settings.subject + " A\" Vypise uplne vsechno co dava "
+               "alespon trochu smysl (nedoporucuji).\n"

                "\"" + settings.subject + " H\" Tato napoveda.\n"
                "\"" + settings.subject + " H\" Tato napoveda.\n"

+               "\nVolby (mimo \"H\") je mozno libovolne kombinovat.\n"
+               "Napriklad \"" + settings.subject + " LXB\" analyzuje posledni "
+               "prijatou zpravu s vynucenim analyzy bez mezer a navic vypise "
+               "cetnosti bigramu.\n"

                "\nS pozdravem\nVas Robot\n")
     sys.exit()
                "\nS pozdravem\nVas Robot\n")
     sys.exit()

-if (opsny == 'L'):
+if 'L' in opsny:

     mail = pickle.load(open('./msg_last.tmp'))
     mail = pickle.load(open('./msg_last.tmp'))

-    if (mail['From'] != 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()


@@ -59,39 +81,35 @@ analyza = []
 analyza.append("Puvodni zprava:")
 analyza.append(telo)
 
 analyza.append("Puvodni zprava:")
 analyza.append(telo)
 

+# Prepinani spacemodu
+mod_m = False
+mod_x = False
+if 'X' in opsny:
+    mod_x = True
+if 'M' in opsny:
+    mod_m = True
+if 'A' in opsny:
+    mod_x = True
+    mod_m = True
+if not mod_m and not mod_x:
+    if ' ' in ocesat(zprava, True):
+        mod_m = True
+        analyza.append("\nAutomaticky zvolena analyza s mezerami.")
+    else:
+        mod_x = True
+        analyza.append("\nAutomaticky zvolena analyza bez mezer.")
+    

 # Zakladni udaje
 # Zakladni udaje

-analyza.append("\nDelka zpravy (bez mezer a zvlastnich znaku):")
-analyza.append(str(len(ocesat(zprava, False))))
+analyza.append("\nZakladni udaje:")
+if mod_m:
+    analyza.append("Delka zpravy (vcetne mezer a zvlastnich znaku): " + str(len(zprava)))
+analyza.append("Delka zpravy (bez mezer a zvlastnich znaku): " + str(len(ocesat(zprava, False))))

 
 

-# TODO pouze v modu s mezerami

 # Prumerna delka slova
 # Prumerna delka slova

-analyza.append("\nPrumerna delka slova:")
-slova = ocesat(zprava, True).split()
-analyza.append('{0:.3}'.format(float(sum([len(word) for word in slova]))/len(slova)))
-
-# Index koincidence
-analyza.append("\nIndexy koincidence:")
-analyza.append(koincidence.tabulka_indexu(zprava))
-
-# Jakobsen
-analyza.append("\nJakobsen:")
-analyza.append(jakobsen.desifruj(zprava, './ref'))
-
-# Posuny v abecede
-analyza.append("\nPosuny v abecede:")
-
-def posun(char):
-    if 65 <= ord(char) < 90:
-        return chr(ord(char) + 1)
-    if ord(char) == 90:
-        return 'A'
-    else:
-        return char
-
-posunuty = zprava
-for i in range(26):
-    posunuty = map(posun, posunuty)
-    analyza.append(''.join(posunuty))
+if mod_m:
+    analyza.append("\nPrumerna delka slova:")
+    slova = ocesat(zprava, True).split()
+    analyza.append('{0:.3}'.format(float(sum([len(word) for word in slova]))/len(slova)))

 
 # Frekvence znaku 
 analyza.append("\nFrekvencni analyza:")
 
 # Frekvence znaku 
 analyza.append("\nFrekvencni analyza:")


@@ -106,21 +124,44 @@ for char in sorted(freq, key=freq.get, reverse=True):
     analyza.append('{0} {1:>3} {2:>6.2%}'.format(char, freq[char],
                    float(freq[char])/celkem))
 
     analyza.append('{0} {1:>3} {2:>6.2%}'.format(char, freq[char],
                    float(freq[char])/celkem))
 

+# Index koincidence
+# TODO verze s mezerami
+analyza.append("\nIndexy koincidence (vzdy bez mezer):")
+analyza.append(koincidence.tabulka_indexu(zprava))
+
+# Jakobsen
+if mod_m:
+    analyza.append("\nJakobsen (s mezerami):")
+    analyza.append(jakobsen.desifruj(zprava, './ref'))
+if mod_x:
+    analyza.append("\nJakobsen (bez mezer):")
+    analyza.append(jakobsen.desifruj(zprava, './bref'))
+
+# 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))
+    analyza.append("\n".join("{0} {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)
+

 # Bigramy
 # Bigramy

-analyza.append("\nBigramy podle cetnosti:")
-bigramy = dict()
-for i in ABECEDA:
-    for j in ABECEDA:
-        bigramy[i+j] = 0
-for i in range(0, len(zprava)-1):
-    if zprava[i:i+2] in bigramy:
-        bigramy[zprava[i:i+2]] += 1
-celkem = sum(bigramy.values())
-for char in sorted(bigramy, key=bigramy.get, reverse=True):
-    if bigramy[char] == 0:
-        break
-    analyza.append('{0} {1:>3} {2:>6.2%}'.format(char, bigramy[char],
-                   float(bigramy[char])/celkem))
+if ('B' in opsny or 'A' in opsny):
+    analyza.append("\nBigramy podle cetnosti:")
+    bigramy = dict()
+    for i in ABECEDA:
+        for j in ABECEDA:
+            bigramy[i+j] = 0
+    for i in range(0, len(zprava)-1):
+        if zprava[i:i+2] in bigramy:
+            bigramy[zprava[i:i+2]] += 1
+    celkem = sum(bigramy.values())
+    for char in sorted(bigramy, key=bigramy.get, reverse=True):
+        if bigramy[char] == 0:
+            break
+        analyza.append('{0} {1:>3} {2:>6.2%}'.format(char, bigramy[char],
+                       float(bigramy[char])/celkem))

 
 # Podpis a pozdrav
 analyza.append(''.join(["\nS pozdravem\nVas Robot\n"
 
 # Podpis a pozdrav
 analyza.append(''.join(["\nS pozdravem\nVas Robot\n"


@@ -148,5 +189,10 @@ pickle.dump(mail, f)
 f.close()
 
 f = open('./robot.log', 'a')
 f.close()
 
 f = open('./robot.log', 'a')

-f.write(asctime() + " " +  odesilatel + "\n")
+m = re.match(r".*\<(.*)\>.*", odesilatel)
+if m:
+    odesilatel2 = m.group(1)
+else:
+    odesilatel2 = odesilatel
+f.write(asctime() + " " +  odesilatel2 + " " + opsny + "\n")

 f.close()
 f.close()