fix: simplify input file loading

Signed-off-by: Andrew Calcutt <acalcutt@techidiots.net>

src/main.js

@@ -80,26 +80,21 @@ const startServer = (configPath, config) => {
   });
 };
 
-const startWithPMTiles = async (pmtilesFile) => {
+const startWithInputFile = async (inputfile) => {
-  console.log(`[INFO] Automatically creating config file for ${pmtilesFile}`);
+  console.log(`[INFO] Automatically creating config file for ${inputfile}`);
   console.log(`[INFO] Only a basic preview style will be used.`);
   console.log(
     `[INFO] See documentation to learn how to create config.json file.`,
   );
 
-  pmtilesFile = path.resolve(process.cwd(), pmtilesFile);
+  inputfile = path.resolve(process.cwd(), inputfile);
 
-  const pmtilesStats = fs.statSync(pmtilesFile);
+  const tilesStats = fs.statSync(inputfile);
-  if (!pmtilesStats.isFile() || pmtilesStats.size === 0) {
+  if (!tilesStats.isFile() || tilesStats.size === 0) {
-    console.log(`ERROR: Not valid pmtiles file: ${pmtilesFile}`);
+    console.log(`ERROR: Not valid MBTiles or PMTiles file: ${inputfile}`);
     process.exit(1);
   }
 
-  const info = await GetPMtilesInfo(pmtilesFile);
-  const metadata = info.metadata;
-
-  console.log(info);
-
   const styleDir = path.resolve(
     __dirname,
     '../node_modules/tileserver-gl-styles/',
@@ -111,19 +106,24 @@ const startWithPMTiles = async (pmtilesFile) => {
         root: styleDir,
         fonts: 'fonts',
         styles: 'styles',
-        mbtiles: path.dirname(pmtilesFile),
+        mbtiles: path.dirname(inputfile),
       },
     },
     styles: {},
     data: {},
   };
 
+  const extension = inputfile.split('.').pop().toLowerCase();
+  if (extension === 'pmtiles') {
+    const info = await GetPMtilesInfo(inputfile);
+    const metadata = info.metadata;
+  
     if (
       metadata.format === 'pbf' &&
       metadata.name.toLowerCase().indexOf('openmaptiles') > -1
     ) {
       config['data'][`v3`] = {
-      mbtiles: path.basename(pmtilesFile),
+        mbtiles: path.basename(inputfile),
       };
   
       const styles = fs.readdirSync(path.resolve(styleDir, 'styles'));
@@ -141,7 +141,7 @@ const startWithPMTiles = async (pmtilesFile) => {
       }
     } else {
       console.log(
-      `WARN: MBTiles not in "openmaptiles" format. Serving raw data only...`,
+        `WARN: PMTiles not in "openmaptiles" format. Serving raw data only...`,
       );
       config['data'][
         (metadata.id || 'mbtiles')
@@ -149,7 +149,7 @@ const startWithPMTiles = async (pmtilesFile) => {
           .replace(/:/g, '_')
           .replace(/\?/g, '_')
       ] = {
-      mbtiles: path.basename(pmtilesFile),
+        mbtiles: path.basename(inputfile),
       };
     }
   
@@ -160,26 +160,11 @@ const startWithPMTiles = async (pmtilesFile) => {
     }
   
     return startServer(null, config);
-};
+  } else {
-
+    const instance = new MBTiles(inputfile + '?mode=ro', (err) => {
-const startWithMBTiles = (mbtilesFile) => {
-  console.log(`[INFO] Automatically creating config file for ${mbtilesFile}`);
-  console.log(`[INFO] Only a basic preview style will be used.`);
-  console.log(
-    `[INFO] See documentation to learn how to create config.json file.`,
-  );
-
-  mbtilesFile = path.resolve(process.cwd(), mbtilesFile);
-
-  const mbtilesStats = fs.statSync(mbtilesFile);
-  if (!mbtilesStats.isFile() || mbtilesStats.size === 0) {
-    console.log(`ERROR: Not valid MBTiles file: ${mbtilesFile}`);
-    process.exit(1);
-  }
-  const instance = new MBTiles(mbtilesFile + '?mode=ro', (err) => {
       if (err) {
         console.log('ERROR: Unable to open MBTiles.');
-      console.log(`Make sure ${path.basename(mbtilesFile)} is valid MBTiles.`);
+        console.log(`Make sure ${path.basename(inputfile)} is valid MBTiles.`);
         process.exit(1);
       }
   
@@ -187,36 +172,18 @@ const startWithMBTiles = (mbtilesFile) => {
         if (err || !info) {
           console.log('ERROR: Metadata missing in the MBTiles.');
           console.log(
-          `Make sure ${path.basename(mbtilesFile)} is valid MBTiles.`,
+            `Make sure ${path.basename(inputfile)} is valid MBTiles.`,
           );
           process.exit(1);
         }
         const bounds = info.bounds;
   
-      const styleDir = path.resolve(
-        __dirname,
-        '../node_modules/tileserver-gl-styles/',
-      );
-
-      const config = {
-        options: {
-          paths: {
-            root: styleDir,
-            fonts: 'fonts',
-            styles: 'styles',
-            mbtiles: path.dirname(mbtilesFile),
-          },
-        },
-        styles: {},
-        data: {},
-      };
-
         if (
           info.format === 'pbf' &&
           info.name.toLowerCase().indexOf('openmaptiles') > -1
         ) {
           config['data'][`v3`] = {
-          mbtiles: path.basename(mbtilesFile),
+            mbtiles: path.basename(inputfile),
           };
   
           const styles = fs.readdirSync(path.resolve(styleDir, 'styles'));
@@ -242,7 +209,7 @@ const startWithMBTiles = (mbtilesFile) => {
               .replace(/:/g, '_')
               .replace(/\?/g, '_')
           ] = {
-          mbtiles: path.basename(mbtilesFile),
+            mbtiles: path.basename(inputfile),
           };
         }
   
@@ -255,6 +222,7 @@ const startWithMBTiles = (mbtilesFile) => {
         return startServer(null, config);
       });
     });
+  }
 };
 
 fs.stat(path.resolve(opts.config), (err, stats) => {
@@ -266,7 +234,9 @@ fs.stat(path.resolve(opts.config), (err, stats) => {
       inputfile = opts.mbtiles;
     }
 
-    if (!inputfile) {
+    if (inputfile) {
+      return startWithInputFile(inputfile);
+    } else {
       // try to find in the cwd
       const files = fs.readdirSync(process.cwd());
       for (const filename of files) {
@@ -280,12 +250,7 @@ fs.stat(path.resolve(opts.config), (err, stats) => {
       }
       if (inputfile) {
         console.log(`No input file specified, using ${inputfile}`);
-        const extension = inputfile.split('.').pop().toLowerCase();
+        return startWithInputFile(inputfile);
-        if (extension === 'pmtiles') {
-          return startWithPMTiles(inputfile);
-        } else {
-          return startWithMBTiles(inputfile);
-        }
       } else {
         const url =
           'https://github.com/maptiler/tileserver-gl/releases/download/v1.3.0/zurich_switzerland.mbtiles';
@@ -293,18 +258,10 @@ fs.stat(path.resolve(opts.config), (err, stats) => {
         const stream = fs.createWriteStream(filename);
         console.log(`No input file found`);
         console.log(`[DEMO] Downloading sample data (${filename}) from ${url}`);
-        stream.on('finish', () => startWithMBTiles(filename));
+        stream.on('finish', () => startWithInputFile(filename));
         return request.get(url).pipe(stream);
       }
     }
-    if (inputfile) {
-      const extension = inputfile.split('.').pop().toLowerCase();
-      if (extension === 'pmtiles') {
-        return startWithPMTiles(inputfile);
-      } else {
-        return startWithMBTiles(inputfile);
-      }
-    }
   } else {
     console.log(`Using specified config file from ${opts.config}`);
     return startServer(opts.config, null);