better promisifying the download images calls

map3xyz · Aug 18, 2022 · 773c8cf · 773c8cf
1 parent ba7eea3
commit 773c8cf
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 24 deletions.
diff --git a/src/model/Logos.ts b/src/model/Logos.ts
@@ -31,33 +31,36 @@ export class Logos {
     }
 
     async downloadAndPersistLogos(directory: string): Promise<void> {
-        if(!this.png && !this.svg) {
-            return Promise.resolve();
-        }
-
-        if(this.png) {
-            try {
-                if(!fs.existsSync(path.join(directory, "logo.png"))) {
-                    await downloadFile(this.png, directory, 'logo.png');
+        return new Promise(async (resolve) => {
+            if(!this.png && !this.svg) {
+                return resolve();
+            }
+
+            if(this.png) {
+                try {
+                    if(!fs.existsSync(path.join(directory, "logo.png"))) {
+                        await downloadFile(this.png, directory, 'logo.png');
+                    }
+                    this.png = getGithubHostedFileUrl(directory, 'logo.png');
+                } catch (err) { 
+                    console.error(`Error downloading png. Skipping: ${err}`)
                 }
-                this.png = getGithubHostedFileUrl(directory, 'logo.png');
-            } catch (err) { 
-                console.error(`Error downloading png. Skipping: ${err}`)
             }
-        }
-
-        if(this.svg) {
-            try {
-                if(!fs.existsSync(path.join(directory, "logo.svg"))) {
-                    await downloadFile(this.svg, directory, 'logo.svg');
+
+            if(this.svg) {
+                try {
+                    if(!fs.existsSync(path.join(directory, "logo.svg"))) {
+                        await downloadFile(this.svg, directory, 'logo.svg');
+                    }
+                    this.svg = getGithubHostedFileUrl(directory, 'logo.svg');            
+                } catch (err) { 
+                    console.error(`Error downloading svg. Skipping: ${err}`) 
                 }
-                this.svg = getGithubHostedFileUrl(directory, 'logo.svg');            
-            } catch (err) { 
-                console.error(`Error downloading svg. Skipping: ${err}`) 
             }
-        }
-
-        return Promise.resolve();
+
+            return resolve();
+        });
+
     }
 
     static getLogosFromUri(logoURI?: string): Logos {

diff --git a/src/validate/rules/network/NetworkImagesRules.ts b/src/validate/rules/network/NetworkImagesRules.ts
@@ -8,7 +8,7 @@ export const NetworkImagesRules: ValidationRule[] = [
         name: `${baseName}:ShouldHaveImagesRule`,
         network: 'all',
         validate: async (network: string, repoPath: string): Promise<ValidationResult> => {
-            // TODO: implement
+            // TODO: implement if it either has a png and/or svg in the info file but we can't find the images
             return {
                 valid: true,
                 errors: []