Move all Turbot-created sheets down one level (in google drive)

The new folder is named "turbot"

diff --git a/turbot/events.py b/turbot/events.py
index eb5bcc46c69a8e8bfa09c275081a6f650e71de69..25c83233865fee9063d91dc205e23f8fc761440a 100644 (file)
--- a/turbot/events.py
+++ b/turbot/events.py
@@ -125,8 +125,17 @@ def hunt_channel_created(turb, channel_name, channel_id):
         "Welcome to the channel for the {} hunt! ".format(hunt['name'])
         + "Please wait a moment or two while I create some backend resources.")
 
-    # Create a new folder within Google drive for the hunt
-    hunt['folder_id'] = sheets_create_folder(turb, hunt['hunt_id'])
+    # Create a new folder within Google drive for the hunt in two parts:
+
+    # ... first, a top-level folder named for the hunt
+    hunt_folder = sheets_create_folder(turb, hunt['hunt_id'])
+
+    # ... second, a folder within that named "turbot"
+    #
+    # The concept here is that non-turbot related content could
+    # be placed adjacent to the turbot folder.
+    hunt['folder_id'] = sheets_create_folder(turb, "turbot",
+                                             parents = [hunt_folder])
 
     # Create a sheet for the hunt
     sheet = sheets_create(turb, hunt['name'], hunt['folder_id'])

diff --git a/turbot/sheets.py b/turbot/sheets.py
index c042b4daf28e1358ac161142c16bf6b3472bc196..76515ca09547c660a94466fd6d223259211b7f44 100644 (file)
--- a/turbot/sheets.py
+++ b/turbot/sheets.py
@@ -2,7 +2,7 @@ PUZZLE_TEMPLATE_ID = "1drSoyrE4gM3JaGweDkOybwXWdKPIDTfUmB1gQCYS3Uw"
 PUZZLE_TEMPLATE_SHEETS = ["Text", "Square grid", "Hex Grid",
                           "Formula reference: indexing"]
 
-def sheets_create_folder(turb, folder_name):
+def sheets_create_folder(turb, folder_name, parents = None):
     """Create a new folder within Google Drive
 
     Returns the id of the created folder."""
@@ -12,6 +12,9 @@ def sheets_create_folder(turb, folder_name):
         "mimeType": "application/vnd.google-apps.folder"
     }
 
+    if parents:
+        body["parents"] = parents
+
     folder = turb.files.create(body=body, fields='id').execute()
 
     return folder.get('id')