fix: cannot open file/directory with long characters

kimlimjustin · Oct 2, 2021 · b4f19e7 · b4f19e7
1 parent 879bcc1
commit b4f19e7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/Components/Files/File Operation/open.ts b/src/Components/Files/File Operation/open.ts
@@ -162,14 +162,14 @@ const displayFiles = async (files: fileData[], dir:string, options?: {reveal: bo
             switch (layout) {
                 case "m":
                     fileGrid.classList.add("medium-grid-view")
-                    dirent.name =
+                    dirent.displayName =
 						dirent.name.length > 30
 							? dirent.name.substring(0, 30) + '...'
 							: dirent.name;
                     break;
                 case "l":
                     fileGrid.classList.add("large-grid-view")
-                    dirent.name =
+                    dirent.displayName =
 						dirent.name.length > 40
 							? dirent.name.substring(0, 40) + '...'
 							: dirent.name;
@@ -179,7 +179,7 @@ const displayFiles = async (files: fileData[], dir:string, options?: {reveal: bo
                     break;
                 default:
                     fileGrid.classList.add("small-grid-view")
-                    dirent.name =
+                    dirent.displayName =
 						dirent.name.length > 20
 							? dirent.name.substring(0, 20) + '...'
 							: dirent.name;
@@ -198,7 +198,7 @@ const displayFiles = async (files: fileData[], dir:string, options?: {reveal: bo
             fileGrid.dataset.path = escape(dirent.path ?? path.join(dir, dirent.name))
             fileGrid.innerHTML = `
             ${preview}
-            <span class="file-grid-filename" id="file-filename">${dirent.name}</span><span class="file-modifiedAt" id="file-createdAt">${new Date(dirent.modifiedAt ?? dirent.trashDeletionDate).toLocaleString(navigator.language, { hour12: false })}</span>
+            <span class="file-grid-filename" id="file-filename">${dirent.displayName}</span><span class="file-modifiedAt" id="file-createdAt">${new Date(dirent.modifiedAt ?? dirent.trashDeletionDate).toLocaleString(navigator.language, { hour12: false })}</span>
             ${dirent.size > 0 ? `<span class="file-size" id="file-size">${formatBytes(dirent.size)}</span>` : `<span class="file-size" id="file-size"></span>`}
             <span class="file-type">${dirent.type}</span>
             `

diff --git a/src/Components/Layout/home.ts b/src/Components/Layout/home.ts
@@ -48,6 +48,7 @@ const homeFiles = (callback: cb) => {
 					isHidden: isHiddenFile(
 						path.join(os.homedir(), dirent.name)
 					),
+					displayName: dirent.name,
 				};
 				const type = dirent.isDirectory()
 					? 'File Folder'
@@ -92,14 +93,14 @@ const homeFiles = (callback: cb) => {
 			switch (layout) {
 				case 'm':
 					className += ' medium-grid-view';
-					file.name =
+					file.displayName =
 						file.name.length > 30
 							? file.name.substring(0, 30) + '...'
 							: file.name;
 					break;
 				case 'l':
 					className += ' large-grid-view';
-					file.name =
+					file.displayName =
 						file.name.length > 40
 							? file.name.substring(0, 40) + '...'
 							: file.name;
@@ -109,7 +110,7 @@ const homeFiles = (callback: cb) => {
 					break;
 				default:
 					className += ' small-grid-view';
-					file.name =
+					file.displayName =
 						file.name.length > 20
 							? file.name.substring(0, 20) + '...'
 							: file.name;
@@ -130,7 +131,7 @@ const homeFiles = (callback: cb) => {
 			}">
             ${preview}
             <span class="file-grid-filename" id="file-filename">${Translate(
-				file.name
+				file.displayName
 			)}</span><span class="file-modifiedAt" id="file-createdAt">${new Date(
 				file.modifiedAt
 			).toLocaleString(navigator.language, { hour12: false })}</span>

diff --git a/src/Typings/fileData.d.ts b/src/Typings/fileData.d.ts
@@ -12,4 +12,5 @@ export default interface fileData {
 	path?: string;
 	realPath?: string;
 	trashDeletionDate?: string | Date;
+	displayName?: string;
 }