Minor refactoring

openzim · Sep 7, 2023 · 9237475 · 9237475
1 parent c6fa28b
commit 9237475
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/src/Downloader.ts b/src/Downloader.ts
@@ -179,36 +179,30 @@ class Downloader {
         { condition: await MediaWiki.hasWikimediaDesktopRestApi(), value: MediaWiki.desktopRestApiUrl.href },
         { condition: await MediaWiki.hasVisualEditorApi(), value: MediaWiki.visualEditorApiUrl.href },
       ])
-
-      logger.log('Base Url: ', this.baseUrl)
-      logger.log('Base Url for Main Page: ', this.baseUrlForMainPage)
-
-      if (!this.baseUrl || !this.baseUrlForMainPage) throw new Error('Unable to find appropriate API end-point to retrieve article HTML')
     } else {
       switch (forceRender) {
         case 'WikimediaDesktop':
           if (MediaWiki.hasWikimediaDesktopRestApi()) {
             this.baseUrl = MediaWiki.desktopRestApiUrl.href
             this.baseUrlForMainPage = MediaWiki.desktopRestApiUrl.href
-            logger.log('Base Url: ', this.baseUrl)
-            logger.log('Base Url for Main Page: ', this.baseUrlForMainPage)
             break
           }
           break
         case 'VisualEditor':
           if (MediaWiki.hasVisualEditorApi()) {
             this.baseUrl = MediaWiki.visualEditorApiUrl.href
             this.baseUrlForMainPage = MediaWiki.visualEditorApiUrl.href
-
-            logger.log('Base Url: ', this.baseUrl)
-            logger.log('Base Url for Main Page: ', this.baseUrlForMainPage)
             break
           }
           break
         default:
           throw new Error('Unable to find specific API end-point to retrieve article HTML')
       }
     }
+    logger.log('Base Url: ', this.baseUrl)
+    logger.log('Base Url for Main Page: ', this.baseUrlForMainPage)
+
+    if (!this.baseUrl || !this.baseUrlForMainPage) throw new Error('Unable to find appropriate API end-point to retrieve article HTML')
   }
 
   public removeEtagWeakPrefix(etag: string): string {