From 28f773a93350de6dab660733f733320223bcbaf6 Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@pobox.com>
Date: Thu, 13 Dec 2018 11:20:06 -0800
Subject: [PATCH] Better error message if the output tileset already exists

---
 CHANGELOG.md  | 4 ++++
 dirtiles.cpp  | 5 +++--
 dirtiles.hpp  | 2 +-
 main.cpp      | 2 +-
 mbtiles.cpp   | 3 ++-
 tile-join.cpp | 2 +-
 version.hpp   | 2 +-
 7 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab48e11..cc3f92b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.32.8
+
+* Better error message if the output tileset already exists
+
 ## 1.32.7
 
 * Point features may now be coalesced into MultiPoint features with --coalesce.
diff --git a/dirtiles.cpp b/dirtiles.cpp
index 51773c7..9cb0038 100644
--- a/dirtiles.cpp
+++ b/dirtiles.cpp
@@ -62,7 +62,7 @@ static bool pbfname(const char *s) {
 	return strcmp(s, ".pbf") == 0;
 }
 
-void check_dir(const char *dir, bool force, bool forcetable) {
+void check_dir(const char *dir, char **argv, bool force, bool forcetable) {
 	struct stat st;
 
 	mkdir(dir, S_IRWXU | S_IRWXG | S_IRWXO);
@@ -71,7 +71,8 @@ void check_dir(const char *dir, bool force, bool forcetable) {
 		unlink(meta.c_str());  // error OK since it may not exist;
 	} else {
 		if (stat(meta.c_str(), &st) == 0) {
-			fprintf(stderr, "%s: file exists\n", meta.c_str());
+			fprintf(stderr, "%s: Tileset \"%s\" already exists. You can use --force if you want to delete the old tileset.\n", argv[0], dir);
+			fprintf(stderr, "%s: %s: file exists\n", argv[0], meta.c_str());
 			if (!forcetable) {
 				exit(EXIT_FAILURE);
 			}
diff --git a/dirtiles.hpp b/dirtiles.hpp
index 2a39e08..f6f9182 100644
--- a/dirtiles.hpp
+++ b/dirtiles.hpp
@@ -6,7 +6,7 @@
 
 void dir_write_tile(const char *outdir, int z, int tx, int ty, std::string const &pbf);
 
-void check_dir(const char *d, bool force, bool forcetable);
+void check_dir(const char *d, char **argv, bool force, bool forcetable);
 
 struct zxy {
 	long long z;
diff --git a/main.cpp b/main.cpp
index d96ab65..6848854 100644
--- a/main.cpp
+++ b/main.cpp
@@ -3130,7 +3130,7 @@ int main(int argc, char **argv) {
 		outdb = mbtiles_open(out_mbtiles, argv, forcetable);
 	}
 	if (out_dir != NULL) {
-		check_dir(out_dir, force, forcetable);
+		check_dir(out_dir, argv, force, forcetable);
 	}
 
 	int ret = EXIT_SUCCESS;
diff --git a/mbtiles.cpp b/mbtiles.cpp
index 7de5ce6..0d94d4c 100644
--- a/mbtiles.cpp
+++ b/mbtiles.cpp
@@ -45,7 +45,8 @@ sqlite3 *mbtiles_open(char *dbname, char **argv, int forcetable) {
 		exit(EXIT_FAILURE);
 	}
 	if (sqlite3_exec(outdb, "CREATE TABLE metadata (name text, value text);", NULL, NULL, &err) != SQLITE_OK) {
-		fprintf(stderr, "%s: create metadata table: %s\n", argv[0], err);
+		fprintf(stderr, "%s: Tileset \"%s\" already exists. You can use --force if you want to delete the old tileset.\n", argv[0], dbname);
+		fprintf(stderr, "%s: %s\n", argv[0], err);
 		if (!forcetable) {
 			exit(EXIT_FAILURE);
 		}
diff --git a/tile-join.cpp b/tile-join.cpp
index 2422766..f713641 100644
--- a/tile-join.cpp
+++ b/tile-join.cpp
@@ -1049,7 +1049,7 @@ int main(int argc, char **argv) {
 		outdb = mbtiles_open(out_mbtiles, argv, 0);
 	}
 	if (out_dir != NULL) {
-		check_dir(out_dir, force, false);
+		check_dir(out_dir, argv, force, false);
 	}
 
 	struct stats st;
diff --git a/version.hpp b/version.hpp
index 27d7f6e..5ea5ce8 100644
--- a/version.hpp
+++ b/version.hpp
@@ -1,6 +1,6 @@
 #ifndef VERSION_HPP
 #define VERSION_HPP
 
-#define VERSION "v1.32.7"
+#define VERSION "v1.32.8"
 
 #endif