Ticket #541: browse_save_with_extension.patch

downloadmanager.py

@@ -14 +14 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-import os
+import os, os.path
+import shutil
 import logging
 from gettext import gettext as _
 import time
@@ -161 +162 @@
             if NS_FAILED(status): # download cancelled
                 return
 
+            basedir = os.path.dirname(self._target_file.path)
+            final_target = os.path.join(basedir, self._get_file_name())
+
+            #TODO: Handle multiple filenames
+            shutil.move(self._target_file.path, final_target)
+
             self._stop_alert = Alert()
             self._stop_alert.props.title = _('Download completed') 
             self._stop_alert.props.msg = _('%s' % self._get_file_name()) 
@@ -178 +185 @@
             self.dl_jobject.metadata['title'] = _('File %s from %s.') % \
                     (self._get_file_name(), self._source.spec)
             self.dl_jobject.metadata['progress'] = '100'
-            self.dl_jobject.file_path = self._target_file.path
+            self.dl_jobject.file_path = final_target
 
-            if self._mime_type == 'application/octet-stream':
-                sniffed_mime_type = mime.get_for_file(self._target_file.path)
+            if self._mime_type == 'application/octet-stream' or \
+                    self._mime_type == 'application/x-zip':
+                sniffed_mime_type = mime.get_for_file(final_target)
                 self.dl_jobject.metadata['mime_type'] = sniffed_mime_type
 
             datastore.write(self.dl_jobject,