Allow more characters in instance names and add an error message

Previously allowed:  "A-Za-z0-9 "
Now allowed:         "A-Za-z0-9 !@#$%^()_+-=[]{};'."

2 files changed, 33 insertions, 3 deletions

diff --git a/src/instancemanager.cpp b/src/instancemanager.cpp
index 2b718cb2..1c6542e8 100644
--- a/src/instancemanager.cpp
+++ b/src/instancemanager.cpp
@@ -131,11 +131,12 @@ QString InstanceManager::manageInstances(const QStringList &instanceList) const
 QString InstanceManager::queryInstanceName(const QStringList &instanceList) const
 {
   QString instanceId;
+  QString dialogText;
   while (instanceId.isEmpty()) {
     QInputDialog dialog;
 
-	dialog.setWindowTitle(QObject::tr("Enter a Name for the new Instance"));
-    dialog.setLabelText(QObject::tr("Enter a new name or select one from the sugested list (only letters and numbers allowed):"));
+	  dialog.setWindowTitle(QObject::tr("Enter a Name for the new Instance"));
+    dialog.setLabelText(QObject::tr("Enter a new name or select one from the suggested list:"));
     // would be neat if we could take the names from the game plugins but
     // the required initialization order requires the ini file to be
     // available *before* we load plugins
@@ -146,7 +147,17 @@ QString InstanceManager::queryInstanceName(const QStringList &instanceList) cons
     if (dialog.exec() == QDialog::Rejected) {
       throw MOBase::MyException(QObject::tr("Canceled"));
     }
-    instanceId = dialog.textValue().replace(QRegExp("[^0-9a-zA-Z ]"), "").remove(QRegExp("( )*$"));
+    dialogText = dialog.textValue();
+    instanceId = sanitizeInstanceName(dialogText);
+    if (instanceId != dialogText) {
+      if (QMessageBox::question( nullptr, 
+                                QObject::tr("Invalid instance name"),
+                                QObject::tr("The instance name \"%1\" is invalid.  Use the name \"%2\" instead?").arg(dialogText,instanceId),
+                                QMessageBox::Yes | QMessageBox::No) == QMessageBox::No) {
+        instanceId="";
+        continue;
+        }
+    }
 
     bool alreadyExists=false;
     for (const QString &instance : instanceList) {
@@ -296,3 +307,21 @@ QString InstanceManager::determineDataPath()
   }
 }
 
+
+QString InstanceManager::sanitizeInstanceName(const QString &name) const
+{
+  QString new_name = name;
+
+  // Restrict the allowed characters
+  new_name = new_name.remove(QRegExp("[^A-Za-z0-9 _=+;!@#$%^'\\-\\.\\[\\]\\{\\}\\(\\)]"));
+
+  // Don't end in spaces and periods
+  new_name = new_name.remove(QRegExp("\\.*$"));
+  new_name = new_name.remove(QRegExp(" *$"));
+  
+  // Recurse until stuff stops changing
+  if (new_name != name) {
+    return sanitizeInstanceName(new_name);
+  }
+  return new_name;
+}
\ No newline at end of file
diff --git a/src/instancemanager.h b/src/instancemanager.h
index adedd78f..4efa6f03 100644
--- a/src/instancemanager.h
+++ b/src/instancemanager.h
@@ -50,6 +50,7 @@ private:
 
   QString manageInstances(const QStringList &instanceList) const;
 
+  QString sanitizeInstanceName(const QString &name) const;
   void setCurrentInstance(const QString &name);
 
   QString queryInstanceName(const QStringList &instanceList) const;