Merge branch 'master' of deluge-torrent.org:deluge

deluge/plugins/notifications/notifications/core.py

@@ -38,6 +38,7 @@
 #
 
 import smtplib
+from email.utils import formatdate
 from twisted.internet import defer, threads
 from deluge import component
 from deluge.event import known_events
@@ -118,11 +119,14 @@ class CoreNotifications(CustomNotifications):
 From: %(smtp_from)s
 To: %(smtp_recipients)s
 Subject: %(subject)s
+Date: %(date)s
 
 
 """ % {'smtp_from': self.config['smtp_from'],
        'subject': subject,
-       'smtp_recipients': to_addrs}
+       'smtp_recipients': to_addrs,
+       'date': formatdate()
+      }
 
         message = '\r\n'.join((headers + message).splitlines())
 

deluge/ui/console/modes/input_popup.py

@@ -42,7 +42,7 @@ try:
 except ImportError:
     pass
 
-import logging,os.path
+import logging,os,os.path
 
 from popup import Popup
 
@@ -476,7 +476,8 @@ class TextInput(InputField):
                             self.cursor = len(prefix)
 
                     if len(opts) > 1 and second_hit: # display multiple options on second tab hit
-                        self.opts = "  ".join(opts)
+                        sp = self.value.rfind(os.sep)+1
+                        self.opts = "  ".join([o[sp:] for o in opts])
 
         # Cursor movement
         elif c == curses.KEY_LEFT:
@@ -520,6 +521,7 @@ class TextInput(InputField):
                 # Move the cursor forward
                 self.cursor+=1
         
+
     def complete(self,line):
         line = os.path.abspath(os.path.expanduser(line))
         ret = []
@@ -534,7 +536,7 @@ class TextInput(InputField):
                         continue
                     f = os.path.join(line, f)
                     if os.path.isdir(f):
-                        f += "/"
+                        f += os.sep
                     ret.append(f)
             else:
                 # This is a file, but we could be looking for another file that
@@ -552,9 +554,8 @@ class TextInput(InputField):
                         p = os.path.join(os.path.dirname(line), f)
 
                         if os.path.isdir(p):
-                            p += "/"
+                            p += os.sep
                         ret.append(p)
-
         return ret