Merge branch 'v0.21.x'

2020-07-06 20:45:29 +02:00
parent 86823af685 749ad7cd83
commit c3cfb5fe16
27 changed files with 239 additions and 99 deletions
--- a/src/db/plugins/simple/SimpleDatabasePlugin.cxx
+++ b/src/db/plugins/simple/SimpleDatabasePlugin.cxx
@@ -427,7 +427,7 @@ IsUnsafeChar(char ch)
 	return !IsSafeChar(ch);
 }

-void
+bool
 SimpleDatabase::Mount(const char *local_uri, const char *storage_uri)
 {
 	if (cache_path.IsNull())
@@ -446,9 +446,11 @@ SimpleDatabase::Mount(const char *local_uri, const char *storage_uri)
 						   compress);
 	db->Open();

-	// TODO: update the new database instance?
+	bool exists = db->FileExists();

 	Mount(local_uri, std::move(db));
+
+	return exists;
 }

 inline DatabasePtr