lepsi zachazeni s maily

diff --git a/robot.py b/robot.py
index 87c97f9..58fed48 100755 (executable)
--- a/robot.py
+++ b/robot.py
@@ -12,6 +12,7 @@ import koincidence
 import posuny
 import pickle
 import os
 import posuny
 import pickle
 import os

+import re

 
 ABECEDA = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 
 
 ABECEDA = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 


@@ -56,7 +57,7 @@ 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 (mail['From'] != odesilatel):
+    if ((re.match(r".*\<(.*)\>.*", mail['From']).group(1) or mail['From']) != (re.match(r".*\<(.*)\>.*", odesilatel).group(1) or odesilatel)):

         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()


@@ -180,5 +181,6 @@ pickle.dump(mail, f)
 f.close()
 
 f = open('./robot.log', 'a')
 f.close()
 
 f = open('./robot.log', 'a')

-f.write(asctime() + " " +  odesilatel + "\n")
+odesilatel2 = re.match(r".*\<(.*)\>.*", odesilatel) or odesilatel
+f.write(asctime() + " " +  odesilatel2 + " " + opsny + "\n")

 f.close()
 f.close()