Change library validation logic

Signed-off-by: worksofliam <mrliamallan@live.co.uk>

src/api/IBMiContent.ts

@@ -484,21 +484,26 @@ export default class IBMiContent {
       return true;
     });
 
+    const sanitized = Tools.sanitizeLibraryNames(newLibl);
+
     const result = await this.ibmi.sendQsh({
       command: [
         `liblist -d ` + Tools.sanitizeLibraryNames(this.ibmi.defaultUserLibraries).join(` `),
-        ...newLibl.map(lib => `liblist -a ` + Tools.sanitizeLibraryNames([lib]))
+        ...sanitized.map(lib => `liblist -a ` + lib)
       ].join(`; `)
     });
 
     if (result.stderr) {
       const lines = result.stderr.split(`\n`);
 
       lines.forEach(line => {
-        const badLib = newLibl.find(lib => line.includes(`ibrary ${lib} `) || line.includes(`ibrary ${Tools.sanitizeLibraryNames([lib])} `));
+        const isNotFound = line.includes(`CPF2110`);
+        if (isNotFound) {
+          const libraryReference = sanitized.find(lib => line.includes(lib));
 
-        // If there is an error about the library, remove it
-        if (badLib) badLibs.push(badLib);
+          // If there is an error about the library, remove it
+          if (libraryReference) badLibs.push(libraryReference);
+        }
       });
     }
 

src/testing/content.ts

@@ -294,10 +294,11 @@ export const ContentSuite: TestSuite = {
       name: `Test validateLibraryList`, test: async () => {
         const content = instance.getContent();
 
-        const badLibs = await content?.validateLibraryList([`QSYSINC`, `BEEPBOOP`]);
+        const badLibs = await content?.validateLibraryList([`SCOOBY`, `QSYSINC`, `BEEPBOOP`]);
 
         assert.strictEqual(badLibs?.includes(`BEEPBOOP`), true);
         assert.strictEqual(badLibs?.includes(`QSYSINC`), false);
+        assert.strictEqual(badLibs?.includes(`SCOOBY`), true);
       }
     },