Fetch ASP at time of read/write

Signed-off-by: worksofliam <[email protected]>

Author: worksofliam

src/api/IBMi.ts

@@ -1228,7 +1228,7 @@ export default class IBMi {
     if (!foundNumber) {
       const [row] = await this.runSQL(`SELECT IASP_NUMBER FROM TABLE(QSYS2.LIBRARY_INFO('${this.sysNameInAmerican(library)}'))`);
       const iaspNumber = Number(row?.IASP_NUMBER);
-      if (iaspNumber) {
+      if (iaspNumber >= 0) {
         this.libraryAsps[library] = iaspNumber;
         foundNumber = iaspNumber;
       }
@@ -1239,7 +1239,7 @@ export default class IBMi {
 
   getLibraryIAsp(library: string) {
     const found = this.libraryAsps[library];
-    if (found) {
+    if (found >= 0) {
       return this.getIAspName(found);
     }
   }

src/api/IBMiContent.ts

@@ -142,7 +142,6 @@ export default class IBMiContent {
    * Download the contents of a source member
    */
   async downloadMemberContent(asp: string | undefined, library: string, sourceFile: string, member: string, localPath?: string) {
-    asp = asp || this.ibmi.getCurrentIAspName();
     library = this.ibmi.upperCaseName(library);
     sourceFile = this.ibmi.upperCaseName(sourceFile);
     member = this.ibmi.upperCaseName(member);
@@ -210,7 +209,6 @@ export default class IBMiContent {
    * Upload to a member
    */
   async uploadMemberContent(asp: string | undefined, library: string, sourceFile: string, member: string, content: string | Uint8Array) {
-    asp = asp || this.ibmi.getCurrentIAspName();
     library = this.ibmi.upperCaseName(library);
     sourceFile = this.ibmi.upperCaseName(sourceFile);
     member = this.ibmi.upperCaseName(member);

src/filesystems/qsys/QSysFs.ts

@@ -148,7 +148,8 @@ export class QSysFS implements vscode.FileSystemProvider {
         const contentApi = instance.getContent();
         const connection = instance.getConnection();
         if (connection && contentApi) {
-            const { asp, library, file, name: member } = this.parseMemberPath(connection, uri.path);
+            let { asp, library, file, name: member } = this.parseMemberPath(connection, uri.path);
+            asp = asp || await connection.lookupLibraryIAsp(library);
 
             let memberContent;
             try {
@@ -189,7 +190,9 @@ export class QSysFS implements vscode.FileSystemProvider {
         const contentApi = instance.getContent();
         const connection = instance.getConnection();
         if (connection && contentApi) {
-            const { asp, library, file, name: member, extension } = this.parseMemberPath(connection, uri.path);
+            let { asp, library, file, name: member, extension } = this.parseMemberPath(connection, uri.path);
+            asp = asp || await connection.lookupLibraryIAsp(library);
+
             if (!content.length) { //Coming from "Save as"
                 const addMember = await connection.runCommand({
                     command: `ADDPFM FILE(${library}/${file}) MBR(${member}) SRCTYPE(${extension || '*NONE'})`,
@@ -202,6 +205,7 @@ export class QSysFS implements vscode.FileSystemProvider {
                     throw new FileSystemError(addMember.stderr);
                 }
             }
+
             else {
                 this.savedAsMembers.delete(uri.path);
                 this.extendedMemberSupport ?