fix: http check + errors

Signed-off-by: Andrew Calcutt <acalcutt@techidiots.net>
This commit is contained in:
Andrew Calcutt 2023-10-13 15:11:08 -04:00
parent cd13093a1a
commit 3cab6f1edf
3 changed files with 4 additions and 5 deletions

View file

@ -177,7 +177,7 @@ const StartWithInputFile = async (inputFile) => {
return StartServer(null, config);
} else {
if (isValidHttpUrl(inputFile)) {
console.log(`ERROR: MBTiles does not support web based files. "${inputFile}" is not a valid input file.`,);
console.log(`ERROR: MBTiles does not support web based files. "${inputFile}" is not a valid data file.`,);
process.exit(1);
}
const instance = new MBTiles(inputFile + '?mode=ro', (err) => {

View file

@ -203,9 +203,8 @@ export const serve_data = {
} else if (params.mbtiles) {
inputType = 'mbtiles';
if (isValidHttpUrl(params.mbtiles)) {
throw Error(
`ERROR: MBTiles does not support web based files. "${params.mbtiles}" is not a valid input file.`,
);
console.log(`ERROR: MBTiles does not support web based files. "${params.mbtiles}" is not a valid data file.`,);
process.exit(1);
} else {
inputFile = path.resolve(options.paths.mbtiles, params.mbtiles);
}

View file

@ -235,7 +235,7 @@ function start(opts) {
for (const id of Object.keys(data)) {
if (id === dataId) {
fileType = Object.keys(data[id])[0];
if (isValidHttpUrl(inputFile)) {
if (isValidHttpUrl(data[id][fileType])) {
inputFile = data[id][fileType];
} else {
inputFile = path.resolve(