Reimplement downloadItem.getFilename API.

Previously, the suggested file name(Always 'empty') returned by
'download_item->GetSuggestedFilename' is not the same with the default one saved
in local disk.

The patch reimplement this API allowing it to return the default file name, which
is more expected from user.

atom/browser/api/atom_api_download_item.cc

@@ -11,7 +11,9 @@
 #include "atom/common/native_mate_converters/gurl_converter.h"
 #include "atom/common/node_includes.h"
 #include "base/memory/linked_ptr.h"
+#include "base/strings/utf_string_conversions.h"
 #include "native_mate/dictionary.h"
+#include "net/base/filename_util.h"
 
 namespace mate {
 
@@ -112,8 +114,13 @@ bool DownloadItem::HasUserGesture() {
   return download_item_->HasUserGesture();
 }
 
-std::string DownloadItem::GetSuggestedFilename() {
+std::string DownloadItem::GetFilename() {
-  return download_item_->GetSuggestedFilename();
+  return base::UTF16ToUTF8(net::GenerateFileName(GetUrl(),
+                           GetContentDisposition(),
+                           std::string(),
+                           download_item_->GetSuggestedFilename(),
+                           GetMimeType(),
+                           std::string()).LossyDisplayName());
 }
 
 std::string DownloadItem::GetContentDisposition() {
@@ -147,7 +154,7 @@ mate::ObjectTemplateBuilder DownloadItem::GetObjectTemplateBuilder(
       .SetMethod("getUrl", &DownloadItem::GetUrl)
       .SetMethod("getMimeType", &DownloadItem::GetMimeType)
       .SetMethod("hasUserGesture", &DownloadItem::HasUserGesture)
-      .SetMethod("getSuggestedFilename", &DownloadItem::GetSuggestedFilename)
+      .SetMethod("getFilename", &DownloadItem::GetFilename)
       .SetMethod("getContentDisposition", &DownloadItem::GetContentDisposition)
       .SetMethod("setSavePath", &DownloadItem::SetSavePath);
 }

atom/browser/api/atom_api_download_item.h

@@ -44,7 +44,7 @@ class DownloadItem : public mate::EventEmitter,
   int64 GetTotalBytes();
   std::string GetMimeType();
   bool HasUserGesture();
-  std::string GetSuggestedFilename();
+  std::string GetFilename();
   std::string GetContentDisposition();
   const GURL& GetUrl();
   void SetSavePath(const base::FilePath& path);

atom/browser/api/lib/app.coffee

@@ -16,7 +16,7 @@ wrapDownloadItem = (download_item) ->
   download_item.__proto__ = EventEmitter.prototype
   # Be compatible with old APIs.
   download_item.url = download_item.getUrl()
-  download_item.filename = download_item.getSuggestedFilename()
+  download_item.filename = download_item.getFilename()
   download_item.mimeType = download_item.getMimeType()
   download_item.hasUserGesture = download_item.hasUserGesture()
 

docs/api/download-item.md

@@ -10,10 +10,10 @@ win.webContents.session.on('will-download', function(event, item, webContents) {
   // Set the save path, making Electron not to prompt a save dialog.
   item.setSavePath('/tmp/save.pdf');
   console.log(item.getMimeType());
-  console.log(item.getSuggestedFilename());
+  console.log(item.getFilename());
   console.log(item.getTotalBytes());
   item.on('updated', function() {
-    console.log('Recived bytes: ' + item.getReceivedBytes());
+    console.log('Received bytes: ' + item.getReceivedBytes());
   });
   item.on('done', function(e, state) {
     if (state == "completed") {
@@ -24,7 +24,6 @@ win.webContents.session.on('will-download', function(event, item, webContents) {
   });
 ```
 
-
 ## Events
 
 ### Event: 'updated'
@@ -79,13 +78,13 @@ Returns a `String` represents the mime type.
 
 Returns a `Boolean` indicates whether the download has user gesture.
 
-### `downloadItem.getSuggestedFilename()`
+### `downloadItem.getFilename()`
 
-Returns a `String` represents the suggested file name of the download file.
+Returns a `String` represents the file name of the download item.
 
-**Note:** The suggested file name is not always the same as the actual one saved
+**Note:** The file name is not always the same as the actual one saved in local
-in local disk. If user changes the file name in a prompted download saving
+disk. If user changes the file name in a prompted download saving dialog, the
-dialog, the actual name of saved file will be different with the suggested one.
+actual name of saved file will be different.
 
 ### `downloadItem.getTotalBytes()`
 

spec/api-session-spec.coffee

@@ -95,8 +95,9 @@ describe 'session module', ->
         ipc.sendSync 'set-download-option', false
         w.loadUrl "#{url}:#{port}"
         ipc.once 'download-done', (state, url, mimeType, receivedBytes,
-            totalBytes, disposition) ->
+            totalBytes, disposition, filename) ->
           assert.equal state, 'completed'
+          assert.equal filename, 'mock.pdf'
           assert.equal url, "http://127.0.0.1:#{port}/"
           assert.equal mimeType, 'application/pdf'
           assert.equal receivedBytes, mockPDF.length
@@ -112,8 +113,9 @@ describe 'session module', ->
         ipc.sendSync 'set-download-option', true
         w.loadUrl "#{url}:#{port}/"
         ipc.once 'download-done', (state, url, mimeType, receivedBytes,
-            totalBytes, disposition) ->
+            totalBytes, disposition, filename) ->
           assert.equal state, 'cancelled'
+          assert.equal filename, 'mock.pdf'
           assert.equal mimeType, 'application/pdf'
           assert.equal receivedBytes, 0
           assert.equal totalBytes, mockPDF.length

spec/static/main.js

@@ -89,7 +89,8 @@ app.on('ready', function() {
                                     item.getMimeType(),
                                     item.getReceivedBytes(),
                                     item.getTotalBytes(),
-                                    item.getContentDisposition());
+                                    item.getContentDisposition(),
+                                    item.getFilename());
           });
           if (need_cancel)
             item.cancel();