Update location of form media directory

README.md

@@ -44,13 +44,13 @@ This tool expects a project to be sctructured as follows:
 				my_project_form.xlsx
 				my_project_form.xml
 				my_project_form.properties.json
-				my_project_form/
+				my_project_form-media/
 					[extra files]
 					…
 			contact/
 				person-create.xlsx
 				person-create.xml
-				person-create/
+				person-create-media/
 					[extra files]
 					…
 			…

package.json

@@ -1,6 +1,6 @@
 {
   "name": "medic-configurer-beta",
-  "version": "1.0.30",
+  "version": "1.0.32",
   "description": "Configure Medic Mobile deployments",
   "main": "index.js",
   "scripts": {

src/lib/upload-forms.js

@@ -18,11 +18,11 @@ module.exports = (project, couchUrl, subDirectory, options) => {
     .filter(name => name.endsWith('.xlsx'))
     .map(xls => {
       const baseFileName = fs.withoutExtension(xls);
-      const formDir = `${formsDir}/${baseFileName}`;
+      const mediaDir = `${formsDir}/${baseFileName}-media`;
       const xformPath = `${formsDir}/${baseFileName}.xml`;
       const expectedId = (options.id_prefix || '') + baseFileName.replace(/-/g, ':');
 
-      if(!fs.exists(formDir)) info(`No form directory found corresponding to XML ${formDir}`);
+      if(!fs.exists(mediaDir)) info(`No media directory found at ${mediaDir} for form ${xformPath}`);
 
       const xml = fs.read(xformPath);
 
@@ -47,7 +47,7 @@ module.exports = (project, couchUrl, subDirectory, options) => {
         }
       }
 
-      doc._attachments = fs.exists(formDir) ? attachmentsFromDir(formDir) : {};
+      doc._attachments = fs.exists(mediaDir) ? attachmentsFromDir(mediaDir) : {};
       doc._attachments.xml = attachmentFromFile(xformPath);
 
       return Promise.resolve()