chiark / gitweb /
fix game names
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 18 Nov 2020 22:21:50 +0000 (22:21 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 18 Nov 2020 22:21:50 +0000 (22:21 +0000)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
src/bin/otter.rs

index 09683820d8c1f13532d9655426c98dbc9bedbf1f..1766c669d4468fd1f9b661980699e1e24da954b6 100644 (file)
@@ -83,9 +83,21 @@ struct MainOpts {
 
 impl MainOpts {
   pub fn instance_name(&self, table_name: &str) -> InstanceName {
-    InstanceName {
-      account: self.gaccount.clone(),
-      game: table_name.into(),
+    match table_name.strip_prefix(":") {
+      Some(rest) => {
+        InstanceName {
+          account: self.gaccount.clone(),
+          game: rest.into(),
+        }
+      }
+      None => {
+        table_name.parse().unwrap_or_else(|e|{
+          eprintln!(
+            "instance name must start with : or be valid full name: {}",
+            &e);
+          exit(EXIT_USAGE);
+        })
+      }
     }
   }
 }