BF: Allow hyphens in Pavlovia project name

psychopy · Mar 17, 2022 · bbe6bf5 · bbe6bf5
1 parent f5ba322
commit bbe6bf5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/psychopy/app/pavlovia_ui/sync.py b/psychopy/app/pavlovia_ui/sync.py
@@ -12,6 +12,7 @@
 import re
 from pathlib import Path
 from psychopy.tools.versionchooser import _translate
+from ...tools.stringtools import valid_proj_name
 
 
 class SyncDialog(wx.Dialog):
@@ -144,7 +145,7 @@ def __init__(self, parent, user, name="", path=""):
     def validate(self, evt=None):
         # Test name
         name = self.nameCtrl.GetValue()
-        nameValid = bool(re.fullmatch("\w+", name))
+        nameValid = bool(valid_proj_name.fullmatch(name))
         # Test path
         path = Path(self.rootCtrl.GetValue())
         pathValid = path.is_dir() and path not in self.invalidFolders

diff --git a/psychopy/tools/stringtools.py b/psychopy/tools/stringtools.py
@@ -13,6 +13,9 @@
 
 __all__ = ["prettyname"]
 
+# Regex for identifying a valid Pavlovia project name
+valid_proj_name = re.compile(r'(\w|-)+')
+
 
 def prettyname(name, wrap=False):
     """Convert a camelCase, TitleCase or underscore_delineated title to Full Title Case"""