From c09b245a4c55162551dfc5821b31608dd15fb27e Mon Sep 17 00:00:00 2001
From: Vikas Shashidhar <vikas@Vikass-MacBook-Air.local>
Date: Tue, 26 Sep 2017 16:48:18 +0530
Subject: [PATCH] Adds a count to the file name in the download manager if the
 user downloads a file with the same name.

---
 js/downloadManager/index.js | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/js/downloadManager/index.js b/js/downloadManager/index.js
index bf7ac47e..dc01bd29 100644
--- a/js/downloadManager/index.js
+++ b/js/downloadManager/index.js
@@ -56,9 +56,10 @@ function showInFinder(id) {
 function createDOM(arg) {
 
     if (arg && arg._id) {
+        let fileDisplayName = getFileDisplayName(arg.fileName);
+        let downloadItemKey = arg._id;
 
         local.downloadItems.push(arg);
-        let downloadItemKey = arg._id;
 
         let ul = document.getElementById('download-main');
         if (ul) {
@@ -108,7 +109,7 @@ function createDOM(arg) {
 
             let h2FileName = document.createElement('h2');
             h2FileName.classList.add('text-cutoff');
-            h2FileName.innerHTML = arg.fileName;
+            h2FileName.innerHTML = fileDisplayName;
             fileNameDiv.appendChild(h2FileName);
 
             let fileProgressTitle = document.createElement('span');
@@ -194,4 +195,33 @@ function initiate() {
             });
         }
     }
+}
+
+/**
+ * Return a file display name for the download item
+ */
+function getFileDisplayName(fileName) {
+    let fileList = local.downloadItems;
+    let fileNameCount = 0;
+    let fileDisplayName = fileName;
+
+    /* Check if a file with the same name exists 
+     * (akin to the user downloading a file with the same name again)
+     * in the download bar
+     */
+    for (let i = 0; i < fileList.length; i++) {
+        if (fileName === fileList[i].fileName) {
+            fileNameCount++;
+        }
+    }
+
+    /* If it exists, add a count to the name like how Chrome does */
+    if (fileNameCount) {
+        let extLastIndex = fileDisplayName.lastIndexOf('.');
+        let fileCount = ' (' + fileNameCount + ')';
+
+        fileDisplayName = fileDisplayName.slice(0, extLastIndex) + fileCount + fileDisplayName.slice(extLastIndex);
+    }
+
+    return fileDisplayName;
 }
\ No newline at end of file