Append current time to the downloaded file name

src/libs/fileDownload/FileUtils.js

@@ -1,7 +1,7 @@
 import {Alert, Linking} from 'react-native';
-import moment from 'moment';
 import CONST from '../../CONST';
 import * as Localize from '../Localize';
+import DateUtils from '../DateUtils';
 
 /**
  * Show alert on successful attachment download
@@ -57,7 +57,7 @@ function getAttachmentName(url) {
     if (!url) {
         return '';
     }
-    return `${moment().format('DDMMYYYYHHmmss')}.${url.split(/[#?]/)[0].split('.').pop().trim()}`;
+    return `${DateUtils.getDBTime()}.${url.split(/[#?]/)[0].split('.').pop().trim()}`;
 }
 
 /**
@@ -104,7 +104,7 @@ function getFileType(fileUrl) {
 function splitExtensionFromFileName(fullFileName) {
     const fileName = fullFileName.trim();
     const splitFileName = fileName.split('.');
-    const fileExtension = splitFileName.pop();
+    const fileExtension = splitFileName.length > 1 ? splitFileName.pop() : '';
     return {fileName: splitFileName.join('.'), fileExtension};
 }
 
@@ -118,4 +118,17 @@ function cleanFileName(fileName) {
     return fileName.replace(/[^a-zA-Z0-9\-._]/g, '_');
 }
 
-export {showGeneralErrorAlert, showSuccessAlert, showPermissionErrorAlert, splitExtensionFromFileName, getAttachmentName, getFileType, cleanFileName};
+/**
+ * @param {String} fileName
+ * @returns {String}
+ */
+function appendTimeToFileName(fileName) {
+    const file = splitExtensionFromFileName(fileName);
+    let newFileName = `${file.fileName} - ${DateUtils.getDBTime()}`;
+    if (file.fileExtension) {
+        newFileName += `.${file.fileExtension}`;
+    }
+    return newFileName;
+}
+
+export {showGeneralErrorAlert, showSuccessAlert, showPermissionErrorAlert, splitExtensionFromFileName, getAttachmentName, getFileType, cleanFileName, appendTimeToFileName};

src/libs/fileDownload/getAttachmentDetails.js

@@ -6,7 +6,7 @@ import tryResolveUrlFromApiRoot from '../tryResolveUrlFromApiRoot';
  * @param {String} html
  * @returns {Object}
  */
-export default function getAttachmentName(html) {
+export default function getAttachmentDetails(html) {
     // Files can be rendered either as anchor tag or as an image so based on that we have to form regex.
     const IS_IMAGE_TAG = /<img([\w\W]+?)\/>/i.test(html);
     const PREVIEW_SOURCE_REGEX = new RegExp(`${CONST.ATTACHMENT_PREVIEW_ATTRIBUTE}*=*"(.+?)"`, 'i');

src/libs/fileDownload/index.android.js

@@ -41,7 +41,7 @@ function handleDownload(url, fileName) {
 
         // Android files will download to Download directory
         const path = dirs.DownloadDir;
-        const attachmentName = fileName || FileUtils.getAttachmentName(url);
+        const attachmentName = FileUtils.appendTimeToFileName(fileName) || FileUtils.getAttachmentName(url);
 
         const isLocalFile = url.startsWith('file://');
 

src/libs/fileDownload/index.ios.js

@@ -75,7 +75,7 @@ export default function fileDownload(fileUrl, fileName) {
     return new Promise((resolve) => {
         let fileDownloadPromise = null;
         const fileType = FileUtils.getFileType(fileUrl);
-        const attachmentName = fileName || FileUtils.getAttachmentName(fileUrl);
+        const attachmentName = FileUtils.appendTimeToFileName(fileName) || FileUtils.getAttachmentName(fileUrl);
 
         switch (fileType) {
             case CONST.ATTACHMENT_FILE_TYPE.IMAGE:

src/libs/fileDownload/index.js

@@ -23,7 +23,7 @@ export default function fileDownload(url, fileName) {
                 link.style.display = 'none';
                 link.setAttribute(
                     'download',
-                    fileName || FileUtils.getAttachmentName(url), // generating the file name
+                    FileUtils.appendTimeToFileName(fileName) || FileUtils.getAttachmentName(url), // generating the file name
                 );
 
                 // Append to html link element page

src/libs/localFileDownload/index.android.js

@@ -10,13 +10,14 @@ import * as FileUtils from '../fileDownload/FileUtils';
  * @param {String} textContent
  */
 export default function localFileDownload(fileName, textContent) {
+    const newFileName = FileUtils.appendTimeToFileName(fileName);
     const dir = RNFetchBlob.fs.dirs.DocumentDir;
-    const path = `${dir}/${fileName}.txt`;
+    const path = `${dir}/${newFileName}.txt`;
 
     RNFetchBlob.fs.writeFile(path, textContent, 'utf8').then(() => {
         RNFetchBlob.MediaCollection.copyToMediaStore(
             {
-                name: fileName,
+                name: newFileName,
                 parentFolder: '', // subdirectory in the Media Store, empty goes to 'Downloads'
                 mimeType: 'text/plain',
             },

src/libs/localFileDownload/index.ios.js

@@ -1,5 +1,6 @@
 import {Share} from 'react-native';
 import RNFetchBlob from 'react-native-blob-util';
+import * as FileUtils from '../fileDownload/FileUtils';
 
 /**
  * Writes a local file to the app's internal directory with the given fileName
@@ -10,11 +11,12 @@ import RNFetchBlob from 'react-native-blob-util';
  * @param {String} textContent
  */
 export default function localFileDownload(fileName, textContent) {
+    const newFileName = FileUtils.appendTimeToFileName(fileName);
     const dir = RNFetchBlob.fs.dirs.DocumentDir;
-    const path = `${dir}/${fileName}.txt`;
+    const path = `${dir}/${newFileName}.txt`;
 
     RNFetchBlob.fs.writeFile(path, textContent, 'utf8').then(() => {
-        Share.share({url: path, title: fileName}).finally(() => {
+        Share.share({url: path, title: newFileName}).finally(() => {
             RNFetchBlob.fs.unlink(path);
         });
     });

src/libs/localFileDownload/index.js

@@ -1,3 +1,5 @@
+import * as FileUtils from '../fileDownload/FileUtils';
+
 /**
  * Creates a Blob with the given fileName and textContent, then dynamically
  * creates a temporary anchor, just to programmatically click it, so the file
@@ -10,7 +12,7 @@ export default function localFileDownload(fileName, textContent) {
     const blob = new Blob([textContent], {type: 'text/plain'});
     const url = URL.createObjectURL(blob);
     const link = document.createElement('a');
-    link.download = `${fileName}.txt`;
+    link.download = FileUtils.appendTimeToFileName(`${fileName}.txt`);
     link.href = url;
     link.click();
 }

tests/unit/FileUtilsTest.js

@@ -0,0 +1,38 @@
+import DateUtils from '../../src/libs/DateUtils';
+import * as FileUtils from '../../src/libs/fileDownload/FileUtils';
+
+describe('FileUtils', () => {
+    describe('splitExtensionFromFileName', () => {
+        it('should return correct file name and extension', () => {
+            const file = FileUtils.splitExtensionFromFileName('image.jpg');
+            expect(file.fileName).toEqual('image');
+            expect(file.fileExtension).toEqual('jpg');
+        });
+
+        it('should return correct file name and extension even with multiple dots on the file name', () => {
+            const file = FileUtils.splitExtensionFromFileName('image.pdf.jpg');
+            expect(file.fileName).toEqual('image.pdf');
+            expect(file.fileExtension).toEqual('jpg');
+        });
+
+        it('should return empty extension if the file name does not have it', () => {
+            const file = FileUtils.splitExtensionFromFileName('image');
+            expect(file.fileName).toEqual('image');
+            expect(file.fileExtension).toEqual('');
+        });
+    });
+
+    describe('appendTimeToFileName', () => {
+        it('should append current time to the end of the file name', () => {
+            const actualFileName = FileUtils.appendTimeToFileName('image.jpg');
+            const expectedFileName = `image - ${DateUtils.getDBTime()}.jpg`;
+            expect(actualFileName).toEqual(expectedFileName);
+        });
+
+        it('should append current time to the end of the file name without extension', () => {
+            const actualFileName = FileUtils.appendTimeToFileName('image');
+            const expectedFileName = `image - ${DateUtils.getDBTime()}`;
+            expect(actualFileName).toEqual(expectedFileName);
+        });
+    });
+});