encoding fix

Signed-off-by: jace-roell <jace.roell@hotmail.com>
zowe · Oct 30, 2024 · e0a653b · e0a653b
1 parent bc3598f
commit e0a653b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/packages/cli/__tests__/zosfiles/__system__/download/ussdir/__resources__/.zosattributes b/packages/cli/__tests__/zosfiles/__system__/download/ussdir/__resources__/.zosattributes
@@ -2,4 +2,4 @@
 *.bin binary binary
 *.jcl IBM-1047 IBM-1047
 *.md UTF-8 UTF-8
-*.txt UTF-8 IBM-1047
+*.txt UTF-8 IBM-1147
diff --git a/packages/zosfiles/src/methods/upload/Upload.ts b/packages/zosfiles/src/methods/upload/Upload.ts
@@ -860,30 +860,27 @@ export class Upload {
         ussPath: string,
         options: IUploadOptions
     ): Promise<IZosFilesResponse> {
-        const tempOptions: Partial<IUploadOptions> = { ...options };
+        const tempOptions: IUploadOptions = { ...options };
         if (options.attributes) {
             if (!options.attributes.fileShouldBeUploaded(localPath)) {
                 return;
             }
             tempOptions.binary = options.attributes.getFileTransferMode(localPath, options.binary) === TransferMode.BINARY;
             const remoteEncoding = options.attributes.getRemoteEncoding(localPath);
-            if (remoteEncoding != null && remoteEncoding !== Tag.BINARY) {
-                tempOptions.encoding = remoteEncoding;
-            }
+
+            if(remoteEncoding === Tag.BINARY) tempOptions.encoding = undefined;
+            else if(remoteEncoding !== null) tempOptions.encoding = remoteEncoding
+
             if (!tempOptions.binary) {
                 tempOptions.localEncoding = options.attributes.getLocalEncoding(localPath);
             }
-        } else {
-            if (options.filesMap) {
-                if (options.filesMap.fileNames.indexOf(path.basename(localPath)) > -1) {
-                    tempOptions.binary = options.filesMap.binary;
-                } else {
-                    tempOptions.binary = options.binary;
-                }
-            } else {
-                tempOptions.binary = options.binary;
-            }
+        } else if(options.filesMap && options.filesMap.fileNames.indexOf(path.basename(localPath)) > -1) {
+            tempOptions.binary = options.filesMap.binary;
+
+             // Reset encoding to undefined if binary is true to avoid file tagging issues
+            if(tempOptions.binary) tempOptions.encoding = undefined;
         }
+
         return await this.fileToUssFile(session, localPath, ussPath, tempOptions);
     }