progress

Signed-off-by: jace-roell <jace.roell@hotmail.com>

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 binary

packages/zosfiles/src/methods/download/Download.ts

@@ -24,7 +24,7 @@ import { ZosFilesUtils } from "../../utils/ZosFilesUtils";
 import { List } from "../list/List";
 import { IDownloadOptions, IDownloadSingleOptions } from "./doc/IDownloadOptions";
 import { CLIENT_PROPERTY } from "../../doc/types/ZosmfRestClientProperties";
-import { Utilities } from "../utilities";
+import { Tag, Utilities } from "../utilities";
 import { IZosmfListResponse } from "../list/doc/IZosmfListResponse";
 import { IDownloadDsmResult } from "./doc/IDownloadDsmResult";
 import { IDownloadUssDirResult } from "./doc/IDownloadUssDirResult";
@@ -521,7 +521,16 @@ export class Download {
 
             const writeStream = options.stream ?? IO.createWriteStream(destination);
 
-            // If data type is not defined by user, check for USS tags
+            //const remoteEncoding = options.attributes.getRemoteEncoding(ussFileName);
+            options.binary = options.attributes.getFileTransferMode(ussFileName, options.binary) === TransferMode.BINARY;
+            const localEncoding = options.attributes.getRemoteEncoding(ussFileName);
+            // If attributes map was passed from handler then assign remote coding of the file to the download encoding
+            if(options.attributes && localEncoding != null && localEncoding !== Tag.BINARY )
+            {
+                options.encoding = options.attributes.getRemoteEncoding(ussFileName);
+            }
+
+            // If data type is not defined by user via encoding flag or attributes file, check for USS tags
             if (options.binary == null && options.encoding == null) {
                 await Utilities.applyTaggedEncoding(session, ussFileName, options);
             }
@@ -531,11 +540,6 @@ export class Download {
             ussFileName = ZosFilesUtils.sanitizeUssPathForRestCall(ussFileName);
             const endpoint = posix.join(ZosFilesConstants.RESOURCE, ZosFilesConstants.RES_USS_FILES, ussFileName);
 
-            if(options.attributes)
-            {
-                options.encoding = options.attributes.getRemoteEncoding(ussFileName);
-            }
-
             const reqHeaders: IHeaderContent[] = this.generateHeadersBasedOnOptions(options);
 
             // Use specific options to mimic ZosmfRestClient.getStreamed()

usstest.txt

@@ -1 +1 @@
-E@Q@U@�@�@I@h@Y@�����@Z|{[l@_@�@�@[@�@?
+á { í ó ú ñ Ç ß 12345 §à£$% ^ Ý ~ $ #